acts_as_indexed 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+===0.7.3 [3rd July 2011]
+  - Support for non-default primary keys. [ttoomey - Theron Toomey]
+  - Fixed issue with file-locking on JRuby. [banderso - Ben Anderson]
+
 ===0.7.2 [31st March 2011]
   - Fixed bug with ranking of records [Christopher Souvey - bug report]
   - Fixed a bug with the slicing of records before AR order is applied. [Christopher Souvey - bug report]

data/Rakefile

@@ -43,9 +43,41 @@ begin
     gemspec.description = gemspec.summary
     gemspec.email = "dougal.s@gmail.com"
     gemspec.homepage = "http://github.com/dougal/acts_as_indexed"
-    gemspec.authors = ["Douglas F Shearer"]  
+    gemspec.authors = ["Douglas F Shearer"]
   end
   Jeweler::GemcutterTasks.new
 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.2
+0.7.3

data/acts_as_indexed.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_indexed}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas F Shearer"]
-  s.date = %q{2011-03-31}
+  s.date = %q{2011-07-03}
   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.extra_rdoc_files = [
@@ -46,19 +46,11 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/dougal/acts_as_indexed}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.3.7}
   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"
-  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/acts_as_indexed/class_methods.rb

@@ -35,9 +35,9 @@ module ActsAsIndexed
 
       # scope for Rails 3.x, named_scope for Rails 2.x.
       if self.respond_to?(:where)
-        scope :with_query, lambda { |query| where("#{table_name}.id IN (?)", search_index(query, {}, {:ids_only => true})) }
+        scope :with_query, lambda { |query| where("#{table_name}.#{primary_key} IN (?)", search_index(query, {}, {:ids_only => true})) }
       else
-        named_scope :with_query, lambda { |query| { :conditions => ["#{table_name}.id IN (?)", search_index(query, {}, {:ids_only => true}) ] } }
+        named_scope :with_query, lambda { |query| { :conditions => ["#{table_name}.#{primary_key} IN (?)", search_index(query, {}, {:ids_only => true}) ] } }
       end
 
       cattr_accessor :aai_config, :aai_fields
@@ -143,7 +143,7 @@ module ActsAsIndexed
       with_scope :find => find_options do
         # Doing the find like this eliminates the possibility of errors occuring
         # on either missing records (out-of-sync) or an empty results array.
-        records = find(:all, :conditions => [ "#{table_name}.id IN (?)", part_query])
+        records = find(:all, :conditions => [ "#{table_name}.#{primary_key} IN (?)", part_query])
 
         if find_options.include?(:order)
          records # Just return the records without ranking them.

data/lib/acts_as_indexed/configuration.rb

@@ -9,7 +9,7 @@ module ActsAsIndexed
 
     # Sets the location for the index. Specify as an array. Heroku, for
     # example would use RAILS_ROOT/tmp/index, which would be set as
-    # [Rails.root,'tmp','index]
+    # [Rails.root,'tmp','index']
     attr_accessor :index_file
 
     # Tuning value for the index partitioning. Larger values result in quicker

data/lib/acts_as_indexed/storage.rb

@@ -169,7 +169,7 @@ module ActsAsIndexed #:nodoc:
     def lock_file(file_path, &block) # :nodoc:
       # Windows does not support file locking.
       if !windows? && file_path.exist?
-        file_path.open('r') do |f|
+        file_path.open('r+') do |f|
           begin
             f.flock File::LOCK_EX
             yield
@@ -187,4 +187,4 @@ module ActsAsIndexed #:nodoc:
     end
 
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_indexed
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 5
+  prerelease: false
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Douglas F Shearer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +01:00
+date: 2011-07-03 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -85,15 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 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
+test_files: []
+