where_conditioner 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c44ce09a4fe3727fe41e7db71d8dc99635964804
-  data.tar.gz: 8ee269cec9b22ef62b15669b4b61a1f4ed03aeee
+  metadata.gz: cadede51475344b93a3d88c4220b047430a5668a
+  data.tar.gz: 386286509e4c3fee25ec8b5c5b5ea39b14aca939
 SHA512:
-  metadata.gz: c266e1cb927721587d933c59b39461acffa37c854052d45785cb2e5899a55b8d091157ed275bf3ea7965539b65df433f4f29433d9efefd80dfc97b69fb88403c
-  data.tar.gz: 8797fabf41f090281b204ed1df708f76458334ae49ec23e44595c914f120765c410a7c0b620e5b2dccb44ff294e353960715722046c6ab2738de709f394dda3d
+  metadata.gz: 0c81ade509e725b5e2c1a22fb0eac3572f522c3e33a9efed92c96ccca2d41e50141c23b30c2b1aadf4ff35d8006fe368a2c91ef7f229467201a7530dc472ee53
+  data.tar.gz: ac5d175acabfb3722c2287d6aa1eade21ee40733c63d593d0dae1d9b08318b85ed0789cb9592b1ae0d4dd4bb9c3cfe17c820aeecab21ba566aaeb8ce95f85085

data/lib/where_conditioner.rb

@@ -32,7 +32,7 @@ module WhereConditioner
 
   def where_if_present *args    
     if Hash === args.first && args.length == 1
-      hash = args.first.compact
+      hash = WhereConditioner.recursive_compact(args.first)
       if hash.present?
         self.where hash
       else
@@ -65,6 +65,25 @@ private
       end
     end
   end
+
+  def self.recursive_compact(hash)
+    hash.dup.tap do |hash|
+      hash.each do |key,value|
+        case value
+        when nil
+          hash.delete key
+        when Hash
+          compacted = recursive_compact(value)
+          if compacted.empty?
+            hash.delete key
+          else
+            hash[key] = compacted
+          end
+        end
+      end
+    end
+  end
+
 end
 
 module ActiveRecord

data/spec/lib/where_conditioner_spec.rb

@@ -22,6 +22,11 @@ describe WhereConditioner do
         relation.where_if_present(key1: '', key2: nil, key3: 'value', key4: 0)
       end
 
+      it 'filters out nils in nested hashes' do
+        expect(relation).to receive(:where).with(table1: { key1: '', key3: 'value', key4: 0 }, table3: { key6: 'value' })
+        relation.where_if_present(table1: {key1: '', key2: nil, key3: 'value', key4: 0}, table2: {key5: nil}, table3: {key6: 'value'})
+      end
+
       it 'does not call where(), and returns self, if all values are nil' do
         expect(relation).not_to receive(:where)
         relation.where_if_present(key1: nil, key2: nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: where_conditioner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tony Novak
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Where Conditioner