tire 0.1.11 → 0.1.12

data/lib/tire/model/search.rb

@@ -23,6 +23,10 @@ module Tire
             define_method("#{attr}=") { |value| @attributes ||= {}; @attributes[attr] = value }
             define_method("#{attr}")  { @attributes[attr] }
           end
+
+          def to_hash
+            self.serializable_hash
+          end unless instance_methods.map(&:to_sym).include?(:to_hash)
         end
       end
 
@@ -92,10 +96,6 @@ module Tire
           end
         end
 
-        def to_hash
-          self.serializable_hash
-        end
-
         def to_indexed_json
           if self.class.mapping.empty?
             to_hash.to_json

data/lib/tire/version.rb

@@ -1,13 +1,14 @@
 module Tire
-  VERSION          = "0.1.11"
+  VERSION          = "0.1.12"
 
   CHANGELOG =<<-END
-    CHANGES FROM 0.1.8:
+    IMPORTANT CHANGES LATELY:
 
     # Added `<after/before>_update_elastic_search_index` callbacks for models
     # Search performs GET instead of POST
     # Added percolator support
     # Added percolator support for models
     # CHANGELOG support in gemspec
+    # [FIX] Do not redefine #to_hash in models
   END
 end

data/test/unit/model_search_test.rb

@@ -311,6 +311,19 @@ module Tire
             assert_equal( {'title' => 'Test'}, ActiveModelArticle.new( 'title' => 'Test' ).to_hash )
           end
 
+          should "not redefine to_hash if already defined" do
+            class ::ActiveModelArticleWithToHash < ActiveModelArticle
+              def to_hash; { :foo => 'bar' }; end
+            end
+            assert_equal 'bar', ::ActiveModelArticleWithToHash.new(:title => 'Test').to_hash[:foo]
+
+            class ::ActiveModelArticleWithToHashFromSuperclass < Hash
+              include Tire::Model::Search
+              include Tire::Model::Callbacks
+            end
+            assert_equal( {}, ::ActiveModelArticleWithToHashFromSuperclass.new(:title => 'Test').to_hash)
+          end
+
           should "serialize itself into JSON without 'root'" do
             @model = ActiveModelArticle.new 'title' => 'Test'
             assert_equal({'title' => 'Test'}.to_json, @model.to_indexed_json)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tire
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Karel Minarik
@@ -347,15 +347,16 @@ post_install_message: |
   
   --------------------------------------------------------------------------------
   
-    CHANGES FROM 0.1.8:
+    IMPORTANT CHANGES LATELY:
   
     # Added `<after/before>_update_elastic_search_index` callbacks for models
     # Search performs GET instead of POST
     # Added percolator support
     # Added percolator support for models
     # CHANGELOG support in gemspec
+    # [FIX] Do not redefine #to_hash in models
   
-    See the full changelog at <http://github.com/karmi/tire/commits/v0.1.11>.
+    See the full changelog at <http://github.com/karmi/tire/commits/v0.1.12>.
   
   --------------------------------------------------------------------------------