dusen 0.5.2 → 0.5.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!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=

data/Rakefile

@@ -49,6 +49,22 @@ namespace :all do
     end
   end
 
+  desc 'Install gems and run tests on several Ruby versions'
+  task :rubies do
+    success = case
+    when system('which rvm')
+      run_for_all_rubies :rvm
+    when system('which rbenv') && `rbenv commands`.split("\n").include?('alias')
+      # rbenv currently works only with the alias plugin, as we do not want to
+      # specify Ruby versions down to their patch levels.
+      run_for_all_rubies :rbenv
+    else
+      fail 'Currently only RVM and rbenv (with alias plugin) are supported. Open Rakefile and add your Ruby version manager!'
+    end
+
+    fail "Tests failed" unless success
+  end
+
 end
 
 def for_each_directory_of(path, &block)
@@ -58,3 +74,35 @@ def for_each_directory_of(path, &block)
     block.call(directory)
   end
 end
+
+def run_for_all_rubies(version_manager)
+  %w[
+    1.8.7
+    1.9.3
+    2.1.2
+  ].all? do |ruby_version|
+    announce "Running bundle and specs for Ruby #{ruby_version}", 2
+
+    execute = case version_manager
+    when :rvm
+      "rvm #{ruby_version} do"
+    when :rbenv
+      ENV['RBENV_VERSION'] = ruby_version
+      'rbenv exec'
+    end
+
+    current_version = `#{execute} ruby -v`.match(/^ruby (\d\.\d\.\d)/)[1]
+    if current_version == ruby_version
+      puts "Currently active Ruby is #{current_version}"
+      system "#{execute} rake all:bundle all:spec"
+    else
+      fail "Failed to set Ruby #{ruby_version} (#{current_version} active!)"
+    end
+  end
+end
+
+def announce(text, level = 1)
+  space = "\n" * level
+  message = "# #{text}"
+  puts "\e[4;34m#{space + message}\e[0m" # blue underline
+end

data/lib/dusen/parser.rb

@@ -3,8 +3,7 @@
 module Dusen
   class Parser
 
-    WESTERNISH_WORD_CHARACTER =  '\\w\\-\\.;@_ÄÖÜäöüß' # this is wrong on so many levels
-    TEXT_QUERY = /(?:(\-)?"([^"]+)"|(\-)?([#{WESTERNISH_WORD_CHARACTER}]+))/
+    TEXT_QUERY = /(?:(\-)?"([^"]+)"|(\-)?([\S]+))/
     FIELD_QUERY = /(\-)?(\w+)\:#{TEXT_QUERY}/
 
     def self.parse(query_string)

data/lib/dusen/syntax.rb

@@ -70,6 +70,7 @@ module Dusen
         exclude_scope.except(:where).where(inverted_sql)
       else
         # we cannot build an inverted scope without where-conditions
+
         root_scope
       end
     end

data/lib/dusen/version.rb

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

data/spec/rails-3.0/Gemfile.lock

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

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

@@ -66,7 +66,7 @@ shared_examples_for 'model with search syntax' do
       subject.search('E.ONNNEN').to_a.should == [match]
     end
 
-    it 'should find words where one letter is separated from other letters by a period' do
+    it 'should find words where one letter is separated from other letters by a semicolon' do
       match = subject.create!(:name => 'E;ONNNEN')
       subject.search('E;ONNNEN')
       subject.search('E;ONNNEN').to_a.should == [match]
@@ -78,6 +78,11 @@ shared_examples_for 'model with search syntax' do
       subject.search('Baden-Baden').to_a.should == [match]
     end
 
+    it 'should handle umlauts and special characters' do
+      match = subject.create!(:city => 'púlvérìsätëûr')
+      subject.search('púlvérìsätëûr').to_a.should == [match]
+    end
+
     context 'with excludes' do
 
       it 'should exclude words with prefix - (minus)' do

data/spec/shared/spec/dusen/parser_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Dusen::Parser do
@@ -14,6 +16,11 @@ describe Dusen::Parser do
       query.collect(&:value).should == ['Baden-Baden']
     end
 
+    it 'should parse umlauts and accents' do
+      query = Dusen::Parser.parse('field:åöÙÔøüéíÁ "ÄüÊçñÆ ððÿáÒÉ" pulvérisateur pędzić')
+      query.collect(&:value).should == ['åöÙÔøüéíÁ', 'ÄüÊçñÆ ððÿáÒÉ', 'pulvérisateur', 'pędzić']
+    end
+
   end
 
 end

metadata

@@ -1,63 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dusen
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
+version: !ruby/object:Gem::Version
+  version: 0.5.3
 platform: ruby
-authors: 
+authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-04-02 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-04-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 2
-        - 5
+  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
   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: 
+files:
 - .gitignore
 - .ruby-version
 - .travis.yml
@@ -138,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: 
-  - - ">="
-    - !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"
+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'
 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: []
-