couchrest 1.1.0 → 1.1.1

data/history.txt

@@ -1,3 +1,8 @@
+== 1.1.1 - 2011-07-04
+
+* Urgent change
+  * Ensuring attributes hash initalized on use to avoid issues when initializer is overwritten.
+
 == 1.1.0 - 2011-06-25
 
 * Minor changes

data/lib/couchrest/attributes.rb

@@ -20,26 +20,25 @@ module CouchRest
     # that the attributes hash has been initialized before
     # you attempt to use it.
     def initialize(attrs = nil)
-      @_attributes = {}
       attrs.each{|k,v| self[k] = v} unless attrs.nil?
     end
 
     # Hash equivilent methods to access the attributes
-    def_delegators :@_attributes, :to_a, :==, :eql?, :keys, :values, :each,
+    def_delegators :_attributes, :to_a, :==, :eql?, :keys, :values, :each,
       :reject, :reject!, :empty?, :clear, :merge, :merge!,
       :encode_json, :as_json, :to_json, :frozen?
 
     def []=(key, value)
-      @_attributes[key.to_s] = value
+      _attributes[key.to_s] = value
     end
     def [](key)
-      @_attributes[key.to_s]
+      _attributes[key.to_s]
     end
     def has_key?(key)
-      @_attributes.has_key?(key.to_s)
+      _attributes.has_key?(key.to_s)
     end
     def delete(key)
-      @_attributes.delete(key.to_s)
+      _attributes.delete(key.to_s)
     end
     def dup
       new = super
@@ -52,14 +51,14 @@ module CouchRest
       new
     end
     def to_hash
-      @_attributes
+      _attributes
     end
 
     # Freeze the object's attributes instead of the actual document.
     # This prevents further modifications to stored data, but does allow access
     # to local variables useful for callbacks or cached data.
     def freeze
-      @_attributes.freeze; self
+      _attributes.freeze; self
     end
 
     # Provide details of the current keys in the reponse. Based on ActiveRecord::Base.
@@ -70,6 +69,14 @@ module CouchRest
       "#<#{self.class} #{attributes_as_nice_string}>"
     end
 
+    protected
+
+    # Define accessor for _attributes hash that will instantiate the
+    # model if this has not already been done.
+    def _attributes
+      @_attributes ||= {}
+    end
+
   end
 
 end

data/lib/couchrest/version.rb

@@ -1,3 +1,3 @@
 module CouchRest
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/couchrest/document_spec.rb

@@ -27,8 +27,22 @@ describe CouchRest::Document do
       @doc['_id'].should eql('sample')
       @doc['foo'].should eql('bar')
     end
+
+    context "replacing initalize" do
+      it "should not raise error" do
+        klass = Class.new(CouchRest::Document)
+        klass.class_eval do
+          def initialize; end # don't do anything, just overwrite
+        end
+        expect {
+          @doc = klass.new
+          @doc['test'] = 'sample'
+        }.to_not raise_error
+      end
+    end
   end
 
+
   describe "hash methods" do
     it "should respond to forwarded hash methods" do
       @doc = CouchRest::Document.new(:foo => 'bar')

metadata

@@ -2,7 +2,7 @@
 name: couchrest
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - J. Chris Anderson