sunspot_index_queue 1.1.2 → 1.1.3

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - rbx
+  - jruby

data/CHANGE_LOG.txt

@@ -1,3 +1,7 @@
+1.1.3
+
+- Fix mongo implementation to work properly with most recent versions.
+
 1.1.2
 
 - Optimization for ActiveRecord to eager load includes declared in sunspot_options for indexing.

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -16,20 +15,12 @@ rescue LoadError
   end
 end
 
-desc 'Generate documentation.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.options << '--title' << 'Sunspot Index Queue' << '--line-numbers' << '--inline-source' << '--main' << 'README.rdoc'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "sunspot_index_queue"
     gem.summary = %Q{Asynchronous Solr indexing support for the sunspot gem with an emphasis on reliablity and throughput.}
-    gem.description = %Q(This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord and MongoDB out of the box.)
+    gem.description = %Q(This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord, DataMapper, and MongoDB out of the box.)
     gem.email = "brian@embellishedvisions.com"
     gem.homepage = "http://github.com/bdurand/sunspot_index_queue"
     gem.authors = ["Brian Durand"]
@@ -41,6 +32,7 @@ begin
     gem.add_development_dependency('dm-core', '>= 1.0.0')
     gem.add_development_dependency('dm-aggregates', '>=1.0.0')
     gem.add_development_dependency('dm-migrations', '>=1.0.0')
+    gem.add_development_dependency('dm-sqlite-adapter', '>=1.0.0')
     gem.add_development_dependency('mongo')
     gem.add_development_dependency('rspec', '>= 2.0.0')
     gem.add_development_dependency('jeweler')

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/sunspot/index_queue/entry/mongo_impl.rb

@@ -22,18 +22,18 @@ module Sunspot
           def connection=(*args)
             @connection = args.first.is_a?(Mongo::Connection) ? args.first : Mongo::Connection.new(*args)
           end
-          
+
           # Get the connection currently in use.
           def connection
             @connection
           end
-          
+
           # Set the name of the database which will contain the queue collection.
           def database_name=(name)
             @collection = nil
             @database_name = name
           end
-          
+
           # Get the collection used to store the queue.
           def collection
             unless @collection
@@ -43,41 +43,41 @@ module Sunspot
             end
             @collection
           end
-          
+
           # Create a new entry.
           def create(attributes)
             entry = new(attributes)
             entry.save
             entry
           end
-          
+
           # Find one entry given a selector or object id.
           def find_one(spec_or_object_id=nil, opts={})
             doc = collection.find_one(spec_or_object_id, opts)
             doc ? new(doc) : nil
           end
-          
+
           # Find an array of entries given a selector.
           def find(selector={}, opts={})
             collection.find(selector, opts).collect{|doc| new(doc)}
           end
-          
+
           # Logger used to log errors.
           def logger
             @logger
           end
-          
+
           # Set the logger used to log errors.
           def logger=(logger)
             @logger = logger
           end
-          
+
           # Implementation of the total_count method.
           def total_count(queue)
             conditions = queue.class_names.empty? ? {} : {:record_class_name => {'$in' => queue.class_names}}
             collection.find(conditions).count
           end
-          
+
           # Implementation of the ready_count method.
           def ready_count(queue)
             conditions = {:run_at => {'$lte' => Time.now.utc}}
@@ -110,7 +110,7 @@ module Sunspot
             conditions = queue.class_names.empty? ? {} : {:record_class_name => {'$in' => queue.class_names}}
             collection.update(conditions, {"$set" => {:run_at => Time.now.utc, :attempts => 0, :error => nil}}, :multi => true)
           end
-          
+
           # Implementation of the next_batch! method.
           def next_batch!(queue)
             conditions = {:run_at => {'$lte' => Time.now.utc}}
@@ -122,6 +122,7 @@ module Sunspot
               begin
                 lock = rand(0x7FFFFFFF)
                 doc = collection.find_and_modify(:update => {"$set" => {:run_at => Time.now.utc + queue.retry_interval, :error => nil, :lock => lock}}, :query => conditions, :limit => queue.batch_size, :sort => [[:priority, Mongo::DESCENDING], [:run_at, Mongo::ASCENDING]])
+                break unless doc
                 entries << new(doc)
               rescue Mongo::OperationFailure
                 break
@@ -139,15 +140,15 @@ module Sunspot
             queue_entry.run_at = Time.now.utc
             queue_entry.save
           end
-          
+
           # Implementation of the delete_entries method.
           def delete_entries(entries)
             collection.remove(:_id => {'$in' => entries.map(&:id)})
           end
         end
-        
+
         attr_reader :doc
-        
+
         # Create a new entry from a document hash.
         def initialize(attributes = {})
           @doc = {}
@@ -157,83 +158,83 @@ module Sunspot
           @doc['priority'] = 0 unless doc['priority']
           @doc['attempts'] = 0 unless doc['attempts']
         end
-        
+
         # Get the entry id.
         def id
           doc['_id']
         end
-        
+
         # Get the entry id.
         def record_class_name
           doc['record_class_name']
         end
-        
+
         # Set the entry record_class_name.
         def record_class_name=(value)
           doc['record_class_name'] =  value.nil? ? nil : value.to_s
         end
-        
+
         # Get the entry id.
         def record_id
           doc['record_id']
         end
-        
+
         # Set the entry record_id.
         def record_id=(value)
           doc['record_id'] =  value
         end
-        
+
         # Get the entry run_at time.
         def run_at
           doc['run_at']
         end
-        
+
         # Set the entry run_at time.
         def run_at=(value)
           value = Time.parse(value.to_s) unless value.nil? || value.is_a?(Time)
           doc['run_at'] =  value.nil? ? nil : value.utc
         end
-        
+
         # Get the entry priority.
         def priority
           doc['priority']
         end
-        
+
         # Set the entry priority.
         def priority=(value)
           doc['priority'] =  value.to_i
         end
-        
+
         # Get the entry attempts.
         def attempts
           doc['attempts'] || 0
         end
-        
+
         # Set the entry attempts.
         def attempts=(value)
           doc['attempts'] =  value.to_i
         end
-        
+
         # Get the entry error.
         def error
           doc['error']
         end
-        
+
         # Set the entry error.
         def error=(value)
           doc['error'] =  value.nil? ? nil : value.to_s
         end
-        
+
         # Get the entry delete entry flag.
         def is_delete?
           doc['is_delete']
         end
-        
+
         # Set the entry delete entry flag.
         def is_delete=(value)
           doc['is_delete'] =  !!value
         end
-        
+
         # Save the entry to the database.
         def save
           id = self.class.collection.save(doc)
@@ -266,7 +267,7 @@ module Sunspot
             self.class.logger.warn(e) if self.class.logger
           end
         end
-        
+
         def == (value)
           value.is_a?(self.class) && ((id && id == value.id) || (doc == value.doc))
         end

data/sunspot_index_queue.gemspec

@@ -5,17 +5,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sunspot_index_queue}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2011-06-23}
-  s.description = %q{This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord and MongoDB out of the box.}
+  s.date = %q{2012-02-12}
+  s.description = %q{This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord, DataMapper, and MongoDB out of the box.}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
+    ".travis.yml",
     "CHANGE_LOG.txt",
     "MIT_LICENSE",
     "README.rdoc",
@@ -57,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<dm-core>, [">= 1.0.0"])
       s.add_development_dependency(%q<dm-aggregates>, [">= 1.0.0"])
       s.add_development_dependency(%q<dm-migrations>, [">= 1.0.0"])
+      s.add_development_dependency(%q<dm-sqlite-adapter>, [">= 1.0.0"])
       s.add_development_dependency(%q<mongo>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-core>, [">= 1.0.0"])
       s.add_dependency(%q<dm-aggregates>, [">= 1.0.0"])
       s.add_dependency(%q<dm-migrations>, [">= 1.0.0"])
+      s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.0"])
       s.add_dependency(%q<mongo>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -78,6 +81,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-core>, [">= 1.0.0"])
     s.add_dependency(%q<dm-aggregates>, [">= 1.0.0"])
     s.add_dependency(%q<dm-migrations>, [">= 1.0.0"])
+    s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.0"])
     s.add_dependency(%q<mongo>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_index_queue
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Brian Durand
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -05:00
+date: 2012-02-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,9 +112,25 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mongo
+  name: dm-sqlite-adapter
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mongo
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,11 +140,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,11 +156,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,8 +170,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
-description: This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord and MongoDB out of the box.
+  version_requirements: *id010
+description: This gem provides asynchronous indexing to Solr for the sunspot gem. It uses a pluggable model for the backing queue and provides support for ActiveRecord, DataMapper, and MongoDB out of the box.
 email: brian@embellishedvisions.com
 executables: []
 
@@ -164,6 +180,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .travis.yml
 - CHANGE_LOG.txt
 - MIT_LICENSE
 - README.rdoc