elasticsearch-persistence 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ2NWJlZWJlNDE0ODRhODAzZDM2ZDFhYTFiNDkzNTdlMTZkZjQzYQ==
+    YmNiMTYwMzJjY2E2YjYyOTRmZTJkYWRlZGMxZGJiNDIzN2I5ODUxMA==
   data.tar.gz: !binary |-
-    MmUzOGJiN2I0MmY1ZDBmOTg3NjRiOWM0NDk2NjkzN2Q0N2I2Yjk3Mg==
+    OWE0ZGRhYzM4YTljMzEyZGFlOWM3NDg1OWM2MGE5MTY4Mzk2Y2Q5Yw==
 SHA512:
   metadata.gz: !binary |-
-    YTViMmMzZTNlMGVhMTE4ZWIzYzJmYjU1ZGQwMWJlMzVmMWQ4ZmM2Y2YyNTcz
-    NWQ2NDE2NDlkYzI2YTFkMjMxOWVlMWZlZWE5MWQ4MmNlNjQxMzc1MWVkNzZk
-    MTcxYjM2OTk1MDNlNDQ5NjNiNzk1NTkxNGVlNjVjNTMyZTI4Mzk=
+    ODQ0M2FiZmU2NmUxNjZkODI1NmZhZDU3MDIyZWI1M2IyMjBkOTNmOTlkZDY2
+    ZTg1OWRmNmRkMDZhYzc0NWEwNTM5YzA4Nzg2NDhlYTU5ZDczYzcyMDZhYjg3
+    MDZkMjc4OTUwNjcwYmZiYjc1ZGEwMmQzNjRkNDY1MGI1OGU5MWQ=
   data.tar.gz: !binary |-
-    ZjFmNDc0MWYyOTZjNTcwZmNjMzBmYzY5ZTlmZmFmODM3MzEwNTg0OTAwYmY5
-    MzZkZTFmZjNmNzliZTFiNTY4YTZhMjVhYWY1MmNmZWRiNTJmZWYwNDNiYWFj
-    ZmRhMmZhNzg1ZTAyNDI3ODJhODRlMGI3MjI5NDczZTNhYmU4NzQ=
+    MGI1NzQ1ZjcwZjZkNWZhMWRmMDA5ZjE3NGQzMDNkMjM3Y2NhMjVmZWY0MjE2
+    NDJlZTRiYzgzNmQ1MDJjOGFhZDk4M2M0MzU2M2I1ZTE3ODIyZmIxODUzMTYw
+    MWM4MDQ4ZGJhZDc3MjEwMmYzZjEyMzAwZTJiMWY5ZDMxYmJlMGY=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.5
+
+* Improved documentation
+* Added `@mymodel.id=` setter method
+
 ## 0.1.4
 
 * Added the Elasticsearch::Persistence::Model feature

data/README.md

@@ -492,7 +492,7 @@ class Article
 end
 ```
 
-Attribute validations works like for any other _ActiveModel_-compatible implementation:
+Attribute validations work like for any other _ActiveModel_-compatible implementation:
 
 ```ruby
 article = Article.new                                                                                             # => #<Article { ... }>
@@ -535,7 +535,7 @@ To update the model, either update the attribute and save the model:
 article.title = 'Updated'
 
 article.save
-=> {"_index"=>"articles", "_type"=>"article", "_id"=>"1", "_version"=>2, "created"=>false}
+# => {"_index"=>"articles", "_type"=>"article", "_id"=>"1", "_version"=>2, "created"=>false}
 ```
 
 ... or use the `update_attributes` method:
@@ -571,7 +571,7 @@ article.save
 ```
 
 The model also supports familiar `find_in_batches` and `find_each` methods to efficiently
-retrieve big collections of model instance, using the Elasticsearch's _Scan API_:
+retrieve big collections of model instances, using the Elasticsearch's _Scan API_:
 
 ```ruby
 Article.find_each(_source_include: 'title') { |a| puts "===> #{a.title.upcase}" }
@@ -604,7 +604,7 @@ puts results.response.aggregations.authors.buckets.each { |b| puts "#{b['key']}
 
 #### Accessing the Repository Gateway
 
-The Elasticsearch integration is implemented by embedding the repository object in the model.
+The integration with Elasticsearch is implemented by embedding the repository object in the model.
 You can access it through the `gateway` method:
 
 ```ruby
