Permalink
Browse files

Indent methods under private/protected sections

  • Loading branch information...
1 parent 15601c5 commit d85ee50eda88fc1d486140b63d5c6826b7f3671b @jonleighton jonleighton committed Jan 24, 2011
@@ -11,24 +11,24 @@ def replace(record)
private
- def create_through_record(record)
- through_proxy = @owner.send(:association_proxy, @reflection.through_reflection.name)
- through_record = through_proxy.send(:load_target)
+ def create_through_record(record)
+ through_proxy = @owner.send(:association_proxy, @reflection.through_reflection.name)
+ through_record = through_proxy.send(:load_target)
- if through_record && !record
- through_record.destroy
- elsif record
- attributes = construct_join_attributes(record)
+ if through_record && !record
+ through_record.destroy
+ elsif record
+ attributes = construct_join_attributes(record)
- if through_record
- through_record.update_attributes(attributes)
- elsif @owner.new_record?
- through_proxy.build(attributes)
- else
- through_proxy.create(attributes)
+ if through_record
+ through_record.update_attributes(attributes)
+ elsif @owner.new_record?
+ through_proxy.build(attributes)
+ else
+ through_proxy.create(attributes)
+ end
end
end
- end
end
end
end
@@ -12,135 +12,135 @@ def conditions
protected
- def target_scope
- super & @reflection.through_reflection.klass.scoped
- end
+ def target_scope
+ super & @reflection.through_reflection.klass.scoped
+ end
- def association_scope
- scope = super.joins(construct_joins).where(conditions)
- unless @reflection.options[:include]
- scope = scope.includes(@reflection.source_reflection.options[:include])
+ def association_scope
+ scope = super.joins(construct_joins).where(conditions)
+ unless @reflection.options[:include]
+ scope = scope.includes(@reflection.source_reflection.options[:include])
+ end
+ scope
end
- scope
- end
private
- # This scope affects the creation of the associated records (not the join records). At the
- # moment we only support creating on a :through association when the source reflection is a
- # belongs_to. Thus it's not necessary to set a foreign key on the associated record(s), so
- # this scope has can legitimately be empty.
- def creation_attributes
- { }
- end
+ # This scope affects the creation of the associated records (not the join records). At the
+ # moment we only support creating on a :through association when the source reflection is a
+ # belongs_to. Thus it's not necessary to set a foreign key on the associated record(s), so
+ # this scope has can legitimately be empty.
+ def creation_attributes
+ { }
+ end
- def aliased_through_table
- name = @reflection.through_reflection.table_name
+ def aliased_through_table
+ name = @reflection.through_reflection.table_name
- @reflection.table_name == name ?
- @reflection.through_reflection.klass.arel_table.alias(name + "_join") :
- @reflection.through_reflection.klass.arel_table
- end
+ @reflection.table_name == name ?
+ @reflection.through_reflection.klass.arel_table.alias(name + "_join") :
+ @reflection.through_reflection.klass.arel_table
+ end
- def construct_owner_conditions
- super(aliased_through_table, @reflection.through_reflection)
- end
+ def construct_owner_conditions
+ super(aliased_through_table, @reflection.through_reflection)
+ end
- def construct_joins
- right = aliased_through_table
- left = @reflection.klass.arel_table
+ def construct_joins
+ right = aliased_through_table
+ left = @reflection.klass.arel_table
+
+ conditions = []
+
+ if @reflection.source_reflection.macro == :belongs_to
+ reflection_primary_key = @reflection.source_reflection.options[:primary_key] ||
+ @reflection.klass.primary_key
+ source_primary_key = @reflection.source_reflection.foreign_key
+ if @reflection.options[:source_type]
+ column = @reflection.source_reflection.foreign_type
+ conditions <<
+ right[column].eq(@reflection.options[:source_type])
+ end
+ else
+ reflection_primary_key = @reflection.source_reflection.foreign_key
+ source_primary_key = @reflection.source_reflection.options[:primary_key] ||
+ @reflection.through_reflection.klass.primary_key
+ if @reflection.source_reflection.options[:as]
+ column = "#{@reflection.source_reflection.options[:as]}_type"
+ conditions <<
+ left[column].eq(@reflection.through_reflection.klass.name)
+ end
+ end
- conditions = []
+ conditions <<
+ left[reflection_primary_key].eq(right[source_primary_key])
- if @reflection.source_reflection.macro == :belongs_to
- reflection_primary_key = @reflection.source_reflection.options[:primary_key] ||
- @reflection.klass.primary_key
- source_primary_key = @reflection.source_reflection.foreign_key
- if @reflection.options[:source_type]
- column = @reflection.source_reflection.foreign_type
- conditions <<
- right[column].eq(@reflection.options[:source_type])
- end
- else
- reflection_primary_key = @reflection.source_reflection.foreign_key
- source_primary_key = @reflection.source_reflection.options[:primary_key] ||
- @reflection.through_reflection.klass.primary_key
- if @reflection.source_reflection.options[:as]
- column = "#{@reflection.source_reflection.options[:as]}_type"
- conditions <<
- left[column].eq(@reflection.through_reflection.klass.name)
- end
+ right.create_join(
+ right,
+ right.create_on(right.create_and(conditions)))
end
- conditions <<
- left[reflection_primary_key].eq(right[source_primary_key])
-
- right.create_join(
- right,
- right.create_on(right.create_and(conditions)))
- end
+ # Construct attributes for :through pointing to owner and associate.
+ def construct_join_attributes(associate)
+ # TODO: revisit this to allow it for deletion, supposing dependent option is supported
+ raise ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(@owner, @reflection) if [:has_one, :has_many].include?(@reflection.source_reflection.macro)
- # Construct attributes for :through pointing to owner and associate.
- def construct_join_attributes(associate)
- # TODO: revisit this to allow it for deletion, supposing dependent option is supported
- raise ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection.new(@owner, @reflection) if [:has_one, :has_many].include?(@reflection.source_reflection.macro)
+ join_attributes = {
+ @reflection.source_reflection.foreign_key =>
+ associate.send(@reflection.source_reflection.association_primary_key)
+ }
- join_attributes = {
- @reflection.source_reflection.foreign_key =>
- associate.send(@reflection.source_reflection.association_primary_key)
- }
+ if @reflection.options[:source_type]
+ join_attributes.merge!(@reflection.source_reflection.foreign_type => associate.class.base_class.name)
+ end
- if @reflection.options[:source_type]
- join_attributes.merge!(@reflection.source_reflection.foreign_type => associate.class.base_class.name)
- end
+ if @reflection.through_reflection.options[:conditions].is_a?(Hash)
+ join_attributes.merge!(@reflection.through_reflection.options[:conditions])
+ end
- if @reflection.through_reflection.options[:conditions].is_a?(Hash)
- join_attributes.merge!(@reflection.through_reflection.options[:conditions])
+ join_attributes
end
- join_attributes
- end
-
- def build_conditions
- through_conditions = build_through_conditions
- source_conditions = @reflection.source_reflection.options[:conditions]
- uses_sti = !@reflection.through_reflection.klass.descends_from_active_record?
+ def build_conditions
+ through_conditions = build_through_conditions
+ source_conditions = @reflection.source_reflection.options[:conditions]
+ uses_sti = !@reflection.through_reflection.klass.descends_from_active_record?
- if through_conditions || source_conditions || uses_sti
- all = []
- all << interpolate_sql(sanitize_sql(source_conditions)) if source_conditions
- all << through_conditions if through_conditions
- all << build_sti_condition if uses_sti
+ if through_conditions || source_conditions || uses_sti
+ all = []
+ all << interpolate_sql(sanitize_sql(source_conditions)) if source_conditions
+ all << through_conditions if through_conditions
+ all << build_sti_condition if uses_sti
- all.map { |sql| "(#{sql})" } * ' AND '
+ all.map { |sql| "(#{sql})" } * ' AND '
+ end
end
- end
- def build_through_conditions
- conditions = @reflection.through_reflection.options[:conditions]
- if conditions.is_a?(Hash)
- interpolate_sql(@reflection.through_reflection.klass.send(:sanitize_sql, conditions)).gsub(
- @reflection.quoted_table_name,
- @reflection.through_reflection.quoted_table_name)
- elsif conditions
- interpolate_sql(sanitize_sql(conditions))
+ def build_through_conditions
+ conditions = @reflection.through_reflection.options[:conditions]
+ if conditions.is_a?(Hash)
+ interpolate_sql(@reflection.through_reflection.klass.send(:sanitize_sql, conditions)).gsub(
+ @reflection.quoted_table_name,
+ @reflection.through_reflection.quoted_table_name)
+ elsif conditions
+ interpolate_sql(sanitize_sql(conditions))
+ end
end
- end
- def build_sti_condition
- @reflection.through_reflection.klass.send(:type_condition).to_sql
- end
+ def build_sti_condition
+ @reflection.through_reflection.klass.send(:type_condition).to_sql
+ end
- def stale_state
- if @reflection.through_reflection.macro == :belongs_to
- @owner[@reflection.through_reflection.foreign_key].to_s
+ def stale_state
+ if @reflection.through_reflection.macro == :belongs_to
+ @owner[@reflection.through_reflection.foreign_key].to_s
+ end
end
- end
- def foreign_key_present?
- @reflection.through_reflection.macro == :belongs_to &&
- !@owner[@reflection.through_reflection.foreign_key].nil?
- end
+ def foreign_key_present?
+ @reflection.through_reflection.macro == :belongs_to &&
+ !@owner[@reflection.through_reflection.foreign_key].nil?
+ end
end
end
end

0 comments on commit d85ee50

Please sign in to comment.