active_record_filterable 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f3fd07975c6a48200e596542644ddad458e3ff3293bee739151f4d25eae5231
-  data.tar.gz: c9415f4f77e93081d2189f9891709d3a009e98fc01c613ca6c059363f5f581b4
+  metadata.gz: 629ee506d50151bbc9513fbfbdac243a5d976056cd5eab2da800ddb3ac46f015
+  data.tar.gz: 313ef4b6f506ee73d6ba3a7d3952095de754cb2c9e2ed9d3a67752fa4edcb4fb
 SHA512:
-  metadata.gz: 13c55dec18594a7ec978776e58ad25c0613e29d1258f68fd209ebcc2687fe46ff2981b240d29e2544db6819ad02dc85a5fc8c43324c6d3ffa29fd43ee19725d9
-  data.tar.gz: 42a9dc6a30c48bb94473ab9f9685944e0bbc65367806a7b5bdd97a703bb4536c3d873147f31308bc0e5d51301cfe8272812a1495098c8686ba49b77ae846d6c8
+  metadata.gz: 307c77ae2ce3677ea92f7aa5b674c16ac7d6bc7e97a2ed02f77c1c615cbe805967b34f4642b8c67cc34e0a4113645225bb7596763531feedad90d56d79a761a8
+  data.tar.gz: d815a6685ac11c677a480d313079b95ff390e89324a4a51b6430e1b02b1d39c8eb78fa771e5287380b39d01ad7fa008dd410f0d49f239df855a6bd8a3fe1e48f

data/.travis.yml

@@ -23,3 +23,7 @@ script: bundle exec rspec
 
 gemfile:
   - Gemfile
+
+services:
+  - mysql
+  - postgresql

data/README.md

@@ -41,6 +41,7 @@ City.filtrate({name: 'city'}).count # => 2
 City.filtrate({name: 'city1'}).count # => 1
 City.filtrate({name: ''}).count # => 0
 City.filtrate({people: 500}) # => 1
+City.filtrate({invalid: 'x'}) # => 2 (is ignored)
 ```
 
 #### Operator

data/lib/active_record_filterable/filterable.rb

@@ -37,7 +37,7 @@ module ActiveRecord
           end
         end
 
-        criteria == self ? none : merge(criteria)
+        merge(criteria)
       end
 
       def scope(name, scope_options, &block)

data/lib/active_record_filterable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Filterable
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/filterable_spec.rb

@@ -35,7 +35,19 @@ RSpec.describe ActiveRecord::Filterable do
       end
 
       it 'doesn\'t find anything with partial match' do
-        expect(City.filtrate(name: :city).count).to eq(0)
+        expect(City.filtrate(code: :code).count).to eq(0)
+      end
+    end
+
+    context 'when filter is invalid' do
+      before do
+        City.create(code: :code1)
+        City.create(code: :code2)
+      end
+
+      it 'ignore filter' do
+        expect(City.filtrate(code: :code1, invalid: 'xxx').count).to eq(1)
+        expect(City.filtrate(invalid: 'xxx').count).to eq(2)
       end
     end
 
@@ -123,7 +135,7 @@ RSpec.describe ActiveRecord::Filterable do
       end
     end
 
-    context 'when partial matching is used' do
+    context 'when normalize matching is used' do
       before do
         City.create(name: 'spaIn')
         City.create(name: 'frAnce')
@@ -145,7 +157,7 @@ RSpec.describe ActiveRecord::Filterable do
       end
     end
 
-    context 'when filter is applied on a scope' do
+    context 'when is applied in query' do
       before do
         City.create(name: '2', people: 100)
         City.create(name: '1', people: 500)
@@ -155,19 +167,14 @@ RSpec.describe ActiveRecord::Filterable do
 
       it 'is maintained' do
         expect(City.where(name: '2').filtrate(nil).count).to eq(1)
-      end
-    end
-
-    context 'when is applied in query' do
-      before do
-        City.create(name: 'city1', people: 100)
-        City.create(name: 'city2', people: 1000)
-        City.create(name: 'city3', people: 2000)
+        expect(City.where(name: '2').filtrate(nil).first.name).to eq('2')
+        expect(City.where(name: '1').filtrate(people: 900).count).to eq(2)
       end
 
-      it 'respects previous selector' do
-        expect(City.where(name: 'city2').filtrate(people: '500').count).to eq(1)
-        expect(City.where(name: 'city2').filtrate(people: '500').first.name).to eq('city2')
+      context 'when filter is invalid' do
+        it 'ignore filter' do
+          expect(City.where(name: '1').filtrate(invalid: 900).count).to eq(3)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_filterable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Francisco Padillo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -133,7 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Easy way to add scopes to your models.