@@ -634,7 +634,7 @@ article.published.iso8601
 # => "2014-01-01"
 ```
 
-The library provides a Rails ORM generator:
+The library provides a Rails ORM generator to facilitate building the application scaffolding:
 
 ```bash
 rails generate scaffold Person name:String email:String birthday:Date --orm=elasticsearch
@@ -645,16 +645,16 @@ rails generate scaffold Person name:String email:String birthday:Date --orm=elas
 A fully working Ruby on Rails application can be generated with the following command:
 
 ```bash
-rails new music --force --skip --skip-bundle --skip-active-record --template https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/template.rb
+rails new music --force --skip --skip-bundle --skip-active-record --template https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/template.rb
 ```
 
 The application demonstrates:
 
 * How to set up model attributes with custom mappings
-* How to configure model relationships with Elasticsearch's parent/child
+* How to define model relationships with Elasticsearch's parent/child
 * How to configure models to use a common index, and create the index with proper mappings
 * How to use Elasticsearch's completion suggester to drive auto-complete functionality
-* How to use Elasticsearch-persisted model in Rails' views and forms
+* How to use Elasticsearch-persisted models in Rails' views and forms
 * How to write controller tests
 
 The source files for the application are available in the [`examples/music`](examples/music) folder.

data/elasticsearch-persistence.gemspec

@@ -39,13 +39,15 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "elasticsearch-extensions"
 
+  s.add_development_dependency "minitest", "~> 4"
+  s.add_development_dependency "test-unit" if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
   s.add_development_dependency "ruby-prof"
   s.add_development_dependency "pry"
-  s.add_development_dependency "ci_reporter"
+  s.add_development_dependency "ci_reporter", "~> 1.9"
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "simplecov"

data/examples/music/template.rb

@@ -4,7 +4,7 @@
 #
 # This file creates a fully working Rails application with support for storing and retrieving models
 # in Elasticsearch, using the `elasticsearch-persistence` gem
-# (https://github.com/elasticsearch/elasticsearch-rails/tree/persistence-model/elasticsearch-persistence).
+# (https://github.com/elasticsearch/elasticsearch-rails/tree/master/elasticsearch-persistence).
 #
 # Requirements:
 # -------------
@@ -173,9 +173,9 @@ if ENV['LOCAL']
   copy_file File.expand_path('../vendor/assets/jquery-ui-1.10.4.custom.min.css', __FILE__),
             'vendor/assets/stylesheets/ui-lightness/jquery-ui-1.10.4.custom.min.css'
 else
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.js',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.js',
       'vendor/assets/javascripts/jquery-ui-1.10.4.custom.min.js'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.css',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/vendor/assets/jquery-ui-1.10.4.custom.min.css',
       'vendor/assets/stylesheets/ui-lightness/jquery-ui-1.10.4.custom.min.css'
 end
 
@@ -217,11 +217,11 @@ if ENV['LOCAL']
   copy_file File.expand_path('../album.rb', __FILE__), 'app/models/album.rb'
   copy_file File.expand_path('../suggester.rb', __FILE__), 'app/models/suggester.rb'
 else
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/artist.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/artist.rb',
       'app/models/artist.rb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/album.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/album.rb',
       'app/models/album.rb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/suggester.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/suggester.rb',
       'app/models/suggester.rb'
 end
 
@@ -242,15 +242,15 @@ if ENV['LOCAL']
   copy_file File.expand_path('../artists/artists_controller_test.rb', __FILE__),
             'test/controllers/artists_controller_test.rb'
 else
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/artists/artists_controller.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/artists/artists_controller.rb',
       'app/controllers/artists_controller.rb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/artists/index.html.erb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/artists/index.html.erb',
       'app/views/artists/index.html.erb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/artists/show.html.erb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/artists/show.html.erb',
       'app/views/artists/show.html.erb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/artists/_form.html.erb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/artists/_form.html.erb',
       'app/views/artists/_form.html.erb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/artists/artists_controller_test.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/artists/artists_controller_test.rb',
       'test/controllers/artists_controller_test.rb'
 end
 
@@ -267,13 +267,13 @@ if ENV['LOCAL']
   copy_file File.expand_path('../search/search_controller_test.rb', __FILE__),
             'test/controllers/search_controller_test.rb'
 else
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/search/search_controller.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/search/search_controller.rb',
       'app/controllers/search_controller.rb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/search/search_helper.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/search/search_helper.rb',
       'app/helpers/search_helper.rb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/search/index.html.erb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/search/index.html.erb',
       'app/views/search/index.html.erb'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/search/search_controller_test.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/search/search_controller_test.rb',
       'test/controllers/search_controller_test.rb'
 end
 
@@ -301,13 +301,13 @@ if ENV['LOCAL']
   copy_file File.expand_path('../assets/form.css', __FILE__),         'app/assets/stylesheets/form.css'
   copy_file File.expand_path('../assets/blank_cover.png', __FILE__),  'public/images/blank_cover.png'
 else
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/assets/application.css',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/application.css',
       'app/assets/stylesheets/application.css'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/assets/autocomplete.css',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/autocomplete.css',
       'app/assets/stylesheets/autocomplete.css'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/assets/form.css',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/form.css',
       'app/assets/stylesheets/form.css'
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/assets/blank_cover.png',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/assets/blank_cover.png',
       'public/images/blank_cover.png'
 end
 
@@ -343,7 +343,7 @@ puts        '-'*80, ''; sleep 0.25
 if ENV['LOCAL']
   copy_file File.expand_path('../index_manager.rb', __FILE__),  'lib/index_manager.rb'
 else
-  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/persistence-model/elasticsearch-persistence/examples/music/index_manager.rb',
+  get 'https://raw.githubusercontent.com/elasticsearch/elasticsearch-rails/master/elasticsearch-persistence/examples/music/index_manager.rb',
       'lib/index_manager.rb'
 end
 

data/lib/elasticsearch/persistence/model/base.rb

@@ -25,6 +25,12 @@ module Elasticsearch
             @_id
           end; alias :_id :id
 
+          # Set the document `_id`
+          #
+          def id=(value)
+            @_id = value
+          end; alias :_id= :id=
+
           # Return the document `_index`
           #
           def _index
@@ -45,7 +51,7 @@ module Elasticsearch
 
           def to_s
             "#<#{self.class} #{attributes.to_hash.inspect.gsub(/:(\w+)=>/, '\1: ')}>"
-          end
+          end; alias :inspect :to_s
         end
       end
 

data/lib/elasticsearch/persistence/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Persistence
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/test/test_helper.rb

@@ -8,10 +8,17 @@ require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["CO
 # MUST be called before requiring `test/unit`.
 at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks } if ENV['SERVER']
 
-require 'test/unit'
+if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
+  require 'test-unit'
+  require 'mocha/test_unit'
+else
+  require 'minitest/autorun'
+  require 'mocha/mini_test'
+end
+
 require 'shoulda-context'
-require 'mocha/setup'
-require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+
+require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
 require 'oj'

data/test/unit/model_base_test.rb

@@ -27,6 +27,14 @@ class Elasticsearch::Persistence::ModelBaseTest < Test::Unit::TestCase
       assert_equal 2, m.id
     end
 
+    should "set the ID using setter method" do
+      m = DummyBaseModel.new id: 1
+      assert_equal 1, m.id
+
+      m.id = 2
+      assert_equal 2, m.id
+    end
+
     should "have ID in attributes" do
       m = DummyBaseModel.new id: 1, name: 'Test'
       assert_equal 1, m.attributes[:id]

data/test/unit/model_find_test.rb

@@ -93,6 +93,7 @@ class Elasticsearch::Persistence::ModelFindTest < Test::Unit::TestCase
             assert_equal 'scan', arguments[:search_type]
             assert_equal 'foo',  arguments[:index]
             assert_equal 'bar',  arguments[:type]
+            true
           end
           .returns(MultiJson.load('{"_scroll_id":"abc123==", "hits":{"hits":[]}}'))
 

data/test/unit/model_store_test.rb

@@ -76,6 +76,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |object, options|
             assert_equal subject, object
             assert_equal nil, options[:id]
+            true
           end
           .returns({'_id' => 'abc123'})
 
@@ -97,7 +98,8 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
       end
 
       should "save the model and update the timestamp" do
-        Time.expects(:now).returns(Time.parse('2014-01-01T00:00:00Z')).at_least_once
+        now = Time.parse('2014-01-01T00:00:00Z')
+        Time.expects(:now).returns(now).at_least_once
         @gateway
           .expects(:save)
           .returns({'_id' => 'abc123'})
@@ -111,6 +113,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .expects(:save)
           .with do |object, options|
             assert_equal 'ABC', options[:routing]
+            true
           end
           .returns({'_id' => 'abc123'})
 
@@ -141,6 +144,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc'})
 
@@ -155,6 +159,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc', '_index' => 'foo', '_type' => 'bar', '_version' => '100'})
 
@@ -192,6 +197,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .expects(:delete)
           .with do |object, options|
             assert_equal 'ABC', options[:routing]
+            true
           end
           .returns({'_id' => 'abc123'})
 
@@ -228,6 +234,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc'})
 
@@ -251,6 +258,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |id, options|
             assert_equal 'abc123', id
             assert_equal 'UPDATED', options[:doc][:title]
+            true
           end
           .returns({'_id' => 'abc123', 'version' => 2})
 
@@ -268,6 +276,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |id, options|
             assert_equal 'abc123', id
             assert_equal 'EXEC', options[:script]
+            true
           end
           .returns({'_id' => 'abc123', 'version' => 2})
 
@@ -281,6 +290,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .expects(:update)
           .with do |object, options|
             assert_equal 'ABC', options[:routing]
+            true
           end
           .returns({'_id' => 'abc123'})
 
@@ -314,6 +324,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc'})
 
@@ -330,6 +341,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc', '_index' => 'foo', '_type' => 'bar', '_version' => '100'})
 
@@ -354,6 +366,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .expects(:update)
           .with do |id, options|
             assert_equal 'ctx._source.count += 1', options[:script]
+            true
           end
           .returns({'_id' => 'abc123', 'version' => 2})
 
@@ -369,6 +382,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc', '_index' => 'foo', '_type' => 'bar', '_version' => '100'})
 
@@ -391,6 +405,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .expects(:update)
           .with do |id, options|
             assert_equal 'ctx._source.count = ctx._source.count - 1', options[:script]
+            true
           end
           .returns({'_id' => 'abc123', 'version' => 2})
 
@@ -406,6 +421,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc', '_index' => 'foo', '_type' => 'bar', '_version' => '100'})
 
@@ -428,12 +444,14 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
 
       should "update updated_at by default" do
         subject.expects(:persisted?).returns(true)
-        Time.expects(:now).returns(Time.parse('2014-01-01T00:00:00Z')).at_least_once
+        now = Time.parse('2014-01-01T00:00:00Z')
+        Time.expects(:now).returns(now).at_least_once
 
         @gateway
           .expects(:update)
           .with do |id, options|
             assert_equal '2014-01-01T00:00:00Z', options[:doc][:updated_at]
+            true
           end
           .returns({'_id' => 'abc123', 'version' => 2})
 
@@ -443,12 +461,14 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
 
       should "update a custom attribute by default" do
         subject.expects(:persisted?).returns(true)
-        Time.expects(:now).returns(Time.parse('2014-01-01T00:00:00Z')).at_least_once
+        now = Time.parse('2014-01-01T00:00:00Z')
+        Time.expects(:now).returns(now).at_least_once
 
         @gateway
           .expects(:update)
           .with do |id, options|
             assert_equal '2014-01-01T00:00:00Z', options[:doc][:created_at]
+            true
           end
           .returns({'_id' => 'abc123', 'version' => 2})
 
@@ -475,6 +495,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           .with do |model, options|
             assert_equal 'my_custom_index', options[:index]
             assert_equal 'my_custom_type',  options[:type]
+            true
           end
           .returns({'_id' => 'abc', '_index' => 'foo', '_type' => 'bar', '_version' => '100'})
 

data/test/unit/repository_find_test.rb

@@ -58,6 +58,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal '1', arguments[:id]
+            true
           end
           .returns(true)
 
@@ -74,6 +75,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal '1', arguments[:id]
+            true
           end
           .returns(true)
 
@@ -89,6 +91,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal '_all', arguments[:type]
             assert_equal '1', arguments[:id]
+            true
           end
           .returns(true)
 
@@ -99,6 +102,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
         @client.expects(:exists).with do |arguments|
           assert_equal 'foobarbam', arguments[:index]
           assert_equal 'bambam',    arguments[:routing]
+          true
         end
 
         subject.exists? '1', index: 'foobarbam', routing: 'bambam'
@@ -118,6 +122,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal '1', arguments[:id]
+            true
           end
           .returns({'_source' => { 'foo' => 'bar' }})
 
@@ -136,6 +141,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal '1', arguments[:id]
+            true
           end
           .returns({'_source' => { 'foo' => 'bar' }})
 
@@ -154,6 +160,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal '_all', arguments[:type]
             assert_equal '1', arguments[:id]
+            true
           end
           .returns({'_source' => { 'foo' => 'bar' }})
 
@@ -198,6 +205,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'foobarbam', arguments[:index]
             assert_equal 'bambam',    arguments[:routing]
+            true
           end
           .returns({'_source' => { 'foo' => 'bar' }})
 
@@ -244,6 +252,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal ['1', '2'], arguments[:body][:ids]
+            true
           end
           .returns(@response)
 
@@ -264,6 +273,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal ['1', '2'], arguments[:body][:ids]
+            true
           end
           .returns(@response)
 
@@ -290,6 +300,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal '_all', arguments[:type]
             assert_equal ['1', '2'], arguments[:body][:ids]
+            true
           end
           .returns(@response)
 
@@ -343,6 +354,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'my_document', arguments[:type]
             assert_equal ['1', '3', '2'], arguments[:body][:ids]
+            true
           end
           .returns(@response)
 
@@ -364,6 +376,7 @@ class Elasticsearch::Persistence::RepositoryFindTest < Test::Unit::TestCase
           .with do |arguments|
             assert_equal 'foobarbam', arguments[:index]
             assert_equal 'bambam',    arguments[:routing]
+            true
           end
           .returns(@response)
 

data/test/unit/repository_module_test.rb

@@ -104,6 +104,7 @@ class Elasticsearch::Persistence::RepositoryModuleTest < Test::Unit::TestCase
         client.expects(:index).with do |arguments|
           assert_equal('xxx',   arguments[:id])
           assert_equal('FAKE!', arguments[:body])
+          true
         end
         repository.gateway.expects(:client).returns(client)
 
@@ -129,6 +130,7 @@ class Elasticsearch::Persistence::RepositoryModuleTest < Test::Unit::TestCase
       client.expects(:index).with do |arguments|
         assert_equal('xxx',   arguments[:id])
         assert_equal('FAKE IN CLASS!', arguments[:body])
+        true
       end
       repository.gateway.expects(:client).returns(client)
 

data/test/unit/repository_search_test.rb

@@ -21,8 +21,8 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
       @client.expects(:search).with do |arguments|
         assert_equal 'test',        arguments[:index]
         assert_equal 'my_document', arguments[:type]
-
-        assert_equal({foo: 'bar'}, arguments[:body])
+        assert_equal({foo: 'bar'},  arguments[:body])
+        true
       end
 
       subject.search foo: 'bar'
@@ -35,8 +35,8 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
       @client.expects(:search).with do |arguments|
         assert_equal 'test',                arguments[:index]
         assert_equal 'my_special_document', arguments[:type]
