dusen 0.5 → 0.5.1

checksums.yaml

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

data/lib/dusen/syntax.rb

@@ -21,20 +21,8 @@ module Dusen
       query = query.condensed
       matches = find_parsed_query(root_scope, query.include)
       if query.exclude.any?
-        exclude_matches = find_parsed_query(root_scope, query.exclude)
-
-        # extract conditions that were added by exclude tokens
-        sql = exclude_matches.to_sql
-        root_pattern = /\A#{Regexp.quote root_scope.to_sql}/
-        sql =~ root_pattern or raise "Could not find ..."
-        sql = sql.sub(root_pattern, '')
-
-        # negate conditions
-        sql = sql.sub(/^\s*WHERE\s*/i, '')
-        sql = sql.sub(/^\s*AND\s*/i, '')
-        sql = "NOT COALESCE(#{sql}, 0)"
-
-        matches.scoped(:conditions => sql)
+        inverted_exclude_scope = build_exclude_scope(root_scope, query.exclude)
+        matches.merge(inverted_exclude_scope)
       else
         matches
       end
@@ -73,5 +61,23 @@ module Dusen
       scope
     end
 
+    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)
+      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
+        root_scope
+      end
+    end
+
   end
 end

data/lib/dusen/version.rb

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

data/spec/rails-3.0/Gemfile.lock

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

data/spec/rails-3.2/Gemfile.lock

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

data/spec/shared/app_root/app/models/recipe.rb

@@ -5,10 +5,16 @@ class Recipe < ActiveRecord::Base
   has_many :ingredients, :class_name => 'Recipe::Ingredient', :inverse_of => :recipe
   belongs_to :category, :class_name => 'Recipe::Category', :inverse_of => :recipes
 
-  search_syntax
-
   search_text do
     [name, category.andand.name, ingredients.collect(&:name)]
   end
 
+  search_syntax do
+
+    search_by :category do |scope, category_name|
+      scope.joins(:category).where('recipe_categories.name = ?', category_name)
+    end
+
+  end
+
 end

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

@@ -132,6 +132,14 @@ 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
+        category1 = Recipe::Category.create!(:name => 'Rice')
+        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]
+      end
+
     end
 
     context 'when the given query is blank' do

metadata

@@ -1,65 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dusen
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  version: "0.5"
+version: !ruby/object:Gem::Version
+  version: 0.5.1
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-03-30 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: edge_rider
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  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 
-        hash: 29
-        segments: 
-        - 0
-        - 2
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.2.5
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 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
@@ -137,39 +124,28 @@ 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 
-  none: false
-  requirements: 
+required_ruby_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'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Comprehensive full text search for ActiveRecord and MySQL
 test_files: []
-