has_siblings 0.1.7 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9d1f499235250537032de08d3fa519a4c1e604
-  data.tar.gz: 327722172be38d3ae65980a655f4895830fc21fc
+  metadata.gz: b9ce12e0cc218d0ebe0fd3aa99a1218f64c2afff
+  data.tar.gz: f77daab3e5f7f63be62179bfec18d9b2d8e14a5b
 SHA512:
-  metadata.gz: f396ab071b76d64499c9a1e6d9d597f4c03ca9be06f49d95b40f611305aa1ea7a1bd03c8edfc3424036086906e3ff086b2da2076af91940612d5a03cdf465a3c
-  data.tar.gz: 0ba16e8cccddff04f4c4b29f615513b66bcb8853cc2758d8b3e5182330e81704f21a47fcdea00fa3f5bb973d3445404d5c31eda63b1c2bc4e783142b1e849fb3
+  metadata.gz: d432e037773d05a4094c1e0ffe05511c593175ff0870d1e5cb09cab6850ed83687540246b2ac25dd2bbe2126e47af6777285c3ebe52a48b312fd51969ee15d77
+  data.tar.gz: 11f4e1dad7abae98f369a88f501c6041d56cd70c39edecc51e46b7a381171eca93195296ef85d68b708112e6f1e7d39b2a9a030d6d5ef256efe0825b020a77ec

data/lib/has_siblings/class_methods.rb

@@ -8,26 +8,28 @@ module HasSiblings
       *parents = options.fetch(:through)
       name = options.fetch(:name, "siblings")
 
-      parent_association_pairs = parents.map do |parent|
+      reflections = parents.map do |parent|
         reflection = reflect_on_association(parent)
-        fail HasSiblings::ThroughAssociationNotFoundError.new(parent, self) if reflection.nil?
-        [parent, reflection]
+        fail HasSiblings::ReflectionNotFoundError.new(parent, self) if reflection.nil?
+        reflection
       end
-      parent_association_name_pairs = parent_association_pairs.map do |parent, association|
-        fail HasSiblings::InverseOfNotFoundError.new(parent, self) if association.inverse_of.nil?
-        [parent, association.inverse_of.name]
-      end
-      merge_scopes = parent_association_name_pairs[1..-1].map do |parent, association_name|
-        "merge(#{parent}.#{association_name})"
+      where_scopes = reflections.map do |reflection|
+        foreign_key = reflection.foreign_key
+        foreign_type = reflection.foreign_type
+
+        if reflection.polymorphic?
+          "where(#{foreign_key}: #{foreign_key}, #{foreign_type}: #{foreign_type})"
+        else
+          "where(#{foreign_key}: #{foreign_key})"
+        end
       end
-      first_parent_association = parent_association_name_pairs[0].join(".")
 
       mixin = ActiveRecord.version.to_s >= "4.1" ? generated_association_methods : generated_feature_methods
 
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}
           return self.class.none if [#{parents.join(",")}].any?(&:nil?)
-          #{([first_parent_association] + merge_scopes).join(".")}.where.not(id: id)
+          self.class.#{where_scopes.join(".")}.where.not(id: id)
         end
       CODE
     end

data/lib/has_siblings/errors.rb

@@ -1,11 +1,11 @@
 module HasSiblings
-  class ThroughAssociationNotFoundError < StandardError
+  class ReflectionNotFoundError < StandardError
     def initialize(association_name, owner_class_name)
       super("Could not find the association #{association_name} in model #{owner_class_name}")
     end
   end
 
-  class InverseOfNotFoundError < StandardError
+  class ForeignKeyNotFoundError < StandardError
     def initialize(association_name, owner_class_name)
       super("Could not find the inverse_of for the association #{association_name} in model #{owner_class_name}")
     end

data/lib/has_siblings/version.rb

@@ -1,3 +1,3 @@
 module HasSiblings
-  VERSION = "0.1.7"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_siblings
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.7
 platform: ruby
 authors:
 - Octavian Neamtu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord