has_siblings 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb7a296d7243a90699d3d70111ecb77f989898c
-  data.tar.gz: f1b80a9be1854ae337d05d5d44c9ec9631bd3e45
+  metadata.gz: 0c9a478422e44130d48e912d90859c85cf39e0fe
+  data.tar.gz: 4cf1bf638ed49bc03f30045f8d6918f721ded0fb
 SHA512:
-  metadata.gz: b54bfbde0d868e15c6ca34464d033aa65638794690f2249039550c31ea351debde55929ec37789855114ed6ba7a83eaf0b9474c5698fa30ebe7fd4f4a193f64f
-  data.tar.gz: e913c7a5b30d733553c703371c5810be368d5ab7888e8140a631f32f79635592ac54644310d8e04bcbf2d6dc284f52f29af43b32a6205e41b037ea0f278156f5
+  metadata.gz: 5bd05456d26bff338d5d314eb25812ba46ef8583c0a7fd36eedb47abb0cbbf40fa2380ff5ee53dc41619d32561ce41ebc394d6d06e50fef26c52378472fec3ef
+  data.tar.gz: 2bfad7ee8d04dad790949a7418720acea104fba99f55c7fef6f0d7f18df1269840b4a295488bf06d3efa6c7994da95a67d1ff9190a844315e3a04bc4fb4a9796

data/README.md

@@ -26,43 +26,43 @@ Add has_siblings to a child model to get a siblings method that returns all of t
 other children.
 
 ```ruby
-    class Mother < ActiveRecord::Base
-      has_many :children
-    end
+class Mother < ActiveRecord::Base
+  has_many :children
+end
 
-    class Father < ActiveRecord::Base
-      has_many :children
-    end
+class Father < ActiveRecord::Base
+  has_many :children
+end
 
-    class Child < ActiveRecord::Base
-      belongs_to :mother, inverse_of: :children
-      belongs_to :father, inverse_of: :children
+class Child < ActiveRecord::Base
+  belongs_to :mother, inverse_of: :children
+  belongs_to :father, inverse_of: :children
 
-      has_siblings through: [:mother, :father]
-      has_siblings through: :mother, name: :step_siblings
-    end
+  has_siblings through: [:mother, :father]
+  has_siblings through: :mother, name: :step_siblings
+end
 ```
 
 An example of what it returns:
 
 ```ruby
-    [1] pry> child
-    => #<Child:0x007fe5b3371c20 id: 6, mother_id: 3, father_id: 2>
-    [2] pry> sister
-    => #<Child:0x007fe5b3379e70 id: 7, mother_id: 3, father_id: 2>
-    [3] pry> brother
-    => #<Child:0x007fe5b337e0b0 id: 8, mother_id: 3, father_id: 2>
-    [4] pry> half_sister
-    => #<Child:0x007fe5b3386300 id: 9, mother_id: 3, father_id: nil>
-    [5] pry> just_a_friend
-    => #<Child:0x007fe5b338c390 id: 10, mother_id: 4, father_id: nil>
-    [6] pry> child.siblings
-    => [#<Child:0x007fe5b33dc6b0 id: 7, mother_id: 3, father_id: 2>,
-        #<Child:0x007fe5b33dc3e0 id: 8, mother_id: 3, father_id: 2>]
-    [7] pry> child.step_siblings
-    => [#<Child:0x007fe5b335fcc8 id: 7, mother_id: 3, father_id: 2>,
-        #<Child:0x007fe5b335f9d0 id: 8, mother_id: 3, father_id: 2>,
-        #<Child:0x007fe5b335f598 id: 9, mother_id: 3, father_id: nil>]
+[1] pry> child
+=> #<Child:0x007fe5b3371c20 id: 6, mother_id: 3, father_id: 2>
+[2] pry> sister
+=> #<Child:0x007fe5b3379e70 id: 7, mother_id: 3, father_id: 2>
+[3] pry> brother
+=> #<Child:0x007fe5b337e0b0 id: 8, mother_id: 3, father_id: 2>
+[4] pry> half_sister
+=> #<Child:0x007fe5b3386300 id: 9, mother_id: 3, father_id: nil>
+[5] pry> just_a_friend
+=> #<Child:0x007fe5b338c390 id: 10, mother_id: 4, father_id: nil>
+[6] pry> child.siblings
+=> [#<Child:0x007fe5b33dc6b0 id: 7, mother_id: 3, father_id: 2>,
+    #<Child:0x007fe5b33dc3e0 id: 8, mother_id: 3, father_id: 2>]
+[7] pry> child.step_siblings
+=> [#<Child:0x007fe5b335fcc8 id: 7, mother_id: 3, father_id: 2>,
+    #<Child:0x007fe5b335f9d0 id: 8, mother_id: 3, father_id: 2>,
+    #<Child:0x007fe5b335f598 id: 9, mother_id: 3, father_id: nil>]
 ```
 
 ## Options

data/lib/has_siblings/class_methods.rb

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

@@ -4,10 +4,4 @@ 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.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_siblings
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Octavian Neamtu