.manifest lib/scoped_search.rb lib/scoped_search/query_string_parser.rb scoped_search.gemspec @@ -1,2 +1,3 @@ .svn/ -.DS_Store \ No newline at end of file +.DS_Store +scoped_search-*.gem \ No newline at end of file .gitignore @@ -3,4 +3,68 @@ require 'rubygems' load 'test/tasks.rake' desc 'Default: run unit tests.' -task :default => :test \ No newline at end of file +task :default => :test + +namespace :gem do + + desc "Sets the version and date of the gem" + task :version do + + require 'date' + + new_version = ENV['VERSION'] + raise "VERSION is required" unless /\d+(\.\d+)*/ =~ new_version + + spec_file = Dir['*.gemspec'].first + + spec = File.read(spec_file) + spec.gsub!(/^(\s*s\.version\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{new_version}'#{$5}" } + spec.gsub!(/^(\s*s\.date\s*=\s*)('|")(.+)('|")(\s*)$/) { "#{$1}'#{Date.today.strftime('%Y-%m-%d')}'#{$5}" } + File.open(spec_file, 'w') { |f| f << spec } + end + + task :tag => [:version] do + + new_version = ENV['VERSION'] + raise "VERSION is required" unless /\d+(\.\d+)*/ =~ new_version + + sh "git add scoped_search.gemspec" + sh "git commit -m \"Set gem version to #{new_version}\"" + sh "git push origin" + sh "git tag -a \"scoped_search-#{new_version}\" -m \"Tagged version #{new_version}\"" + sh "git push --tags" + end + + desc "Builds a ruby gem for scoped_search" + task :build => [:manifest] do + system %[gem build scoped_search.gemspec] + end + + desc %{Update ".manifest" with the latest list of project filenames. Respect\ + .gitignore by excluding everything that git ignores. Update `files` and\ + `test_files` arrays in "*.gemspec" file if it's present.} + task :manifest do + list = Dir['**/*'].sort + spec_file = Dir['*.gemspec'].first + list -= [spec_file] if spec_file + + File.read('.gitignore').each_line do |glob| + glob = glob.chomp.sub(/^\//, '') + list -= Dir[glob] + list -= Dir["#{glob}/**/*"] if File.directory?(glob) and !File.symlink?(glob) + puts "excluding #{glob}" + end + + if spec_file + spec = File.read spec_file + spec.gsub! /^(\s* s.(test_)?files \s* = \s* )( \[ [^\]]* \] | %w\( [^)]* \) )/mx do + assignment = $1 + bunch = $2 ? list.grep(/^test.*_test\.rb$/) : list + '%s%%w(%s)' % [assignment, bunch.join(' ')] + end + + File.open(spec_file, 'w') {|f| f << spec } + end + File.open('.manifest', 'w') {|f| f << list.join("\n") } + end +end \ No newline at end of file Rakefile @@ -9,9 +9,6 @@ New functionality: Refactoring: - Better separation of query building and query string parser -- Distribute as gem instead of plugin Testing: -- Add rake testing tasks -- More tests for the query string parser -- Rails inclusion & activation tests +- More tests for the query string parser \ No newline at end of file TODO @@ -1,4 +1 @@ -$:.unshift "#{File.dirname(__FILE__)}/lib" -require 'active_record/scoped_search' -require 'active_record/scoped_search/query_string_parser' -ActiveRecord::Base.class_eval { extend ActiveRecord::ScopedSearch } \ No newline at end of file +require 'scoped_search' \ No newline at end of file init.rb @@ -16,7 +16,7 @@ class ScopedSearchTest < Test::Unit::TestCase SearchTestModel.searchable_on :string_field, :text_field assert SearchTestModel.respond_to?(:search_for) - assert_equal ActiveRecord::NamedScope::Scope, SearchTestModel.search_for.class + assert_equal ActiveRecord::NamedScope::Scope, SearchTestModel.search_for('test').class end test/query_building_test.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/test_helper' class String - include ActiveRecord::ScopedSearch::QueryStringParser + include ScopedSearch::QueryStringParser end class QueryStringParserTest < Test::Unit::TestCase test/query_string_parser_test.rb @@ -2,7 +2,7 @@ require 'test/unit' require 'rubygems' require 'active_record' -require "#{File.dirname(__FILE__)}/../init" +require "#{File.dirname(__FILE__)}/../lib/scoped_search" def setup_db ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:") test/test_helper.rb lib/active_record/scoped_search.rb lib/active_record/scoped_search/query_string_parser.rb 49cb513270717fe367454890b52815e602b24bf1 Willem van Bergen willem@vanbergen.org http://github.com/wvanbergen/scoped_search/commit/f7d07d6a81801bb64d92e9a6bc27493668bd1109 f7d07d6a81801bb64d92e9a6bc27493668bd1109 2008-09-03T22:59:07-07:00 2008-09-03T22:59:07-07:00 Converted to gem ae20ac2935e4aaa068ca169b48cd5690e979a084 Willem van Bergen willem@vanbergen.org