-
-        assert_equal({foo: 'bar'}, arguments[:body])
+        assert_equal({foo: 'bar'},          arguments[:body])
+        true
       end
 
       subject.search foo: 'bar'
@@ -50,8 +50,8 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
       @client.expects(:search).with do |arguments|
         assert_equal 'test', arguments[:index]
         assert_equal nil,    arguments[:type]
-
         assert_equal({foo: 'bar'}, arguments[:body])
+        true
       end
 
       assert_instance_of Elasticsearch::Persistence::Repository::Response::Results,
@@ -64,6 +64,7 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
 
       @client.expects(:search).twice.with do |arguments|
         assert_equal 'bambam', arguments[:routing]
+        true
       end
 
       assert_instance_of Elasticsearch::Persistence::Repository::Response::Results,
@@ -78,6 +79,7 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
 
       @client.expects(:search).with do |arguments|
         assert_equal 'foobar', arguments[:q]
+        true
       end
 
       assert_instance_of Elasticsearch::Persistence::Repository::Response::Results,
@@ -104,6 +106,7 @@ class Elasticsearch::Persistence::RepositorySearchTest < Test::Unit::TestCase
         .with do |query_or_definition, options|
           assert_equal 'bar', query_or_definition[:query][:match][:foo]
           assert_equal true, options[:ignore_unavailable]
+          true
         end
         .returns(Elasticsearch::Persistence::Repository::Response::Results.new( subject, {'hits' => { 'total' => 1 }}))
 

data/test/unit/repository_store_test.rb

@@ -25,6 +25,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
           assert_equal({foo: 'bar'}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -43,6 +44,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
           assert_equal({foo: 'bar'}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -64,6 +66,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
           assert_equal({foo: 'bar'}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -81,6 +84,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
         client.expects(:index).with do |arguments|
           assert_equal 'foobarbam', arguments[:index]
           assert_equal 'bambam', arguments[:routing]
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -99,6 +103,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',     arguments[:id]
           assert_equal 'mydoc', arguments[:type]
           assert_equal({doc: { foo: 'bar' }}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -114,6 +119,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',     arguments[:id]
           assert_equal 'mydoc', arguments[:type]
           assert_equal({script: 'ctx._source.foo += 1'}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -129,6 +135,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',     arguments[:id]
           assert_equal 'mydoc', arguments[:type]
           assert_equal({script: 'ctx._source.foo += 1', upsert: { foo: 1 }}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -143,6 +150,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',     arguments[:id]
           assert_equal 'mydoc', arguments[:type]
           assert_equal({doc: { foo: 'bar' }}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -157,6 +165,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',     arguments[:id]
           assert_equal 'mydoc', arguments[:type]
           assert_equal({script: 'ctx._source.foo += 1'}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -171,6 +180,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',     arguments[:id]
           assert_equal 'mydoc', arguments[:type]
           assert_equal({script: 'ctx._source.foo += 1', upsert: { foo: 1 } }, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -185,6 +195,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
           assert_equal '1',   arguments[:id]
           assert_equal 'foo', arguments[:type]
           assert_equal({script: 'ctx._source.foo += 1'}, arguments[:body])
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -208,6 +219,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
         client.expects(:delete).with do |arguments|
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -225,6 +237,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
         client.expects(:delete).with do |arguments|
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -245,6 +258,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
         client.expects(:delete).with do |arguments|
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -262,6 +276,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
         client.expects(:delete).with do |arguments|
           assert_equal 'my_document', arguments[:type]
           assert_equal '1', arguments[:id]
+          true
         end
         subject.expects(:client).returns(client)
 
@@ -277,6 +292,7 @@ class Elasticsearch::Persistence::RepositoryStoreTest < Test::Unit::TestCase
         client.expects(:delete).with do |arguments|
           assert_equal 'foobarbam', arguments[:index]
           assert_equal 'bambam', arguments[:routing]
+          true
         end
         subject.expects(:client).returns(client)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-persistence
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -164,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -252,16 +266,16 @@ dependencies:
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement