mongoid-elasticsearch 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe059b63d7362ec40846b313bbd295c00c241d5
-  data.tar.gz: cd8078c6a3ab9f84c47c6e7bfafb2e10ba2a58a4
+  metadata.gz: 7513fa8314b5c54a7586c309ce159c1a49f17d4b
+  data.tar.gz: ddba9566dd1a2b8d8348bcddad754a226d6d2f06
 SHA512:
-  metadata.gz: 9d4f1dc1f2cf58b1f31823353de26bcee60ef058645d1e610e816a987ceb2b295cf341b7a3d4d9243bbb812df6dcdf7e516ef199ff05863e1104eee2f5111f31
-  data.tar.gz: 64af9b66fa3977519d375b2533a5f33b920acb7203b87edea9bd84aa2eab3b29c843faf8242917b16819af92d0db52c5571189874a0bb4fdea65f8ec5b0cd1b8
+  metadata.gz: 198512e9c03ef70021fa67dfdde7d4d181b42f99e0f68f6a0884c5db9f54bdb2d17687dee58d8914358366e8792c0c9963f88743a8c900cb00da165503639b70
+  data.tar.gz: b3f425d37fd8710891c5d8e051c8d7ef0c2dc854454e4048eaf3bce64f24a9e1dc84a8055b1a6e926959f78edce5ab56795a2328c5c9a3ffcf98150f231a9ab5

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.3

data/.travis.yml

@@ -7,10 +7,8 @@ notifications:
 
 language: ruby
 rvm:
-  - 2.1.2
-  - jruby-head
+  - 2.2.3
 
 gemfile:
   - Gemfile
-  - gemfiles/mongoid3.gemfile
 

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid-elasticsearch.gemspec
+gem 'database_cleaner', github: 'DatabaseCleaner/database_cleaner'
 gemspec
+

data/Gemfile.lock

