has_siblings 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9a478422e44130d48e912d90859c85cf39e0fe
-  data.tar.gz: 4cf1bf638ed49bc03f30045f8d6918f721ded0fb
+  metadata.gz: 9f9a89302f89bb8250b6244b893be2f0778db9fe
+  data.tar.gz: 8b0f86c625db09473ab791ed9d684165da592686
 SHA512:
-  metadata.gz: 5bd05456d26bff338d5d314eb25812ba46ef8583c0a7fd36eedb47abb0cbbf40fa2380ff5ee53dc41619d32561ce41ebc394d6d06e50fef26c52378472fec3ef
-  data.tar.gz: 2bfad7ee8d04dad790949a7418720acea104fba99f55c7fef6f0d7f18df1269840b4a295488bf06d3efa6c7994da95a67d1ff9190a844315e3a04bc4fb4a9796
+  metadata.gz: 98caa42fb0fa17325fa3ba68fea9423a5ed8345db64c123bcc0f41372cd3eee0b8300f384b1a742b8e8b0fa3561299b0d752251bf14d5ecda9c582af1cf652e5
+  data.tar.gz: a584ddf70c1b38769faecff09ecd9939263ad6972cc81eb3fe32847d2af29fc279ff02971845409a66207329e2bfa5d03bd26be91e5e59982f2eb7123208253c

data/lib/has_siblings/class_methods.rb

@@ -8,17 +8,25 @@ module HasSiblings
       *parents = options.fetch(:through)
       name = options.fetch(:name, "siblings")
 
-      where_scopes = parents.map do |parent|
+      parent_association_pairs = parents.map do |parent|
         reflection = reflect_on_association(parent)
         fail HasSiblings::ThroughAssociationNotFoundError.new(parent, self) if reflection.nil?
-        foreign_key = reflection.foreign_key
-        "where(#{foreign_key}: #{foreign_key})"
+        [parent, 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})"
+      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}
-          self.class.#{where_scopes.join(".")}.where.not(id: id)
+          #{([first_parent_association] + merge_scopes).join(".")}.where.not(id: id)
         end
       CODE
     end

data/lib/has_siblings/errors.rb

@@ -4,4 +4,10 @@ module HasSiblings
       super("Could not find the association #{association_name} in model #{owner_class_name}")
     end
   end
+
+  class InverseOfNotFoundError < 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
+  end
 end

data/lib/has_siblings/version.rb

@@ -1,3 +1,3 @@
 module HasSiblings
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

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