elastictastic 0.10.4 → 0.10.5

data/README.md

@@ -6,6 +6,8 @@ is to define model classes which use ElasticSearch as a primary
 document-oriented data store, and to expose ElasticSearch's search functionality
 to query for those models.
 
+[![Build Status](https://secure.travis-ci.org/brewster/elastictastic.png)](http://travis-ci.org/brewster/elastictastic)
+
 ## Dependencies ##
 
 Elastictastic requires Ruby 1.9 and ActiveSupport 3. Elastictastic does not
@@ -469,7 +471,17 @@ Post.highlight { fields(:title => {}) }.find_in_batches do |batch|
 end
 ```
 
-Both `find_each` and `find_in_batches` accept a :batch_size option.
+Both `find_each` and `find_in_batches` accept a `:batch_size` option.
+
+## Support & Bugs ##
+
+If you find a bug, feel free to
+[open an issue](https://github.com/brewster/elastictastic/issues/new) on GitHub.
+Pull requests are most welcome.
+
+For questions or feedback, hit up our mailing list at
+[elastictastic@groups.google.com](http://groups.google.com/group/elastictastic)
+or find outoftime on the #elasticsearch IRC channel on Freenode.
 
 ## License ##
 

data/lib/elastictastic/basic_document.rb

@@ -116,6 +116,8 @@ module Elastictastic
                :script_fields, :preference, :facets, :routing,
                :to => :current_scope
 
+      attr_writer :default_index
+
       def mapping
         mapping_for_type = { 'properties' => properties }
         mapping_for_type['_boost'] = @_boost if @_boost
@@ -143,7 +145,11 @@ module Elastictastic
       private
 
       def default_scope
-        in_index(Index.default)
+        in_index(default_index)
+      end
+
+      def default_index
+        @default_index || Index.default
       end
     end
 
@@ -192,7 +198,7 @@ module Elastictastic
     end
 
     def ==(other)
-      index == other.index && id == other.id
+      index == other.index && self.class == other.class && id == other.id
     end
 
     def attributes

data/lib/elastictastic/index.rb

@@ -15,5 +15,9 @@ module Elastictastic
     def to_s
       @name
     end
+
+    def ==(other)
+      name == other.name
+    end
   end
 end

data/lib/elastictastic/properties.rb

@@ -262,7 +262,8 @@ module Elastictastic
     def deserialize_value(field_name, value)
       return nil if value.nil?
       if self.class.properties_for_field(field_name)['type'].to_s == 'date'
-        if value.is_a? Fixnum
+        case value
+        when Fixnum, Bignum
           sec, usec = value / 1000, (value % 1000) * 1000
           Time.at(sec, usec).utc
         else

data/lib/elastictastic/version.rb

@@ -1,3 +1,3 @@
 module Elastictastic
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

data/spec/examples/document_spec.rb

@@ -659,4 +659,24 @@ describe Elastictastic::Document do
       end
     end
   end
+
+  describe '#==' do
+    it 'should return true if index, id and class of both objects are equal' do
+      first_post = Post.new(index: "post", title: "Hello, world!")
+      first_post.id = 1
+      other_post = Post.new(index: "post", title: "Hello, world!")
+      other_post.id = 1
+
+      other_post.should eq first_post
+    end
+
+    it 'should fail when classes are not equal' do
+      post = Post.new
+      post.id = 1
+      photo = Photo.new
+      photo.id = 1
+
+      photo.should_not eq post
+    end
+  end
 end

data/spec/examples/optimistic_locking_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../spec_helper', __FILE__)
-require 'ruby-debug'
 
 describe Elastictastic::OptimisticLocking do
   include Elastictastic::TestHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastictastic
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24452880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,15 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *24452880
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24452420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,15 +34,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *24452420
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24452040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,15 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24452040
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24451580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,15 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24451580
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24451160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,15 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24451160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24450660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -103,15 +78,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *24450660
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24450160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -119,31 +89,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *24450160
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &24449700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -151,12 +100,7 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+  version_requirements: *24449700
 description: ! 'Elastictastic is an object-document mapper and lightweight API adapter
   for
 
@@ -173,74 +117,74 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/elastictastic.rb
-- lib/elastictastic/optimistic_locking.rb
-- lib/elastictastic/server_error.rb
-- lib/elastictastic/document.rb
-- lib/elastictastic/nested_document.rb
-- lib/elastictastic/child_collection_proxy.rb
-- lib/elastictastic/mass_assignment_security.rb
-- lib/elastictastic/scope_builder.rb
-- lib/elastictastic/util.rb
-- lib/elastictastic/index.rb
-- lib/elastictastic/bulk_persistence_strategy.rb
-- lib/elastictastic/basic_document.rb
-- lib/elastictastic/thrift/rest.rb
-- lib/elastictastic/thrift/constants.rb
-- lib/elastictastic/thrift/types.rb
 - lib/elastictastic/multi_search.rb
-- lib/elastictastic/association.rb
-- lib/elastictastic/adapter.rb
-- lib/elastictastic/discrete_persistence_strategy.rb
-- lib/elastictastic/callbacks.rb
+- lib/elastictastic/transport_methods.rb
+- lib/elastictastic/basic_document.rb
 - lib/elastictastic/observer.rb
+- lib/elastictastic/middleware.rb
+- lib/elastictastic/child_collection_proxy.rb
+- lib/elastictastic/dirty.rb
+- lib/elastictastic/rotor.rb
+- lib/elastictastic/errors.rb
+- lib/elastictastic/scope.rb
+- lib/elastictastic/discrete_persistence_strategy.rb
+- lib/elastictastic/parent_child.rb
+- lib/elastictastic/adapter.rb
 - lib/elastictastic/embedded_document.rb
-- lib/elastictastic/test_helpers.rb
-- lib/elastictastic/thrift_adapter.rb
-- lib/elastictastic/version.rb
-- lib/elastictastic/validations.rb
-- lib/elastictastic/persistence.rb
-- lib/elastictastic/railtie.rb
+- lib/elastictastic/new_relic_instrumentation.rb
+- lib/elastictastic/optimistic_locking.rb
+- lib/elastictastic/callbacks.rb
+- lib/elastictastic/util.rb
+- lib/elastictastic/nested_document.rb
+- lib/elastictastic/association.rb
 - lib/elastictastic/client.rb
+- lib/elastictastic/document.rb
 - lib/elastictastic/properties.rb
-- lib/elastictastic/rotor.rb
+- lib/elastictastic/test_helpers.rb
+- lib/elastictastic/search.rb
+- lib/elastictastic/thrift/types.rb
+- lib/elastictastic/thrift/rest.rb
+- lib/elastictastic/thrift/constants.rb
 - lib/elastictastic/multi_get.rb
-- lib/elastictastic/parent_child.rb
+- lib/elastictastic/mass_assignment_security.rb
+- lib/elastictastic/server_error.rb
+- lib/elastictastic/version.rb
+- lib/elastictastic/scope_builder.rb
+- lib/elastictastic/persistence.rb
+- lib/elastictastic/observing.rb
+- lib/elastictastic/index.rb
+- lib/elastictastic/validations.rb
+- lib/elastictastic/bulk_persistence_strategy.rb
 - lib/elastictastic/field.rb
-- lib/elastictastic/scope.rb
 - lib/elastictastic/scoped.rb
-- lib/elastictastic/new_relic_instrumentation.rb
-- lib/elastictastic/search.rb
-- lib/elastictastic/transport_methods.rb
-- lib/elastictastic/middleware.rb
+- lib/elastictastic/thrift_adapter.rb
+- lib/elastictastic/railtie.rb
 - lib/elastictastic/configuration.rb
-- lib/elastictastic/dirty.rb
-- lib/elastictastic/errors.rb
-- lib/elastictastic/observing.rb
+- lib/elastictastic.rb
+- spec/models/photo.rb
+- spec/models/post.rb
+- spec/models/blog.rb
+- spec/models/author.rb
+- spec/models/post_observer.rb
+- spec/models/comment.rb
 - spec/environment.rb
+- spec/examples/callbacks_spec.rb
+- spec/examples/mass_assignment_security_spec.rb
+- spec/examples/rotor_spec.rb
+- spec/examples/middleware_spec.rb
+- spec/examples/optimistic_locking_spec.rb
+- spec/examples/parent_child_spec.rb
+- spec/examples/scope_spec.rb
 - spec/examples/bulk_persistence_strategy_spec.rb
-- spec/examples/document_spec.rb
 - spec/examples/properties_spec.rb
-- spec/examples/validation_spec.rb
-- spec/examples/optimistic_locking_spec.rb
-- spec/examples/middleware_spec.rb
-- spec/examples/mass_assignment_security_spec.rb
-- spec/examples/dirty_spec.rb
-- spec/examples/spec_helper.rb
 - spec/examples/multi_search_spec.rb
-- spec/examples/rotor_spec.rb
-- spec/examples/callbacks_spec.rb
 - spec/examples/multi_get_spec.rb
-- spec/examples/scope_spec.rb
-- spec/examples/parent_child_spec.rb
-- spec/examples/observing_spec.rb
 - spec/examples/search_spec.rb
-- spec/models/post_observer.rb
-- spec/models/author.rb
-- spec/models/blog.rb
-- spec/models/post.rb
-- spec/models/photo.rb
-- spec/models/comment.rb
+- spec/examples/document_spec.rb
+- spec/examples/dirty_spec.rb
+- spec/examples/validation_spec.rb
+- spec/examples/observing_spec.rb
+- spec/examples/spec_helper.rb
 - spec/support/fakeweb_request_history.rb
 - README.md
 - LICENSE
@@ -266,26 +210,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ElasticSearch
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Object-document mapper for ElasticSearch
 test_files:
+- spec/examples/callbacks_spec.rb
+- spec/examples/mass_assignment_security_spec.rb
+- spec/examples/rotor_spec.rb
+- spec/examples/middleware_spec.rb
+- spec/examples/optimistic_locking_spec.rb
+- spec/examples/parent_child_spec.rb
+- spec/examples/scope_spec.rb
 - spec/examples/bulk_persistence_strategy_spec.rb
-- spec/examples/document_spec.rb
 - spec/examples/properties_spec.rb
-- spec/examples/validation_spec.rb
-- spec/examples/optimistic_locking_spec.rb
-- spec/examples/middleware_spec.rb
-- spec/examples/mass_assignment_security_spec.rb
-- spec/examples/dirty_spec.rb
-- spec/examples/spec_helper.rb
 - spec/examples/multi_search_spec.rb
-- spec/examples/rotor_spec.rb
-- spec/examples/callbacks_spec.rb
 - spec/examples/multi_get_spec.rb
-- spec/examples/scope_spec.rb
-- spec/examples/parent_child_spec.rb
-- spec/examples/observing_spec.rb
 - spec/examples/search_spec.rb
+- spec/examples/document_spec.rb
+- spec/examples/dirty_spec.rb
+- spec/examples/validation_spec.rb
+- spec/examples/observing_spec.rb
+- spec/examples/spec_helper.rb
 has_rdoc: true