scoped_search 2.2.0 → 2.2.1

data/spec/integration/string_querying_spec.rb

@@ -1,15 +1,15 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require '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::Spec::Database.test_databases.each do |db|
+ScopedSearch::RSpec::Database.test_databases.each do |db|
 
   describe ScopedSearch, "using a #{db} database" do
 
     before(:all) do
-      ScopedSearch::Spec::Database.establish_named_connection(db)
+      ScopedSearch::RSpec::Database.establish_named_connection(db)
     
-      @class = ScopedSearch::Spec::Database.create_model(:string => :string, :another => :string, :explicit => :string) do |klass|
+      @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 => :explicit, :only_explicit => true
@@ -21,8 +21,8 @@ ScopedSearch::Spec::Database.test_databases.each do |db|
     end
 
     after(:all) do
-      ScopedSearch::Spec::Database.drop_model(@class)
-      ScopedSearch::Spec::Database.close_connection
+      ScopedSearch::RSpec::Database.drop_model(@class)
+      ScopedSearch::RSpec::Database.close_connection
     end
 
     context 'in an implicit string field' do

data/spec/lib/database.rb

@@ -1,6 +1,7 @@
+require 'erb'
 ActiveRecord::Migration.verbose = false unless ENV.has_key?('DEBUG')
 
-module ScopedSearch::Spec::Database
+module ScopedSearch::RSpec::Database
 
   def self.establish_connection
     if ENV['DATABASE']
@@ -10,15 +11,18 @@ module ScopedSearch::Spec::Database
     end
   end
 
+  def self.test_databases_configuration
+    file = File.expand_path("../database.yml", File.dirname(__FILE__))
+    @database_connections ||= YAML.load(ERB.new(File.read(file)).result)
+  end
+  
   def self.test_databases
-    @database_connections ||= YAML.load(File.read("#{File.dirname(__FILE__)}/../database.yml"))
-    @database_connections.keys
+    test_databases_configuration.keys
   end
 
   def self.establish_named_connection(name)
-    @database_connections ||= YAML.load(File.read("#{File.dirname(__FILE__)}/../database.yml"))
-    raise "#{name} database not configured" if @database_connections[name.to_s].nil?
-    ActiveRecord::Base.establish_connection(@database_connections[name.to_s])
+    raise "#{name} database not configured" if test_databases_configuration[name.to_s].nil?
+    ActiveRecord::Base.establish_connection(test_databases_configuration[name.to_s])
   end
 
   def self.establish_default_connection

data/spec/lib/matchers.rb

@@ -1,40 +1,23 @@
-module ScopedSearch::Spec::Matchers
-  def be_infix_operator(operator = nil)
-    simple_matcher('node to be an infix operator') do |node|
-      node.kind_of?(ScopedSearch::QueryLanguage::AST::OperatorNode) &&
-          node.infix? && (operator.nil? || operator == node.operator)
-    end
-  end
+RSpec::Matchers.define :be_infix_operator do |operator|
+  match { |node| node.kind_of?(ScopedSearch::QueryLanguage::AST::OperatorNode) && node.infix? && (operator.nil? || operator == node.operator) }
+end
 
-  def be_prefix_operator(operator = nil)
-    simple_matcher('node to be an prefix operator') do |node|
-      node.kind_of?(ScopedSearch::QueryLanguage::AST::OperatorNode) &&
-          node.prefix? && (operator.nil? || operator == node.operator)
-    end
-  end
+RSpec::Matchers.define :be_prefix_operator do |operator|
+  match { |node| node.kind_of?(ScopedSearch::QueryLanguage::AST::OperatorNode) && node.prefix? && (operator.nil? || operator == node.operator) }
+end
 
-  def be_logical_operator(operator = nil)
-    simple_matcher('node to be an logical operator') do |node|
-      node.kind_of?(ScopedSearch::QueryLanguage::AST::LogicalOperatorNode) &&
-          (operator.nil? || operator == node.operator)
-    end
-  end
+RSpec::Matchers.define :be_logical_operator do |operator|
+  match { |node| node.kind_of?(ScopedSearch::QueryLanguage::AST::LogicalOperatorNode) && (operator.nil? || operator == node.operator) }
+end
 
-  def be_leaf_node(value = nil)
-    simple_matcher('node to be an logical operator') do |node|
-      node.kind_of?(ScopedSearch::QueryLanguage::AST::LeafNode) && (value.nil? || value == node.value)
-    end
-  end
+RSpec::Matchers.define :be_leaf_node do |value|
+  match { |node| node.kind_of?(ScopedSearch::QueryLanguage::AST::LeafNode) && (value.nil? || value == node.value) }
+end
 
-  def tokenize_to(*tokens)
-    simple_matcher("to tokenize to #{tokens.inspect}") do |string|
-      tokens == ScopedSearch::QueryLanguage::Compiler.tokenize(string)
-    end
-  end
+RSpec::Matchers.define :tokenize_to do |*tokens|
+  match { |str| tokens == ScopedSearch::QueryLanguage::Compiler.tokenize(str) }
+end
 
-  def parse_to(tree)
-    simple_matcher("to parse to #{tree.inspect}") do |string|
-      tree == ScopedSearch::QueryLanguage::Compiler.parse(string).to_a
-    end
-  end
+RSpec::Matchers.define :parse_to do |tree|
+  match { |str| tree == ScopedSearch::QueryLanguage::Compiler.parse(str).to_a }
 end

data/spec/lib/mocks.rb

@@ -1,4 +1,4 @@
-module ScopedSearch::Spec::Mocks
+module ScopedSearch::RSpec::Mocks
 
   def tree(array)
     ScopedSearch::QueryLanguage::AST.from_array(array)

data/spec/spec_helper.rb

@@ -1,19 +1,18 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'active_record'
 
 require 'scoped_search'
 
-module ScopedSearch::Spec; end
+module ScopedSearch::RSpec; end
 
 require "#{File.dirname(__FILE__)}/lib/matchers"
 require "#{File.dirname(__FILE__)}/lib/database"
 require "#{File.dirname(__FILE__)}/lib/mocks"
 
 
-Spec::Runner.configure do |config|
-  config.include ScopedSearch::Spec::Matchers
-  config.include ScopedSearch::Spec::Mocks
+RSpec.configure do |config|
+  config.include ScopedSearch::RSpec::Mocks
 end

data/spec/unit/ast_spec.rb

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

data/spec/unit/definition_spec.rb

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

data/spec/unit/parser_spec.rb

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

data/spec/unit/query_builder_spec.rb

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

data/spec/unit/tokenizer_spec.rb

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

data/tasks/github-gem.rake

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/tasklib'
 require 'date'
-require 'git'
+require 'set'
 
 module GithubGem
 
@@ -24,7 +24,7 @@ module GithubGem
 
   class RakeTasks
 
-    attr_reader   :gemspec, :modified_files, :git
+    attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
     # Initializes the settings, yields itself for configuration
@@ -33,7 +33,7 @@ module GithubGem
       @gemspec_file   = GithubGem.detect_gemspec_file
       @task_namespace = task_namespace
       @main_include   = GithubGem.detect_main_include
-      @modified_files = []
+      @modified_files = Set.new
       @root_dir       = Dir.pwd
       @test_pattern   = 'test/**/*_test.rb'
       @spec_pattern   = 'spec/**/*_spec.rb'
@@ -43,13 +43,16 @@ module GithubGem
 
       yield(self) if block_given?
 
-      @git = Git.open(@root_dir)
       load_gemspec!
       define_tasks!
     end
 
     protected
 
+    def git
+      @git ||= ENV['GIT'] || 'git'
+    end
+
     # Define Unit test tasks
     def define_test_tasks!
       require 'rake/testtask'
@@ -68,23 +71,23 @@ module GithubGem
 
     # Defines RSpec tasks
     def define_rspec_tasks!
-      require 'spec/rake/spectask'
+      require 'rspec/core/rake_task'
 
       namespace(:spec) do
         desc "Verify all RSpec examples for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:basic) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:basic) do |t|
+          t.pattern = spec_pattern
         end
 
         desc "Verify all RSpec examples for #{gemspec.name} and output specdoc"
-        Spec::Rake::SpecTask.new(:specdoc) do |t|
-          t.spec_files = FileList[spec_pattern]
-          t.spec_opts << '--format' << 'specdoc' << '--color'
+        RSpec::Core::RakeTask.new(:specdoc) do |t|
+          t.pattern = spec_pattern
+          t.rspec_opts = ['--format', 'documentation', '--color']
         end
 
         desc "Run RCov on specs for #{gemspec.name}"
-        Spec::Rake::SpecTask.new(:rcov) do |t|
-          t.spec_files = FileList[spec_pattern]
+        RSpec::Core::RakeTask.new(:rcov) do |t|
+          t.pattern = spec_pattern
           t.rcov = true
           t.rcov_opts = ['--exclude', '"spec/*,gems/*"', '--rails']
         end
@@ -134,8 +137,8 @@ module GithubGem
           desc "Release the next version of the gem, by incrementing the last version segment by 1"
           task(:next => [:next_version] + release_tasks) { release_task }
 
-          desc "Release the next version of the gem, using a bump increment (0.0.1)"
-          task(:bump => [:next_bump_version] + release_tasks) { release_task }
+          desc "Release the next version of the gem, using a patch increment (0.0.1)"
+          task(:patch => [:next_patch_version] + release_tasks) { release_task }
 
           desc "Release the next version of the gem, using a minor increment (0.1.0)"
           task(:minor => [:next_minor_version] + release_tasks) { release_task }
@@ -152,7 +155,7 @@ module GithubGem
         task(:commit_modified_files) { commit_modified_files_task }
 
         task(:next_version)       { next_version_task }
-        task(:next_bump_version)  { next_version_task(:bump) }
+        task(:next_patch_version)  { next_version_task(:patch) }
         task(:next_minor_version) { next_version_task(:minor) }
         task(:next_major_version) { next_version_task(:major) }
         
@@ -165,7 +168,7 @@ module GithubGem
     # in the repository and the spec/test file pattern.
     def manifest_task
       # Load all the gem's files using "git ls-files"
-      repository_files = git.ls_files.keys
+      repository_files = `#{git} ls-files`.split("\n")
       test_files       = Dir[test_pattern] + Dir[spec_pattern]
 
       update_gemspec(:files, repository_files)
@@ -180,14 +183,14 @@ module GithubGem
     end
 
     def newest_version
-      git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
     end
 
     def next_version(increment = nil)
       next_version = newest_version.segments
       increment_index = case increment
         when :micro then 3
-        when :bump  then 2
+        when :patch then 2
         when :minor then 1
         when :major then 0
         else next_version.length - 1
@@ -217,72 +220,58 @@ 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'] || gemspec.version)
+      proposed_version = Gem::Version.new(ENV['VERSION'].dup || gemspec.version)
       raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
     # Checks whether the current branch is not diverged from the remote branch
     def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.remote(remote).branch(remote_branch).gcommit).any?
+      raise "The current branch is diverged from the remote branch!" if `#{git} rev-list HEAD..#{remote}/#{remote_branch}`.split("\n").any?
     end
 
     # Checks whether the repository status ic clean
     def check_clean_status_task
-      raise "The current working copy contains modifications" if git.status.changed.any?
+      raise "The current working copy contains modifications" if `#{git} ls-files -m`.split("\n").any?
     end
 
     # Checks whether the current branch is correct
     def check_current_branch_task
-      raise "Currently not on #{local_branch} branch!" unless git.branch.name == local_branch.to_s
+      raise "Currently not on #{local_branch} branch!" unless `#{git} branch`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
     end
 
     # Fetches the latest updates from Github
     def fetch_origin_task
-      git.fetch('origin')
+      sh git, 'fetch', remote
     end
 
     # Commits every file that has been changed by the release task.
     def commit_modified_files_task
-      if modified_files.any?
-        modified_files.each { |file| git.add(file) }
-        git.commit("Released #{gemspec.name} gem version #{gemspec.version}")
+      really_modified = `#{git} ls-files -m #{modified_files.entries.join(' ')}`.split("\n")
+      if really_modified.any?
+        really_modified.each { |file| sh git, 'add', file }
+        sh git, 'commit', '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
       end
     end
 
     # Adds a tag for the released version
     def tag_version_task
-      git.add_tag("#{gemspec.name}-#{gemspec.version}")
+      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
     end
 
     # Pushes the changes and tag to github
     def github_release_task
-      git.push(remote, remote_branch, true)
+      sh git, 'push', '--tags', remote, remote_branch
     end
 
-    # # Checks whether Rubyforge is configured properly
-    # def check_rubyforge_task
-    #   # Login no longer necessary when using rubyforge 2.0.0 gem
-    #   # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
-    #   output = `rubyforge names`.split("\n")
-    #   raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
-    #   raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
-    # end
-
-    # # Task to release the .gem file toRubyforge.
-    # def rubyforge_release_task
-    #   sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    # end
-    
     def gemcutter_release_task
-      sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
     # Gem release task.
     # All work is done by the task's dependencies, so just display a release completed message.
     def release_task
       puts
-      puts '------------------------------------------------------------'
-      puts "Released #{gemspec.name} version #{gemspec.version}"
+      puts "Release successful."
     end
 
     private
@@ -342,6 +331,9 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
+        
+        # Also mark the Gemfile.lock file as changed because of the new version.
+        modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
     end
 
@@ -357,15 +349,13 @@ module GithubGem
         open(__FILE__, "w") { |file| file.write(response.body) }
       end
 
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{git.dir.path}/], '')
-      if git.status[relative_file] && git.status[relative_file].type == 'M'
-        git.add(relative_file)
-        git.commit("Updated to latest gem release management tasks.")
-        puts "Updated to latest version of 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
     end
-
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scoped_search
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +02:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 1
@@ -36,17 +39,18 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 1
-        - 4
-        version: 1.1.4
+        - 2
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id002
-description: "    Scoped search makes it easy to search your ActiveRecord-based models.\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"
+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
 - weshays@gbdev.com
@@ -57,37 +61,37 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- spec/spec_helper.rb
-- spec/integration/string_querying_spec.rb
-- lib/scoped_search/definition.rb
-- spec/lib/mocks.rb
-- scoped_search.gemspec
-- lib/scoped_search/query_language/parser.rb
-- spec/lib/matchers.rb
 - .gitignore
 - LICENSE
-- spec/unit/ast_spec.rb
-- spec/database.yml
-- init.rb
+- README.rdoc
 - Rakefile
-- spec/unit/tokenizer_spec.rb
-- spec/unit/parser_spec.rb
-- spec/integration/api_spec.rb
-- lib/scoped_search/query_language/ast.rb
-- lib/scoped_search/query_language.rb
+- init.rb
+- lib/scoped_search.rb
+- lib/scoped_search/definition.rb
 - lib/scoped_search/query_builder.rb
-- README.rdoc
-- spec/unit/definition_spec.rb
-- spec/lib/database.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
+- scoped_search.gemspec
+- spec/database.yml
+- spec/integration/api_spec.rb
+- spec/integration/ordinal_querying_spec.rb
 - spec/integration/profile_querying_spec.rb
-- tasks/github-gem.rake
-- spec/unit/query_builder_spec.rb
-- lib/scoped_search.rb
 - spec/integration/relation_querying_spec.rb
-- spec/integration/ordinal_querying_spec.rb
-- lib/scoped_search/query_language/tokenizer.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/definition_spec.rb
+- spec/unit/parser_spec.rb
+- spec/unit/query_builder_spec.rb
+- spec/unit/tokenizer_spec.rb
+- tasks/github-gem.rake
 has_rdoc: true
-homepage: http://wiki.github.com/wvanbergen/scoped_search
+homepage: http://github.com/wvanbergen/scoped_search/wiki
 licenses: []
 
 post_install_message: 
@@ -101,34 +105,38 @@ rdoc_options:
 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"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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/ordinal_querying_spec.rb
+- spec/integration/profile_querying_spec.rb
+- spec/integration/relation_querying_spec.rb
 - spec/integration/string_querying_spec.rb
 - spec/unit/ast_spec.rb
-- spec/unit/tokenizer_spec.rb
-- spec/unit/parser_spec.rb
-- spec/integration/api_spec.rb
 - spec/unit/definition_spec.rb
-- spec/integration/profile_querying_spec.rb
+- spec/unit/parser_spec.rb
 - spec/unit/query_builder_spec.rb
-- spec/integration/relation_querying_spec.rb
-- spec/integration/ordinal_querying_spec.rb
+- spec/unit/tokenizer_spec.rb