dusen 0.5.1 → 0.5.2

data/lib/dusen/parser.rb

@@ -5,7 +5,7 @@ module Dusen
 
     WESTERNISH_WORD_CHARACTER =  '\\w\\-\\.;@_ÄÖÜäöüß' # this is wrong on so many levels
     TEXT_QUERY = /(?:(\-)?"([^"]+)"|(\-)?([#{WESTERNISH_WORD_CHARACTER}]+))/
-    FIELD_QUERY = /(\w+)\:#{TEXT_QUERY}/
+    FIELD_QUERY = /(\-)?(\w+)\:#{TEXT_QUERY}/
 
     def self.parse(query_string)
       query_string = query_string.dup # we are going to delete substrings in-place
@@ -26,9 +26,9 @@ module Dusen
 
     def self.extract_field_query_tokens(query_string, query)
       while query_string.sub!(FIELD_QUERY, '')
-        field = $1
-        value = "#{$3}#{$5}"
-        exclude = "#{$2}#{$4}" == "-"
+        field = $2
+        value = "#{$4}#{$6}"
+        exclude = "#{$1}" == "-"
         options = { :field => field, :value => value, :exclude => exclude }
         query << Token.new(options)
       end

data/lib/dusen/syntax.rb

@@ -64,20 +64,31 @@ module Dusen
     def build_exclude_scope(root_scope, exclude_query)
       root_scope_without_conditions = root_scope.except(:where)
       exclude_scope = find_parsed_query(root_scope_without_conditions, exclude_query)
-      exclude_scope_conditions = exclude_scope.where_values.reduce(:and)
+      exclude_scope_conditions = concatenate_where_values(exclude_scope.where_values)
       if exclude_scope_conditions.present?
-        # where_values.reduce(:and) returns a string if only one where_value given
-        # and a Arel::Node for more than one where_value
-        unless exclude_scope_conditions.is_a?(String)
-          exclude_scope_conditions = exclude_scope_conditions.to_sql
-        end
         inverted_sql = "NOT COALESCE (" + exclude_scope_conditions + ",0)"
         exclude_scope.except(:where).where(inverted_sql)
       else
-        # we cannot build an inverted scope if no where-conditions are present
+        # we cannot build an inverted scope without where-conditions
         root_scope
       end
     end
 
+    def concatenate_where_values(where_values)
+      if where_values.any?
+        if where_values[0].is_a?(String)
+          first = where_values.shift
+          where = where_values.reduce(first) do |result, value|
+            result << " AND " << value
+          end
+          where
+        else
+          # where_values are AREL-Nodes
+          where = where_values.reduce(:and)
+          where.to_sql
+        end
+      end
+    end
+
   end
 end

data/lib/dusen/version.rb

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

data/spec/rails-3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    dusen (0.5)
+    dusen (0.5.1)
       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)
+    dusen (0.5.1)
       activerecord (>= 3.0)
       edge_rider (>= 0.2.5)
 

data/spec/shared/app_root/app/models/user/with_fulltext.rb

@@ -23,6 +23,12 @@ module User
         scope.scoped(:conditions => { :role => role })
       end
 
+      search_by :name_and_city_regex do |scope, regex|
+        #Example for regexes that need to be and'ed together by syntax#build_exclude_scope
+        first = scope.where("users_with_fulltext.name REGEXP ?", regex)
+        second = scope.where("users_with_fulltext.city REGEXP ?", regex)
+        first.merge(second)
+      end
     end
 
     search_text do

data/spec/shared/app_root/app/models/user/without_fulltext.rb

@@ -27,6 +27,13 @@ module User
         scope.scoped(:conditions => { :role => role })
       end
 
+      search_by :name_and_city_regex do |scope, regex|
+        #Example for regexes that need to be and'ed together by syntax#build_exclude_scope
+        first = scope.where("users_without_fulltext.name REGEXP ?", regex)
+        second = scope.where("users_without_fulltext.city REGEXP ?", regex)
+        first.merge(second)
+      end
+
     end
 
   end

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

