elasticsearch-persistence 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03440c2fe4ccd61f948a45a09d8f89ad3fac5c8b
-  data.tar.gz: dcbd272fe27622b0412f33c1ef0a9d0ec9a014e0
+  metadata.gz: 55426b2295af55ae3c3c5e22b5db473b208b74a0
+  data.tar.gz: 86391c93cbec7a02acc48ddd1f42f01b48dff606
 SHA512:
-  metadata.gz: 6af7aca4b57de05b0b5baa1a883c0b0ef232822b57dc6838a8f77f3724e5a31f9ee21cfc97c0b7e4af071c9a51674e7284bdbedeea5816934b099d7bc9575626
-  data.tar.gz: 61a06f09ae2ed1471989c93b6558d3e3a9d92a1ef7f9f5aedb150b865e438c9b0eb248cb4e89db150b50fcbc06559b62cfa0bb2c5d48366bb629b3d9bc6590d4
+  metadata.gz: 6a628a20d7500464ad4e810ef22269152a301a31508a6b0df11b22e0fdd7a67ce0607f58a675ccafaa9bdb04748d2aae829e9aeba2bae626c643a1cccf23f76d
+  data.tar.gz: 632053ca6192adbbaac8b2e6565043d658bf66a659db9fbf4341dbc89907a2526cc477493f1d324b33c9857ddd02e7e646ab566b07e1cbc5345ee00d1eda42c3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.7
+
+* Added an integration test for the `MyModel.all` method
+* Improved the "music" example application
+
 ## 0.1.6
 
 * Improved documentation

data/README.md

@@ -616,7 +616,7 @@ Elasticsearch::Persistence.client = Elasticsearch::Client.new log: true
 To set up a specific client for a specific model:
 
 ```ruby
-Article.client = Elasticsearch::Client.new host: 'api.server.org'
+Article.gateway.client = Elasticsearch::Client.new host: 'api.server.org'
 ```
 
 You might want to do this during you application bootstrap process, e.g. in a Rails initializer.

data/examples/music/suggester.rb

@@ -12,19 +12,19 @@ class Suggester
       body: {
         artists: {
           text: @term,
-          completion: { field: 'suggest_name' }
+          completion: { field: 'suggest_name', size: 25 }
         },
         members: {
           text: @term,
-          completion: { field: 'suggest_member' }
+          completion: { field: 'suggest_member', size: 25 }
         },
         albums: {
           text: @term,
-          completion: { field: 'suggest_title' }
+          completion: { field: 'suggest_title', size: 25 }
         },
         tracks: {
           text: @term,
-          completion: { field: 'suggest_track' }
+          completion: { field: 'suggest_track', size: 25 }
         }
       }
     end

data/examples/music/template.rb

@@ -17,7 +17,7 @@
 # Usage:
 # ------
 #
-#     $ time rails new music --force --skip --skip-bundle --skip-active-record --template /Users/karmi/Contracts/Elasticsearch/Projects/Clients/Ruby/elasticsearch-rails/elasticsearch-persistence/examples/music/template.rb
+#     $ time rails new music --force --skip --skip-bundle --skip-active-record --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-persistence/examples/music/template.rb
 #
 # =====================================================================================================
 
@@ -132,6 +132,7 @@ gem "quiet_assets"
 gem "simple_form"
 
 gem 'elasticsearch', git: 'git://github.com/elasticsearch/elasticsearch-ruby.git'
+gem 'elasticsearch-model', git: 'git://github.com/elasticsearch/elasticsearch-rails.git', require: 'elasticsearch/model'
 gem 'elasticsearch-persistence', git: 'git://github.com/elasticsearch/elasticsearch-rails.git', require: 'elasticsearch/persistence/model'
 gem 'elasticsearch-rails', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'
 

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

@@ -44,7 +44,10 @@ module Elasticsearch
           # @return [Hash,FalseClass] The Elasticsearch response as a Hash or `false`
           #
           def save(options={})
-            return false unless valid?
+            unless options.delete(:validate) == false
+              return false unless valid?
+            end
+
             run_callbacks :save do
               options.update id: self.id
               options.update index: self._index if self._index

data/lib/elasticsearch/persistence/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Persistence
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/test/integration/model/model_basic_test.rb

@@ -51,7 +51,7 @@ module Elasticsearch
 
         should "save and find the object" do
           person = Person.new name: 'John Smith', birthday: Date.parse('1970-01-01')
-          person.save
+          assert person.save
 
           assert_not_nil person.id
           document = Person.find(person.id)
@@ -63,6 +63,20 @@ module Elasticsearch
           assert_not_nil Elasticsearch::Persistence.client.get index: 'people', type: 'person', id: person.id
         end
 
+        should "not save an invalid object" do
+          person = Person.new name: nil
+          assert ! person.save
+        end
+
+        should "save an invalid object with the :validate option" do
+          person = Person.new name: nil, salary: 100
+          assert person.save validate: false
+
+          assert_not_nil person.id
+          document = Person.find(person.id)
+          assert_equal 100, document.salary
+        end
+
         should "delete the object" do
           person = Person.create name: 'John Smith', birthday: Date.parse('1970-01-01')
 
@@ -129,6 +143,17 @@ module Elasticsearch
           assert found.updated_at > updated_at, [found.updated_at, updated_at].inspect
         end
 
+        should "find all instances" do
+          Person.create name: 'John Smith'
+          Person.create name: 'Mary Smith'
+          Person.gateway.refresh_index!
+
+          people = Person.all
+
+          assert_equal 2, people.total
+          assert_equal 2, people.size
+        end
+
         should "find instances by search" do
           Person.create name: 'John Smith'
           Person.create name: 'Mary Smith'

data/test/unit/model_store_test.rb

@@ -80,10 +80,7 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
           end
           .returns({'_id' => 'abc123'})
 
-        assert ! subject.persisted?
-
         assert subject.save
-        assert subject.persisted?
       end
 
       should "save the model and set the ID" do
@@ -108,6 +105,37 @@ class Elasticsearch::Persistence::ModelStoreTest < Test::Unit::TestCase
         assert_equal Time.parse('2014-01-01T00:00:00Z'), subject.updated_at
       end
 
+      should "not save an invalid model" do
+        @gateway
+          .expects(:save)
+          .never
+
+        subject.instance_eval do
+          def valid?; false; end;
+        end
+
+        assert ! subject.save
+        assert ! subject.persisted?
+      end
+
+      should "skip the validation with the :validate option" do
+        @gateway
+          .expects(:save)
+          .with do |object, options|
+            assert_equal subject, object
+            assert_equal nil, options[:id]
+            true
+          end
+          .returns({'_id' => 'abc123'})
+
+        subject.instance_eval do
+          def valid?; false; end;
+        end
+
+        assert subject.save validate: false
+        assert subject.persisted?
+      end
+
       should "pass the options to gateway" do
         @gateway
           .expects(:save)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-persistence
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch