scoped_search 2.2.1 → 2.3.0

data/spec/integration/set_query_spec.rb

@@ -0,0 +1,76 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+# These specs will run on all databases that are defined in the spec/database.yml file.
+# Comment out any databases that you do not have available for testing purposes if needed.
+ScopedSearch::RSpec::Database.test_databases.each do |db|
+
+  describe ScopedSearch, "using a #{db} database" do
+
+    before(:all) do
+      ScopedSearch::RSpec::Database.establish_named_connection(db)
+
+      @class = ScopedSearch::RSpec::Database.create_model(:bool => :boolean, :status => :integer) do |klass|
+        klass.scoped_search :on => :bool, :complete_value => {:yes => true, :no => false}
+        klass.scoped_search :on => :status, :complete_value => {:unknown => 0, :up => 1, :down => 2}
+      end
+    end
+
+    after(:all) do
+      ScopedSearch::RSpec::Database.drop_model(@class)
+      ScopedSearch::RSpec::Database.close_connection
+    end
+
+    context 'querying boolean fields' do
+
+      before(:all) do
+        @record1 = @class.create!(:status => 0)
+        @record2 = @class.create!(:status => 1)
+        @record3 = @class.create!(:status => 2)
+      end
+
+      after(:all) do
+        @record1.destroy
+        @record2.destroy
+        @record3.destroy
+      end
+
+      it "should find the record status = 1" do
+        @class.search_for('status = up').should have(1).item
+      end
+
+      it "should find the record with status = 0" do
+        @class.search_for('status = unknown').should have(1).item
+      end
+
+      it "should find two record with status != 1" do
+        @class.search_for('status != up').should have(2).item
+      end
+    end
+    context 'querying boolean fields' do
+
+      before(:all) do
+        @record1 = @class.create!(:bool => true)
+        @record2 = @class.create!(:bool => false)
+        @record3 = @class.create!(:bool => false)
+      end
+
+      after(:all) do
+        @record1.destroy
+        @record2.destroy
+        @record3.destroy
+      end
+
+      it "should find the record bool = true" do
+        @class.search_for('bool = yes').should have(1).item
+      end
+
+      it "should find two record with bool = false" do
+        @class.search_for('bool = no').should have(2).item
+      end
+
+      it "should find two record with bool = false" do
+        @class.search_for('bool != yes').should have(2).item
+      end
+    end
+  end
+end

data/spec/integration/string_querying_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.
@@ -11,7 +11,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     
       @class = ScopedSearch::RSpec::Database.create_model(:string => :string, :another => :string, :explicit => :string) do |klass|
         klass.scoped_search :on => :string
-        klass.scoped_search :on => :another,  :default_operator => :eq, :alias => :alias
+        klass.scoped_search :on => :another,  :default_operator => :eq, :alias => :alias, :default_order => :desc
         klass.scoped_search :on => :explicit, :only_explicit => true
       end
 
@@ -192,5 +192,22 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for('null? explicit').should have(1).items
       end
     end
+    context 'using order' do
+      it "sort by string ASC" do
+        @class.search_for('',:order => 'string ASC').first.string.should eql('bar')
+      end
+
+      it "sort by string DESC" do
+        @class.search_for('',:order => 'string DESC').first.string.should eql('foo')
+      end
+
+       it "default order by another DESC" do
+        @class.search_for('').first.string.should eql('bar')
+      end
+
+       it "group by explicit" do
+        @class.search_for('',:group => 'explicit').should have(2).items
+      end
+    end
   end
 end

data/spec/lib/matchers.rb

@@ -21,3 +21,13 @@ end
 RSpec::Matchers.define :parse_to do |tree|
   match { |str| tree == ScopedSearch::QueryLanguage::Compiler.parse(str).to_a }
 end
+
+RSpec::Matchers.define :contain do |*expected|
+  match_for_should do |actual|
+    expected.all? { |e| actual.include?(e) }
+  end
+
+  match_for_should_not do |actual|
+    expected.none? { |e| actual.include?(e) }
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'rubygems'
-require 'rspec'
-require 'active_record'
+require 'bundler/setup'
 
+require 'rspec'
 require 'scoped_search'
 
 module ScopedSearch::RSpec; end

data/spec/unit/ast_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe ScopedSearch::QueryLanguage::AST do
 

data/spec/unit/auto_complete_builder_spec.rb

@@ -0,0 +1,20 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe ScopedSearch::AutoCompleteBuilder do
+
+  before(:each) do
+    @definition = mock('ScopedSearch::Definition')
+    @definition.stub!(:klass).and_return(Class.new(ActiveRecord::Base))
+    @definition.stub!(:profile).and_return(:default)
+    @definition.stub!(:profile=).and_return(true)
+  end
+
+  it "should return empty suggestions if the search query is nil" do
+    ScopedSearch::AutoCompleteBuilder.auto_complete(@definition, nil).should == []
+  end
+
+  it "should return empty suggestions if the query is blank" do
+    ScopedSearch::AutoCompleteBuilder.auto_complete(@definition, "").should == []
+  end
+
+end

data/spec/unit/definition_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe ScopedSearch::Definition do
 

data/spec/unit/parser_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe ScopedSearch::QueryLanguage::Parser do
 

data/spec/unit/query_builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe ScopedSearch::QueryBuilder do
 
@@ -6,6 +6,7 @@ describe ScopedSearch::QueryBuilder do
     @definition = mock('ScopedSearch::Definition')
     @definition.stub!(:klass).and_return(Class.new(ActiveRecord::Base))
     @definition.stub!(:profile).and_return(:default)
+    @definition.stub!(:default_order).and_return(nil)
     @definition.stub!(:profile=).and_return(true)
   end
 

data/spec/unit/tokenizer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../spec_helper"
 
 describe ScopedSearch::QueryLanguage::Tokenizer do
 

data/tasks/github-gem.rake

@@ -220,7 +220,7 @@ module GithubGem
 
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
-      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
+      proposed_version = Gem::Version.new((ENV['VERSION'] || gemspec.version).dup)
       raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
@@ -339,22 +339,26 @@ module GithubGem
 
     # Updates the tasks file using the latest file found on Github
     def update_tasks_task
-      require 'net/http'
-
-      server = 'github.com'
-      path   = '/wvanbergen/github-gem/raw/master/tasks/github-gem.rake'
+      require 'net/https'
+      require 'uri'
+      
+      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response = http.request(Net::HTTP::Get.new(uri.path))
 
-      Net::HTTP.start(server) do |http|
-        response = http.get(path)
+      if Net::HTTPSuccess === response
         open(__FILE__, "w") { |file| file.write(response.body) }
-      end
-
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
-      if `#{git} ls-files -m #{relative_file}`.split("\n").any?
-        sh git, 'add', relative_file
-        sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+        if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+          sh git, 'add', relative_file
+          sh git, 'commit', '-m', "Updated to latest gem release management tasks."
+        else
+          puts "Release managament tasks already are at the latest version."
+        end
       else
-        puts "Release managament tasks already are at the latest version."
+        raise "Download failed with HTTP status #{response.code}!"
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scoped_search
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 2
-  - 2
-  - 1
-  version: 2.2.1
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2011-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,20 @@ dependencies:
         version: "2.0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n    \n    It will create a named scope :search_for that can be called with a query string. It will build an SQL query using\n    the provided query string and a definition that specifies on what fields to search. Because the functionality is\n    built on named_scope, the result of the search_for call can be used like any other named_scope, so it can be\n    chained with another scope or combined with will_paginate.\n    \n    Because it uses standard SQL, it does not require any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly add basic search functionality to your application with little hassle. On the other hand,\n    it may not be the best choice if it is going to be used on very large datasets or by a large user base.\n"
 email: 
 - willem@railsdoctors.com
@@ -62,29 +76,37 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .infinity_test
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - init.rb
 - lib/scoped_search.rb
+- lib/scoped_search/auto_complete_builder.rb
 - lib/scoped_search/definition.rb
 - lib/scoped_search/query_builder.rb
 - lib/scoped_search/query_language.rb
 - lib/scoped_search/query_language/ast.rb
 - lib/scoped_search/query_language/parser.rb
 - lib/scoped_search/query_language/tokenizer.rb
+- lib/scoped_search/rails_helper.rb
 - scoped_search.gemspec
 - spec/database.yml
 - spec/integration/api_spec.rb
+- spec/integration/auto_complete_spec.rb
+- spec/integration/key_value_querying_spec.rb
 - spec/integration/ordinal_querying_spec.rb
 - spec/integration/profile_querying_spec.rb
 - spec/integration/relation_querying_spec.rb
+- spec/integration/set_query_spec.rb
 - spec/integration/string_querying_spec.rb
 - spec/lib/database.rb
 - spec/lib/matchers.rb
 - spec/lib/mocks.rb
 - spec/spec_helper.rb
 - spec/unit/ast_spec.rb
+- spec/unit/auto_complete_builder_spec.rb
 - spec/unit/definition_spec.rb
 - spec/unit/parser_spec.rb
 - spec/unit/query_builder_spec.rb
@@ -125,17 +147,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easily search you ActiveRecord models with a simple query language using a named scope.
 test_files: 
 - spec/integration/api_spec.rb
+- spec/integration/auto_complete_spec.rb
+- spec/integration/key_value_querying_spec.rb
 - spec/integration/ordinal_querying_spec.rb
 - spec/integration/profile_querying_spec.rb
 - spec/integration/relation_querying_spec.rb
+- spec/integration/set_query_spec.rb
 - spec/integration/string_querying_spec.rb
 - spec/unit/ast_spec.rb
+- spec/unit/auto_complete_builder_spec.rb
 - spec/unit/definition_spec.rb
 - spec/unit/parser_spec.rb
 - spec/unit/query_builder_spec.rb