activerecord_search 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4097ce555cccbec53cd5f509e4cefb0ecb2b9788
-  data.tar.gz: 0f786b63db16062d4c6c828a8d49efda9f837fd8
+  metadata.gz: 9e2c93dbe1323a94e591f66c8d2ef01fe4b7b785
+  data.tar.gz: 613ab3f4dac8d3c880d6d7fbf6167c3fed214900
 SHA512:
-  metadata.gz: b5a4af78db0a81edf120b93b4424561875fc8b1554cd8ea858e73a0a4d72977bfe6d029ce6bbe630754ffbb87d2e27093fa2dd80bab362a5ca1f73a8a931e36e
-  data.tar.gz: 1bfee0662dcc85db4dfbaab983d606782b4f9efbb17f81e9ba51b46dc65fa50235702fd0483f4616224f61752bebf9d937e2693685e95cc6ce21929c4fc1d49f
+  metadata.gz: 5e37f2ebeb442713a0da8dc5abc193388f04a7f132e2e9cdc4c0f349e57372b688ebaa7b48e81c95f3decdce7e4bf5a4ada9615a798ed51b5c0591634cc27e23
+  data.tar.gz: a734dc59fba81b519def9addc0eee30463f30ecf6845051710cdbf0dccf97bd8414586fd25e315f46ef2a9ed68cc6288c5d4c0674cf379d38bf84bc949ac50fb

data/lib/activerecord_search.rb

@@ -1,6 +1,6 @@
 require 'activerecord_search/term'
 require 'activerecord_search/railtie'
 
-def Search(*args)
-  ActiverecordSearch::Term.new(*args)
+def Search(condition)
+  ActiverecordSearch::Term.new(condition) unless condition.nil?
 end

data/lib/activerecord_search/term.rb

@@ -3,7 +3,7 @@ module ActiverecordSearch
     def initialize(condition)
       @pattern = case condition
       when nil
-        nil
+        raise "Condition can't be nil"
       when Hash
         key, value = condition.first if condition.length == 1
         case key.to_sym
@@ -22,11 +22,7 @@ module ActiverecordSearch
     end
 
     def match(attribute)
-      if @pattern.nil?
-        attribute.eq(nil)
-      else
-        attribute.matches(@pattern)
-      end
+      attribute.matches(@pattern)
     end
   end
 end

data/spec/lib/activerecord_search_spec.rb

@@ -6,13 +6,13 @@ end
 describe ActiverecordSearch do
   let(:relation) { ActiveRecord::Relation.new(User, Arel::Table.new('users')) }
 
-  shared_examples_for 'generates the correct query' do |condition, attribute, pattern, expected_arel_class = Arel::Nodes::Matches|
+  shared_examples_for 'generates the correct query' do |condition, attribute, pattern|
     let(:arel_nodes) { relation.where(condition).where_values }
     let(:arel_node) { arel_nodes.first }
 
     it 'returns a Arel::Nodes::Matches node' do
       expect(arel_nodes.length).to eq 1
-      expect(arel_node).to be_an expected_arel_class
+      expect(arel_node).to be_an Arel::Nodes::Matches
     end
 
     it 'matches on the specified attribute' do
@@ -41,7 +41,9 @@ describe ActiverecordSearch do
   end
 
   describe 'nil values' do
-    it_should_behave_like 'generates the correct query', { foo: Search(nil) }, 'foo', nil, Arel::Nodes::Equality
+    it 'should return nil if nil is passed in' do
+      expect(Search(nil)).to be_nil
+    end
   end
 
   describe 'exceptions' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_search
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Tony Novak