has_siblings 0.1.4 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c9a478422e44130d48e912d90859c85cf39e0fe
-  data.tar.gz: 4cf1bf638ed49bc03f30045f8d6918f721ded0fb
+SHA256:
+  metadata.gz: 74413b0cd5fbe98208341f508142e4e8c083dd7fb7a3676c19c99e679b36672c
+  data.tar.gz: 2bfc9e15371ce603dc2ae124b1ab05e0c11be55f0bb1600d601f358f84255fbd
 SHA512:
-  metadata.gz: 5bd05456d26bff338d5d314eb25812ba46ef8583c0a7fd36eedb47abb0cbbf40fa2380ff5ee53dc41619d32561ce41ebc394d6d06e50fef26c52378472fec3ef
-  data.tar.gz: 2bfad7ee8d04dad790949a7418720acea104fba99f55c7fef6f0d7f18df1269840b4a295488bf06d3efa6c7994da95a67d1ff9190a844315e3a04bc4fb4a9796
+  metadata.gz: f14c41f5d1bb0cabc447590fc085ab330528877ab00a14093f0c13c6c97338857926de1a056fc2b05831ee695a1cd59df8b3f0d7e86a8a6acdd41d952fa2ac74
+  data.tar.gz: e52ab634d35ef47b1654c4c5226de60670d32d3c8f99dc3f9ab419497c7773a5053b42a552f8f88ec11182178f7070fc06ce565b86ba925876b8503ede8fa717

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Annkissam
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -69,7 +69,10 @@ An example of what it returns:
 
 `has_siblings` accepts a `through: [...]` option that specifies the parents and can
 be an array or a single symbol, and an optional `name` that will be the name of
-the siblings method (default to `siblings`).
+the siblings method (default to `siblings`). By default, when specifying an array of
+parents, any `nil` association will result in an empty sibling collection, if parents
+can optionally be blank setting `allow_nil: true` will include the present parents and
+and the missing parent as conditions to the sibling scope.
 
 ## Compatibility
 

data/has_siblings.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Easily define a siblings method for a child model instance.}
   spec.description   = %q{ parent.children.where.not(id: self.id), extended to n parents }
   spec.homepage      = "https://github.com/annkissam/has_siblings"
+  spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
@@ -27,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", ">= 4.0"
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.17"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "sqlite3"

data/lib/has_siblings/class_methods.rb

@@ -7,17 +7,32 @@ module HasSiblings
     def has_siblings(options = {})
       *parents = options.fetch(:through)
       name = options.fetch(:name, "siblings")
+      allow_nil = options.fetch(:allow_nil, false)
 
-      where_scopes = parents.map do |parent|
+      reflections = parents.map do |parent|
         reflection = reflect_on_association(parent)
-        fail HasSiblings::ThroughAssociationNotFoundError.new(parent, self) if reflection.nil?
+        fail HasSiblings::ReflectionNotFoundError.new(parent, self) if reflection.nil?
+        reflection
+      end
+      where_scopes = reflections.map do |reflection|
         foreign_key = reflection.foreign_key
-        "where(#{foreign_key}: #{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
 
       mixin = ActiveRecord.version.to_s >= "4.1" ? generated_association_methods : generated_feature_methods
+
       mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{name}
+          unless #{allow_nil}
+            return self.class.none if [#{parents.join(",")}].any?(&:nil?)
+          end
+
           self.class.#{where_scopes.join(".")}.where.not(id: id)
         end
       CODE

data/lib/has_siblings/errors.rb

@@ -1,7 +1,13 @@
 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 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
+  end
 end

data/lib/has_siblings/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_siblings
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.8
 platform: ruby
 authors:
 - Octavian Neamtu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,30 +28,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - ".travis.yml"
 - Appraisals
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
@@ -150,10 +151,11 @@ files:
 - lib/has_siblings/errors.rb
 - lib/has_siblings/version.rb
 homepage: https://github.com/annkissam/has_siblings
-licenses: []
+licenses:
+- MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,9 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Easily define a siblings method for a child model instance.
 test_files: []