mongoid-filterable 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fde9d83b88b2d886f664e4b8f6259b211bcc8de3
-  data.tar.gz: e210953988bc2bf8d6312088f0d5c5242edf9f03
+  metadata.gz: 8569c578ae3ca2f65454cd555e1e782990d1683d
+  data.tar.gz: 241bf4537c8bbd14941633fb90d3596a3c4e8cbd
 SHA512:
-  metadata.gz: d785c82ca2ab77429e5c205d542e93bad551e98a5b65ef0d2bc3729a3250e245f166f4764ef6ea374a355cfd57ef94e21654734fba0f6fea0e13e34de18003f4
-  data.tar.gz: 5ecd66e9db4e1fdb733c36d75ddf9bb027718e4512b617f23bfb5bda63e2d0fee61df364d76dff1fc64e7a16218dbe090c615d7f9262f814239773415f11c743
+  metadata.gz: 850126a6da8200e6eb107f1540e9a027c7c1d44db15baeaf3c058500027c18ee0709e0c48474e55f9be43ff62d21792ecc211b55e6a242d571a10d1b46f3acdc
+  data.tar.gz: c286fa0accc54edd85318462a1940e8cc17a40a3dcede73bf88226fa8713f1b7010843bfa93976359b6717f1f60969f53b0c1a932fca00438a2b0b4039e33e7d

data/README.md

@@ -29,7 +29,7 @@ class City
   field :people
 
   filter_by(:name)
-  filter_by(:people, lambda{|value| where(:people.gt => value)})
+  filter_by(:people, ->(value) { where(:people.gt => value) })
 end
 
 City.create(name: 'city1', people: 100)
@@ -41,7 +41,7 @@ City.filter({people: 500}) # => 1
 
 #### Operator
 
-You can specify selector operator: 
+You can specify selector operator:
 
 * $and (default operator)
 * $or
@@ -58,7 +58,7 @@ class CitiesController
   def index
     respond_with City.filter(filter_params)
   end
-  
+
   private
 
   def filter_params

data/lib/mongoid-filterable/filterable.rb

@@ -7,33 +7,31 @@ module Mongoid
       ##
       # Applies params scopes to current scope
       #
-      def filter(filtering_params, operator='$and')
+      def filter(filtering_params, operator = '$and')
         return self unless filtering_params
-        results = self.all
+        results = all
         selectors = []
+        criteria = Mongoid::Criteria.new(self)
 
         filtering_params.each do |key, value|
-          if value.present? && self.respond_to?("filter_with_#{key}")
-            selectors.push self.public_send("filter_with_#{key}", value).selector
+          if value.present? && respond_to?("filter_with_#{key}")
+            selectors.push criteria.public_send("filter_with_#{key}", value).selector
           end
         end
 
-        results.selector = {operator => selectors} if selectors.size > 0
-        results
+        selectors.empty? ? results : results.where(operator => selectors)
       end
 
       ##
       # Adds attr scope
       #
-      def filter_by(attr, filter=nil)
+      def filter_by(attr, filter = nil)
         if filter
-          self.scope "filter_with_#{attr}", filter
+          scope "filter_with_#{attr}", filter
+        elsif fields[attr.to_s].type == String
+          scope "filter_with_#{attr}", ->(value) { where(attr => Regexp.new(value)) }
         else
-          if self.fields[attr.to_s].type == String
-            self.scope "filter_with_#{attr}", lambda{ |value| where(attr => Regexp.new(value)) }
-          else
-            self.scope "filter_with_#{attr}", lambda{ |value| where(attr => value) }
-          end
+          scope "filter_with_#{attr}", ->(value) { where(attr => value) }
         end
       end
 
@@ -43,8 +41,8 @@ module Mongoid
       #
       def filter_by_normalized(attr)
         normalized_name = (attr.to_s + '_normalized').to_sym
-        self.scope "filter_with_#{attr}", lambda{ |value|
-          where( normalized_name => Regexp.new(I18n.transliterate(value), 'i') )
+        scope "filter_with_#{attr}", lambda { |value|
+          where(normalized_name => Regexp.new(I18n.transliterate(value), 'i'))
         }
       end
     end

data/lib/mongoid-filterable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Filterable
-    VERSION = "0.1.1"
+    VERSION = '0.2.0'
   end
 end

data/lib/mongoid-filterable.rb

@@ -1,2 +1,2 @@
-require "mongoid-filterable/version"
-require "mongoid-filterable/filterable"
+require 'mongoid-filterable/version'
+require 'mongoid-filterable/filterable'

data/spec/filterable_spec.rb

@@ -12,7 +12,7 @@ describe Mongoid::Filterable do
 
     filter_by(:name)
     filter_by(:code)
-    filter_by(:people, lambda{|value| where(:people.gt => value)})
+    filter_by(:people, ->(value) { where(:people.gt => value) })
     filter_by_normalized(:country)
   end
 
@@ -24,30 +24,38 @@ describe Mongoid::Filterable do
     it 'should filter by default filter' do
       City.create(code: :code1)
       City.create(code: :code2)
-      expect(City.filter({code: :code1}).count).to eq(1)
-      expect(City.filter({code: :code1}).first.code).to eq(:code1)
+      expect(City.filter(code: :code1).count).to eq(1)
+      expect(City.filter(code: :code1).first.code).to eq(:code1)
     end
 
     it 'should filter by match filter' do
       City.create(name: 'city1')
       City.create(name: 'city2')
-      expect(City.filter({name: 'city'}).count).to eq(2)
-      expect(City.filter({name: 'city1'}).count).to eq(1)
-      expect(City.filter({name: 'city1'}).first.name).to eq('city1')
+      expect(City.filter(name: 'city').count).to eq(2)
+      expect(City.filter(name: 'city1').count).to eq(1)
+      expect(City.filter(name: 'city1').first.name).to eq('city1')
     end
 
     it 'should filter by custom filter' do
       City.create(people: 100)
       City.create(people: 1000)
-      expect(City.filter({people: 500}).count).to eq(1)
-      expect(City.filter({people: 500}).first.people).to eq(1000)
+      expect(City.filter(people: 500).count).to eq(1)
+      expect(City.filter(people: 500).first.people).to eq(1000)
     end
 
     it 'should filter by normalized filter' do
       City.create(country_normalized: 'spain')
       City.create(country_normalized: 'france')
-      expect(City.filter({country: 'spain'}).count).to eq(1)
-      expect(City.filter({country: 'spain'}).first.country_normalized).to eq('spain')
+      expect(City.filter(country: 'spain').count).to eq(1)
+      expect(City.filter(country: 'spain').first.country_normalized).to eq('spain')
+    end
+
+    it 'should respect previous selector' do
+      City.create(name: 'city1', people: 100)
+      City.create(name: 'city2', people: 1000)
+      City.create(name: 'city3', people: 2000)
+      expect(City.where(name: 'city2').filter(people: '500').count).to eq(1)
+      expect(City.where(name: 'city2').filter(people: '500').first.name).to eq('city2')
     end
   end
 
@@ -71,7 +79,7 @@ describe Mongoid::Filterable do
     it 'should ignore filter' do
       City.create(name: 'city1')
       City.create(name: 'city2')
-      expect(City.filter({invalid: 'val'}).count).to eq(2)
+      expect(City.filter(invalid: 'val').count).to eq(2)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-filterable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rafael Jurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,3 +113,4 @@ test_files:
 - spec/filterable_spec.rb
 - spec/spec_helper.rb
 - spec/support/mongoid.yml
+has_rdoc: