dusen 0.4.4 → 0.4.5

data/Rakefile

@@ -7,11 +7,16 @@ task :default => 'all:spec'
 namespace :travis_ci do
 
   desc 'Things to do before Travis CI begins'
-  task :prepare do
+  task :prepare => :slimgems do
     Rake::Task['travis_ci:create_database'].invoke &&
     Rake::Task['travis_ci:create_database_yml'].invoke
   end
 
+  desc 'Install slimgems'
+  task :slimgems do
+    system('gem install slimgems')
+  end
+
   desc 'Creates a test database'
   task :create_database do
     system("mysql -e 'create database dusen_test;'")

data/lib/dusen/active_record/base_ext.rb

@@ -10,7 +10,7 @@ module Dusen
           Dusen::Description.parse_syntax(@search_syntax, &dsl) if dsl
           unless singleton_class.method_defined?(:search)
             singleton_class.send(:define_method, :search) do |query_string|
-              @search_syntax.search(self, query_string)
+              @search_syntax.search(scoped({}), query_string)
             end
           end
           @search_syntax

data/lib/dusen/version.rb

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

data/spec/rails-2.3/Gemfile

@@ -6,6 +6,7 @@ gem 'rspec-rails', '~>1.3'
 gem 'mysql2', '~>0.2.0'
 gem 'ruby-debug', :platforms => :ruby_18
 gem 'test-unit', '~>1.2', :platforms => :ruby_19
+gem 'hoe', '=2.8.0', :platforms => :ruby_19
 gem 'database_cleaner'
 gem 'andand'
 

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

@@ -70,7 +70,22 @@ shared_examples_for 'model with search syntax' do
     it 'should distinguish between "Baden" and "Baden-Baden" (bugfix)' do
       match = subject.create!(:city => 'Baden-Baden')
       no_match = subject.create!(:city => 'Baden')
-      subject.search('Baden-Baden').all.should == [match]
+      subject.search('Baden-Baden').to_a.should == [match]
+    end
+
+    context 'when the given query is blank' do
+
+      it 'returns all records' do
+        match = subject.create!
+        subject.search('').to_a.should == [match]
+      end
+
+      it 'respects an existing scope chain' do
+        match = subject.create!(:name => 'Abraham')
+        no_match = subject.create!(:name => 'Elizabath')
+        subject.scoped(:conditions => { :name => 'Abraham' }).search('').to_a.should == [match]
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-15 00:00:00 Z
+date: 2013-05-17 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -132,6 +133,7 @@ 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: []
 
@@ -161,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
 summary: Comprehensive full text search for ActiveRecord and MySQL