acts_as_indexed 0.7.7 → 0.7.8

data/CHANGELOG

@@ -1,3 +1,6 @@
+===0.7.8 [14 March 2011]
+ - Fixed bug with file renaming on Windows. Fixes issue #21. [gabynamian - Gabriel Namiman]
+
 ===0.7.7 [14 November 2011]
  - Fixed bug with out-of-date indexes on Windows. Fixes issue #20. [parndt - Philip Arndt]
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -49,35 +49,3 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
-
-namespace :rvm do
-  AR_VERSIONS = %w{2.1.2 2.2.3 2.3.12 3.0.9}
-  INSTALLED_GEMSETS = `rvm gemset list`.scan(/aai_ar[^\n]+/)
-
-  desc "Setup RVM gemsets to test different versions of ActiveRecord"
-  task :test do
-    AR_VERSIONS.each do |version|
-      gemset_name = "aai_ar_#{ version }"
-
-      unless INSTALLED_GEMSETS.include?(gemset_name)
-        sh "rvm gemset create #{ gemset_name }"
-        sh "rvm gemset use aai_ar_#{ version }"
-        sh "gem install bundler --no-rdoc --no-ri"
-        sh "bundle install"
-        sh "gem install activerecord --version #{version} --no-rdoc --no-ri"
-      end
-
-      puts "Testing with Activerecord #{ version }"
-      puts "="*20
-      sh "rake test"
-      puts "="*20
-    end
-  end
-
-  task :cleanup do
-    INSTALLED_GEMSETS.each do |gemset|
-      sh "rvm --force gemset delete #{ gemset }"
-    end
-  end
-
-end

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.7.8

data/acts_as_indexed.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{acts_as_indexed}
-  s.version = "0.7.7"
+  s.name = "acts_as_indexed"
+  s.version = "0.7.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Douglas F Shearer}]
-  s.date = %q{2011-11-14}
-  s.description = %q{Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app}
-  s.email = %q{dougal.s@gmail.com}
+  s.authors = ["Douglas F Shearer"]
+  s.date = "2012-03-14"
+  s.description = "Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app"
+  s.email = "dougal.s@gmail.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -44,19 +44,10 @@ Gem::Specification.new do |s|
     "test/search_atom_test.rb",
     "test/search_index_test.rb"
   ]
-  s.homepage = %q{http://github.com/dougal/acts_as_indexed}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app}
-  s.test_files = [
-    "test/abstract_unit.rb",
-    "test/acts_as_indexed_test.rb",
-    "test/configuration_test.rb",
-    "test/fixtures/post.rb",
-    "test/schema.rb",
-    "test/search_atom_test.rb",
-    "test/search_index_test.rb"
-  ]
+  s.homepage = "http://github.com/dougal/acts_as_indexed"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/acts_as_indexed/storage.rb

@@ -115,7 +115,7 @@ module ActsAsIndexed #:nodoc:
       version_path = @path.join('version')
 
       if @path.exist?
-        version_path_to_check = Pathname.new(version_path.to_s + (TEMP_FILE_EXTENSION if windows?).to_s)
+        version_path_to_check = Pathname.new(version_path.to_s)
         unless version_path_to_check.exist? && version_path_to_check.read == ActsAsIndexed::INDEX_VERSION
           raise OldIndexVersion, "Index was created prior to version #{ActsAsIndexed::INDEX_VERSION}. Please delete it, it will be rebuilt automatically."
         end
@@ -162,7 +162,7 @@ module ActsAsIndexed #:nodoc:
       # https://github.com/dougal/acts_as_indexed/issues/15
       writeable_file = windows? ? new_file : tmp_file
 
-      File.open(tmp_file, 'w+') do |f|
+      File.open(writeable_file, 'w+') do |f|
         yield(f)
       end
 

data/lib/will_paginate_search.rb

@@ -9,17 +9,19 @@ module ActsAsIndexed
      module Search
 
       def paginate_search(query, options)
-        page, per_page, total_entries = wp_parse_options(options)
+        page = options.fetch(:page) { raise ArgumentError, ":page parameter required" }
+        per_page = options.delete(:per_page) || self.per_page
+        total_entries = options.delete(:total_entries)
 
         total_entries ||= find_with_index(query,{},{:ids_only => true}).size
 
-        returning ::WillPaginate::Collection.new(page, per_page, total_entries) do |pager|
-          options.update :offset => pager.offset, :limit => pager.per_page
+        pager = ::WillPaginate::Collection.new(page, per_page, total_entries)
+        options.update :offset => pager.offset, :limit => pager.per_page
 
-          options = options.delete_if {|key, value| [:page, :per_page].include?(key) }
+        options = options.delete_if {|key, value| [:page, :per_page].include?(key) }
 
-          pager.replace find_with_index(query, options)
-        end
+        pager.replace find_with_index(query, options)
+        pager
       end
 
     end

metadata

@@ -1,32 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_indexed
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.7.8
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 7
-  version: 0.7.7
 platform: ruby
-authors: 
+authors:
 - Douglas F Shearer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies: []
-
-description: Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app
+description: Acts As Indexed is a plugin which provides a pain-free way to add fulltext
+  search to your Ruby on Rails app
 email: dougal.s@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -56,42 +48,27 @@ files:
 - test/search_index_test.rb
 homepage: http://github.com/dougal/acts_as_indexed
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Acts As Indexed is a plugin which provides a pain-free way to add fulltext search to your Ruby on Rails app
-test_files: 
-- test/abstract_unit.rb
-- test/acts_as_indexed_test.rb
-- test/configuration_test.rb
-- test/fixtures/post.rb
-- test/schema.rb
-- test/search_atom_test.rb
-- test/search_index_test.rb
+summary: Acts As Indexed is a plugin which provides a pain-free way to add fulltext
+  search to your Ruby on Rails app
+test_files: []