@@ -0,0 +1,162 @@
+GIT
+  remote: git://github.com/DatabaseCleaner/database_cleaner.git
+  revision: b87f00320f8aa0f7e499d183128f05ce29cedc33
+  specs:
+    database_cleaner (1.5.1)
+
+PATH
+  remote: .
+  specs:
+    mongoid-elasticsearch (0.9.0)
+      elasticsearch (~> 1.0.13)
+      mongoid (>= 3.0, < 6.0)
+      ruby-progressbar
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    bson (3.2.4)
+    builder (3.2.2)
+    coveralls (0.8.2)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    elasticsearch (1.0.13)
+      elasticsearch-api (= 1.0.13)
+      elasticsearch-transport (= 1.0.13)
+    elasticsearch-api (1.0.13)
+      multi_json
+    elasticsearch-transport (1.0.13)
+      faraday
+      multi_json
+    erubis (2.7.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    glebtv-httpclient (3.2.8)
+      lru_redux
+    hashie (3.4.2)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    i18n (0.7.0)
+    json (1.8.3)
+    kaminari (0.16.3)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    lru_redux (1.1.0)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.1)
+    mongo (2.1.1)
+      bson (~> 3.0)
+    mongoid (5.0.0)
+      activemodel (~> 4.0)
+      mongo (~> 2.1)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    mongoid-compatibility (0.3.1)
+      activesupport
+      mongoid (>= 2.0)
+    mongoid-slug (5.0.0)
+      mongoid (>= 3.0)
+      mongoid-compatibility
+      stringex (~> 2.0)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    origin (2.1.1)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    rake (10.4.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    ruby-progressbar (1.7.5)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    stringex (2.5.2)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tins (1.6.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  coveralls
+  database_cleaner!
+  glebtv-httpclient
+  hashie
+  kaminari
+  mongoid-elasticsearch!
+  mongoid-slug (~> 5.0.0)
+  rake
+  rspec
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -3,7 +3,10 @@
 [![Build Status](https://travis-ci.org/rs-pro/mongoid-elasticsearch.png?branch=master)](https://travis-ci.org/rs-pro/mongoid-elasticsearch)
 [![Coverage Status](https://coveralls.io/repos/rs-pro/mongoid-elasticsearch/badge.png?branch=master)](https://coveralls.io/r/rs-pro/mongoid-elasticsearch?branch=master)
 [![Gem Version](https://badge.fury.io/rb/mongoid-elasticsearch.png)](http://badge.fury.io/rb/mongoid-elasticsearch)
-[![Dependency Status](https://www.versioneye.com/ruby/mongoid-elasticsearch/0.8.2/badge.svg)](https://www.versioneye.com/ruby/mongoid-elasticsearch/0.8.2)
+[![Dependency Status](https://www.versioneye.com/user/projects/53e73fe735080d1e4d00009c/badge.svg)](https://www.versioneye.com/user/projects/53e73fe735080d1e4d00009c)
+[![Issues](http://img.shields.io/github/issues/rs-pro/mongoid-elasticsearch.svg)](https://github.com/rs-pro/mongoid-elasticsearch/issues)
+[![License](http://img.shields.io/:license-mit-blue.svg)](https://github.com/rs-pro/mongoid-elasticsearch/blob/master/MIT-LICENSE.txt)
+
 
 Use [Elasticsearch](http://www.elasticsearch.org/) with mongoid with just a few
 lines of code
@@ -65,7 +68,7 @@ Or install it yourself as:
     result.results # by default returns an Enumerable with Post instances exactly
                    # like they were loaded from MongoDB
     Post.es.index.create # create index (done automatically on app boot)
-    Post.es.index.destroy # drop index
+    Post.es.index.delete # drop index
     Post.es.index.reset # recreate index
     Post.es.index.refresh # force index update (useful for specs)
     Post.es.client # Elasticsearch::Client instance

data/lib/mongoid/elasticsearch/es.rb

@@ -20,10 +20,16 @@ module Mongoid
 
       def index_all(step_size = INDEX_STEP)
         index.reset
-        q = klass.order_by(_id: 1)
+        q = klass.asc(:id)
         steps = (q.count / step_size) + 1
+        last_id = nil
         steps.times do |step|
-          docs = q.skip(step * step_size).limit(step_size)
+          if last_id
+            docs = q.gt(id: last_id).limit(step_size).to_a
+          else
+            docs = q.limit(step_size).to_a
+          end
+          last_id = docs.last.try(:id)
           docs = docs.map do |obj|
             if obj.es_index?
               { index: {data: obj.as_indexed_json}.merge(_id: obj.id.to_s) }
@@ -36,7 +42,7 @@ module Mongoid
           if block_given?
             yield steps, step
           end
-        end
+        end       
       end
 
       def search(query, options = {})

data/lib/mongoid/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Elasticsearch
-    VERSION = "0.8.3"
+    VERSION = "0.9.0"
   end
 end

data/mongoid-elasticsearch.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid", [">= 3.0", "< 4.1"]
-  spec.add_dependency "elasticsearch", "~> 1.0.1"
+  spec.add_dependency "mongoid", [">= 3.0", "< 6.0"]
+  spec.add_dependency "elasticsearch", "~> 1.0.13"
   spec.add_dependency "ruby-progressbar"
 
   spec.add_development_dependency "bundler"
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "hashie"
-  spec.add_development_dependency "mongoid_slug"
+  spec.add_development_dependency "mongoid-slug", '~> 5.0.0'
   spec.add_development_dependency "glebtv-httpclient"
 end

data/spec/spec_helper.rb

@@ -28,6 +28,7 @@ else
   DEFAULT_OPT = {}
 end
 Mongoid::Elasticsearch.client_options = DEFAULT_OPT.dup
+Mongo::Logger.logger.level = ::Logger::FATAL
 
 # Mongoid::Elasticsearch.client_options = {log: true}
 
@@ -46,7 +47,7 @@ DatabaseCleaner.orm = "mongoid"
 
 RSpec.configure do |config|
   config.before(:all) do
-    DatabaseCleaner.strategy = :truncation
+    #DatabaseCleaner.strategy = :truncation
     Article.es.index.reset
     Post.es.index.reset
     Nowrapper.es.index.reset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.13
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -157,19 +157,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid_slug
+  name: mongoid-slug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: glebtv-httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -199,11 +199,10 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/es-git.gemfile
-- gemfiles/mongoid3.gemfile
 - lib/mongoid-elasticsearch.rb
 - lib/mongoid/elasticsearch.rb
 - lib/mongoid/elasticsearch/callbacks.rb
@@ -245,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple and easy integration of mongoid with the new elasticsearch gem

data/gemfiles/es-git.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", "~> 4.0.0.beta1"
-gem 'elasticsearch', github: 'elasticsearch/elasticsearch-ruby', branch: "master"
-
-gemspec path: "../"

data/gemfiles/mongoid3.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", '~> 3.1.0'
-gem 'elasticsearch'
-
-gemspec path: "../"