elastics-models 1.0.10 → 1.1.0

data/README.md

@@ -29,4 +29,4 @@ Special thanks for their sponsorship to [Escalate Media](http://www.escalatemedi
 ## Copyright
 
 Copyright (c) 2012-2013 by [Domizio Demichelis](mailto://dd.nexus@gmail.com)<br>
-See [LICENSE](https://github.com/elastics/elastics/blob/master/elastics-models/LICENSE) for details.
+See [LICENSE](https://github.com/elastics/elastics/blob/master/elastics/LICENSE) for details.

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.1.0

data/elastics-models.gemspec

@@ -1,5 +1,6 @@
 require 'date'
-version = File.read(File.expand_path('../VERSION', __FILE__)).strip
+version_path = %w[../VERSION ../../VERSION].detect{|v| File.exist?(File.expand_path(v, __FILE__))}
+version      = File.read(File.expand_path(version_path, __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.name                      = 'elastics-models'
@@ -8,7 +9,7 @@ Gem::Specification.new do |s|
   s.homepage                  = 'http://elastics.github.io/elastics'
   s.authors                   = ["Domizio Demichelis"]
   s.email                     = 'dd.nexus@gmail.com'
-  s.files                     = `git ls-files -z`.split("\0")
+  s.files                     = `git ls-files -z`.split("\0") + %w[VERSION LICENSE]
   s.version                   = version
   s.date                      = Date.today.to_s
   s.required_rubygems_version = ">= 1.3.6"

data/lib/elastics/model_indexer.rb

@@ -7,6 +7,18 @@ module Elastics
         @elastics.extend(ClassProxy::ModelSyncer)
         @elastics.extend(ClassProxy::ModelIndexer).init
         def self.elastics; @elastics end
+        case
+        when respond_to?(:find_in_batches)
+          def self.elastics_in_batches(options={}, &block)
+            find_in_batches(options, &block)
+          end
+        when defined?(Mongoid::Document) && include?(Mongoid::Document)
+          def self.elastics_in_batches(options={}, &block)
+            0.step(count, options[:batch_size]) do |offset|
+              block.call limit(options[:batch_size]).skip(offset).to_a
+            end
+          end
+        end
       end
     end
 
@@ -23,5 +35,4 @@ module Elastics
     end
 
   end
-
 end

data/lib/elastics/model_tasks.rb

@@ -76,22 +76,9 @@ module Elastics
           Prompter.say_ok "#{index} index created" if options[:verbose]
         end
 
-        if defined?(Mongoid::Document) && model.include?(Mongoid::Document)
-          def model.find_in_batches(options={})
-            0.step(count, options[:batch_size]) do |offset|
-              yield limit(options[:batch_size]).skip(offset).to_a
-            end
-          end
-        end
-
-        unless model.respond_to?(:find_in_batches)
-          Conf.logger.error "Model #{model} does not respond to :find_in_batches. Skipped."
-          next
-        end
-
         pbar = ProgBar.new(model.count, options[:batch_size], "Model #{model}: ") if options[:verbose]
 
-        model.find_in_batches(:batch_size => options[:batch_size]) do |batch|
+        model.elastics_in_batches(:batch_size => options[:batch_size]) do |batch|
           result = Elastics.post_bulk_collection(batch, options[:import_options]) || next
           pbar.process_result(result, batch.size) if options[:verbose]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastics-models
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elastics-client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: elastics-scopes
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -67,9 +67,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- VERSION
 - elastics-models.gemspec
 - lib/elastics-models.rb
 - lib/elastics/active_model.rb
@@ -93,6 +91,8 @@ files:
 - lib/elastics/result/search_loader.rb
 - lib/elastics/struct/mergeable.rb
 - lib/tasks.rake
+- VERSION
+- LICENSE
 homepage: http://elastics.github.io/elastics
 licenses:
 - MIT