dusen 0.5.3 → 0.6.0

data/README.md

@@ -81,6 +81,9 @@ that looks roughly like the following:
       contacts.email LIKE "%market ave%"  OR 
       contacts.email LIKE "%market ave%" )
 
+You can also use `where_like` to find all the records *not* matching some phrases, using the `:negate` option:
+
+    Contact.where_like({ :name => 'foo' }, { :negate => true })
 
 Processing queries for qualified fields
 ---------------------------------------

data/lib/dusen/active_record/base_ext.rb

@@ -88,14 +88,24 @@ module Dusen
 
         end
 
-        def where_like(conditions)
+        def where_like(conditions, options = {})
           scope = self
+          if options[:negate]
+            match_operator = 'NOT LIKE'
+            join_operator = 'AND'
+          else
+            match_operator = 'LIKE'
+            join_operator = 'OR'
+          end
+
           conditions.each do |field_or_fields, query|
             fields = Array(field_or_fields).collect do |field|
               Util.qualify_column_name(scope, field)
             end
             Array.wrap(query).each do |phrase|
-              phrase_with_placeholders = fields.collect { |field| "#{field} LIKE ?" }.join(' OR ')
+              phrase_with_placeholders = fields.collect { |field|
+                "#{field} #{match_operator} ?"
+              }.join(" #{join_operator} ")
               like_expression = Dusen::Util.like_expression(phrase)
               bindings = [like_expression] * fields.size
               conditions = [ phrase_with_placeholders, *bindings ]

data/lib/dusen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dusen
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

data/spec/rails-3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    dusen (0.5.2)
+    dusen (0.6.0)
       activerecord (>= 3.0)
       edge_rider (>= 0.2.5)
 

data/spec/rails-3.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    dusen (0.5.2)
+    dusen (0.6.0)
       activerecord (>= 3.0)
       edge_rider (>= 0.2.5)
 

data/spec/shared/spec/dusen/active_record/base_ext_spec.rb

@@ -181,6 +181,42 @@ shared_examples_for 'model with search syntax' do
     end
 
   end
+  
+  describe '.where_like' do
+
+    it 'matches a record if a word appears in any of the given columns' do
+      match1 = subject.create!(:name => 'word', :city => 'XXXX')
+      match2 = subject.create!(:name => 'XXXX', :city => 'word')
+      no_match = subject.create!(:name => 'XXXX', :city => 'XXXX')
+      subject.where_like([:name, :city] => 'word').to_a.should =~ [match1, match2]
+    end
+    
+    it 'matches a record if it contains all the given words' do
+      match1 = subject.create!(:city => 'word1 word2')
+      match2 = subject.create!(:city => 'word2 word1')
+      no_match = subject.create!(:city => 'word1')
+      subject.where_like(:city => ['word1', 'word2']).to_a.should =~ [match1, match2]
+    end
+
+    describe 'with :negate option' do
+
+      it 'rejects a record if a word appears in any of the given columns' do
+        no_match1 = subject.create!(:name => 'word', :city => 'XXXX')
+        no_match2 = subject.create!(:name => 'XXXX', :city => 'word')
+        match = subject.create!(:name => 'XXXX', :city => 'XXXX')
+        subject.where_like({ [:name, :city] => 'word' }, :negate => true).to_a.should =~ [match]
+      end
+
+      it 'rejects a record if it matches at least one of the given words' do
+        no_match1 = subject.create!(:city => 'word1')
+        no_match2 = subject.create!(:city => 'word2')
+        match = subject.create!(:city => 'word3')
+        subject.where_like({ :city => ['word1', 'word2'] }, :negate => true).to_a.should =~ [match]
+      end
+
+    end
+    
+  end
 
 end
 

metadata

@@ -1,49 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dusen
-version: !ruby/object:Gem::Version
-  version: 0.5.3
+version: !ruby/object:Gem::Version 
+  hash: 7
+  prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
-authors:
+authors: 
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-06-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: edge_rider
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.5
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: edge_rider
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 2
+        - 5
         version: 0.2.5
+  type: :runtime
+  version_requirements: *id002
 description: Comprehensive full text search for ActiveRecord and MySQL
 email: henning.koch@makandra.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .ruby-version
 - .travis.yml
@@ -125,27 +138,38 @@ files:
 - spec/shared/spec/dusen/query_spec.rb
 - spec/shared/spec/dusen/util_spec.rb
 homepage: https://github.com/makandra/dusen
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Comprehensive full text search for ActiveRecord and MySQL
 test_files: []
+
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWVjNGViYjQ5OGJlOWNjNzM5ZmMzMzBjZTYxODEyN2VjMWRiZTZlYQ==
-  data.tar.gz: !binary |-
-    OTQ2ODMzOTg0ZmZhYjg4NjYyMjMyOWNlZDVmZmYxOWU5ZThjYTE5Ng==
-SHA512:
-  metadata.gz: !binary |-
-    NmJjMzI3NDUzMjY1MzgwNDZjMzMxZDcwZmNkNWY5NWUyOWQyMWRkOTg1NTEy
-    ZTljNjlhYmZlZWI2MDQyMGM1MmEzZTBlZTcyNzRmOTVlZDQxMDA0MDI1ZWEz
-    ODAzMTAyYzgwMjI1Nzc0YThkMTVmMzE5YmI5NTRjYjg2NjYxMDI=
-  data.tar.gz: !binary |-
-    YTZjYTYzMDYxNDEzMDM4M2RlM2MyY2NmYTcxOWMzYjczYjY5ZjY3YmFkOTBj
-    ZjYxMWJiOTY4OTE0OWI4ZjMxMzMzMjc0MTY4NWM5NzMwZDk0NzBkMmEwM2Vl
-    NzA3ZmQyMTIxODVhNmJlMDk0ZWQ3ZTY3NDVjMDRiNDNkMTEzNjc=