activerecord_nested_scope 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a44db3d31ebd21c792a4c2c1780760983cc2f038
-  data.tar.gz: 3def58069b0d7bdeda2b9169a92ce4d8880e7795
+  metadata.gz: 8e410ad54617ffeb9efb8f56397f72ace4642944
+  data.tar.gz: 8c67e79ea1bd658e73637174c011bf6ab037539e
 SHA512:
-  metadata.gz: d65049d12b954f31efd9be805176b335960852bb2e52127a031c11b29847c72ef24985241a5c7ff6cb959b1c9908cd68d934a2e6f25b72666c59a36fc018891c
-  data.tar.gz: 011aaa35c227300d9c13748b51638eccc3c41830222bc1f4f357e16d9a4350fe59a238b5660c6641720565b17b411fb34b6b21387a9a17c1b85202aeac9b7b9c
+  metadata.gz: d280f90f2b40e2668406147cb2913654784e89685923a4b36cc1764530826c8c63ff3e698dbebea4ca53ef075ab7bf98e99a4097f22d4df819d2abdace93cc18
+  data.tar.gz: 979cb3d3d2c9fdaef9cd6f5feb094eab90c94df90a1fb13703445056bec510134a9d50ccd448d4a2e7d8d693b0a532b817ebe93b3f6b6c7b194aabea27b0b91b

data/lib/activerecord_nested_scope/builder.rb

@@ -68,12 +68,12 @@ module ActiveRecordNestedScope
     end
 
     def root_relation(klass)
-      if @args.is_a?(Integer) || @args.is_a?(Array) || @args.is_a?(ActiveRecord::Base)
-        klass.where(klass.primary_key => @args)
-      elsif @args.is_a?(ActiveRecord::Relation)
+      if @args.is_a?(ActiveRecord::Relation)
         klass.all.merge(@args)
-      elsif @args
+      elsif @args.is_a?(Hash)
         klass.where(@args)
+      elsif @args
+        klass.where(klass.primary_key => @args)
       else
         klass.all
       end

data/lib/activerecord_nested_scope/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordNestedScope
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_nested_scope
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord