Skip to content

Commit

Permalink
removed "unloadable" declarations
Browse files Browse the repository at this point in the history
They were causing circular dependency errors in development when
classes changed and had to be recompiled.  Turns out they're no longer
needed for Rails 4:

   thoughtbot/clearance#276
   thoughtbot/clearance#277

In development if I change one of the classes it recompiles, even
without the "unloadable" declaration, and I no longer get circular
dependency errors.
  • Loading branch information
toby cabot committed Aug 16, 2013
1 parent 33a9f62 commit d6dbce5
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 17 deletions.
3 changes: 1 addition & 2 deletions app/controllers/surveyor_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Surveyor Controller allows a user to take a survey. It is semi-RESTful since it does not have a concrete representation model.
# The "resource" is a survey attempt/session populating a response set.
class SurveyorController < ApplicationController
unloadable
include Surveyor::SurveyorControllerMethods
end
end
1 change: 0 additions & 1 deletion app/models/answer.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class Answer < ActiveRecord::Base
unloadable
include Surveyor::Models::AnswerMethods
end
1 change: 0 additions & 1 deletion app/models/dependency.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class Dependency < ActiveRecord::Base
unloadable
include Surveyor::Models::DependencyMethods
end
1 change: 0 additions & 1 deletion app/models/dependency_condition.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class DependencyCondition < ActiveRecord::Base
unloadable
include Surveyor::Models::DependencyConditionMethods
end
3 changes: 1 addition & 2 deletions app/models/question.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class Question < ActiveRecord::Base
unloadable
include Surveyor::Models::QuestionMethods
end
end
1 change: 0 additions & 1 deletion app/models/question_group.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class QuestionGroup < ActiveRecord::Base
unloadable
include Surveyor::Models::QuestionGroupMethods

end
1 change: 0 additions & 1 deletion app/models/response.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class Response < ActiveRecord::Base
unloadable
include ActionView::Helpers::SanitizeHelper
include Surveyor::Models::ResponseMethods
end
3 changes: 1 addition & 2 deletions app/models/response_set.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class ResponseSet < ActiveRecord::Base
unloadable
include Surveyor::Models::ResponseSetMethods
end
end
1 change: 0 additions & 1 deletion app/models/survey.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class Survey < ActiveRecord::Base
unloadable
include Surveyor::Models::SurveyMethods
end
1 change: 0 additions & 1 deletion app/models/survey_section.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class SurveySection < ActiveRecord::Base
unloadable
include Surveyor::Models::SurveySectionMethods
end

1 change: 0 additions & 1 deletion app/models/survey_translation.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class SurveyTranslation < ActiveRecord::Base
unloadable
include Surveyor::Models::SurveyTranslationMethods
end

3 changes: 1 addition & 2 deletions app/models/validation.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class Validation < ActiveRecord::Base
unloadable
include Surveyor::Models::ValidationMethods
end
end
1 change: 0 additions & 1 deletion app/models/validation_condition.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
class ValidationCondition < ActiveRecord::Base
unloadable
include Surveyor::Models::ValidationConditionMethods
end

0 comments on commit d6dbce5

Please sign in to comment.