Merge 85ce8f9 into ccc12c3

fog · Aug 14, 2014 · bc00f9d · bc00f9d
2 parents ccc12c3 + 85ce8f9
commit bc00f9d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/lib/fog/core/attributes.rb b/lib/fog/core/attributes.rb
@@ -73,11 +73,10 @@ def associations
       end
 
       def all_attributes
-        all_attributes = self.class.attributes.inject({}) do |hash, attribute|
+        self.class.attributes.inject({}) do |hash, attribute|
           hash[attribute] = send(attribute)
           hash
         end
-        self.class.new(all_attributes).attributes
       end
 
       def dup

diff --git a/spec/fog_attribute_spec.rb b/spec/fog_attribute_spec.rb
@@ -343,14 +343,15 @@ class FogMultipleAssociationsModel < Fog::Model
     describe "on a persisted object" do
       it "should return all attributes without default values" do
         model.merge_attributes( :id => 2, :float => 3.2, :integer => 55555555 )
+        assert model.persisted?
         assert_equal model.all_attributes, { :id => 2,
                                              :key => nil,
                                              :time => nil,
                                              :bool => nil,
                                              :float => 3.2,
                                              :integer => 55555555,
-                                             :string => '',
-                                             :timestamp => Time.at(0),
+                                             :string => nil,
+                                             :timestamp => nil,
                                              :array => [],
                                              :default => nil,
                                              :another_default => nil }
@@ -359,15 +360,16 @@ class FogMultipleAssociationsModel < Fog::Model
 
     describe "on a new object" do
       it "should return all attributes including default values for empty attributes" do
-        model.merge_attributes( :id => nil, :float => 3.2, :integer => 55555555 )
+        model.merge_attributes( :float => 3.2, :integer => 55555555 )
+        refute model.persisted?
         assert_equal model.all_attributes, { :id => nil,
                                              :key => nil,
                                              :time => nil,
                                              :bool => nil,
                                              :float => 3.2,
                                              :integer => 55555555,
-                                             :string => '',
-                                             :timestamp => Time.at(0),
+                                             :string => nil,
+                                             :timestamp => nil,
                                              :array => [],
                                              :default => 'default_value',
                                              :another_default => false }