@@ -98,7 +98,7 @@ shared_examples_for 'model with search syntax' do
         match = subject.create!(:name => 'Abraham', :city => 'Foohausen')
         no_match = subject.create!(:name => 'Abraham', :city => 'Barhausen')
         no_match2 = subject.create!(:name => 'Absolutly no match')
-        subject.search('Abraham city:-Barhausen').to_a.should == [match]
+        subject.search('Abraham -city:Barhausen').to_a.should == [match]
       end
 
       it 'should work if the query only contains excluded words' do
@@ -116,7 +116,7 @@ shared_examples_for 'model with search syntax' do
       it 'should work if the query only contains excluded qualified fields' do
         match = subject.create!(:name => 'Abraham', :city => 'Foohausen')
         no_match = subject.create!(:name => 'Abraham', :city => 'Barhausen')
-        subject.search('city:-Barhausen').to_a.should == [match]
+        subject.search('-city:Barhausen').to_a.should == [match]
       end
 
       it 'respects an existing scope chain when there are only excluded tokens (bugfix)' do
@@ -132,12 +132,18 @@ shared_examples_for 'model with search syntax' do
         subject.search('Sunny -Power').to_a.should == [match]
       end
 
-      it 'should work if search_by contains a join' do
+      it 'should work if search_by contains a join (bugfix)' do
         category1 = Recipe::Category.create!(:name => 'Rice')
-        category2= Recipe::Category.create!(:name => 'Barbecue')
+        category2 = Recipe::Category.create!(:name => 'Barbecue')
         match = Recipe.create!(:name => 'Martini Chicken', :category => category1)
         no_match = Recipe.create!(:name => 'Barbecue Chicken', :category => category2)
-        Recipe.search('category:-Barbecue').to_a.should == [match]
+        Recipe.search('Chicken -category:Barbecue').to_a.should == [match]
+      end
+
+      it 'should work when search_by uses SQL-Regexes which need to be "and"ed together by syntax#build_exclude_scope (bugfix)' do
+        match = subject.create!(:name => 'Sunny Flower', :city => "Flower")
+        no_match = subject.create!(:name => 'Sunny Power', :city => "Power")
+        subject.search('-name_and_city_regex:Power').to_a.should == [match]
       end
 
     end
@@ -166,7 +172,7 @@ shared_examples_for 'model with search syntax' do
     end
 
     it 'should be callable multiple times, appending additional syntax' do
-      subject.search_syntax.fields.keys.should =~ ['text', 'email', 'city', 'role']
+      subject.search_syntax.fields.keys.should =~ ['text', 'email', 'city', 'role', 'name_and_city_regex']
     end
 
   end

metadata

@@ -1,52 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dusen
-version: !ruby/object:Gem::Version
-  version: 0.5.1
+version: !ruby/object:Gem::Version 
+  hash: 15
+  prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
-authors:
+authors: 
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2015-04-02 00:00:00 +02:00
+default_executable: 
+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:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.5
+      - !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:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !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:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .ruby-version
+- .travis.yml
 - LICENSE
 - README.md
 - Rakefile
@@ -124,28 +138,39 @@ files:
 - spec/shared/spec/dusen/parser_spec.rb
 - spec/shared/spec/dusen/query_spec.rb
 - spec/shared/spec/dusen/util_spec.rb
+has_rdoc: true
 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:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  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
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.3.9.5
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Comprehensive full text search for ActiveRecord and MySQL
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 28383a66956bb8c3378bb0033387475fca743a53
-  data.tar.gz: 4b5dc66350c2c31cd070307a54b60296f8ed8dee
-SHA512:
-  metadata.gz: 76ead2fcf071262ae45ea9d710c51150a668d6639752fa6750c4fa7908a11cd562eddb166be657d11d72dfe21009dcb8bcb16740ea29d39c2662cc871efc9936
-  data.tar.gz: a93bc1087afd7ddb94fc955dc0f0323d1fb8c581503c7659615b5738158fe70779eead5cf958ef3c5a7bea69b46f7e15a20278a3ff68652333c531d4683c12fd