amfetamine 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.3.2
+- fix for Object#save return value with disabled caching
+
 0.3.1
 - memcached_instance Dalli::Client configuration setting changes (it should now start with "memcached://")
 

data/lib/amfetamine/query_methods.rb

@@ -19,7 +19,7 @@ module Amfetamine
           key = opts[:nested_path] || self.find_path(id)
           data = get_data(key, opts[:conditions])
           if data[:status] == :success
-            val = build_object(data[:body]) 
+            val = build_object(data[:body])
           else
             nil
           end
@@ -99,17 +99,17 @@ module Amfetamine
       end
 
       run_callbacks(:save) do
-        response = if self.new?
-                     path = self.belongs_to_relationship? ? belongs_to_relationships.first.rest_path : rest_path
-                     self.class.handle_request(:post, path, {:body => {class_name.to_sym => self.to_hash}})
-                   else
-                     # Needs cleaning up, also needs to work with multiple belongs_to relationships (optional, I guess)
-                     path = self.belongs_to_relationship? ? belongs_to_relationships.first.singular_path : singular_path
-                     self.class.handle_request(:put, path, {:body => {class_name.to_sym => self.to_hash}})
-                   end
+        response =
+          if self.new?
+            path = self.belongs_to_relationship? ? belongs_to_relationships.first.rest_path : rest_path
+            self.class.handle_request(:post, path, {:body => {class_name.to_sym => self.to_hash}})
+          else
+            # Needs cleaning up, also needs to work with multiple belongs_to relationships (optional, I guess)
+            path = self.belongs_to_relationship? ? belongs_to_relationships.first.singular_path : singular_path
+            self.class.handle_request(:put, path, {:body => {class_name.to_sym => self.to_hash}})
+          end
 
         if handle_response(response)
-
           begin
             update_attributes_from_response(response[:body])
           ensure
@@ -119,7 +119,11 @@ module Amfetamine
           path = self.belongs_to_relationship? ? belongs_to_relationships.first.singular_path : singular_path
           self.cache_key = path
 
-          cache.set(path, self.to_cacheable) if self.cacheable?
+          if self.cacheable?
+            cache.set(path, self.to_cacheable)
+          else
+            true # return true for successful updates
+          end
         else
           false
         end
@@ -153,7 +157,6 @@ module Amfetamine
             cache.delete(r.rest_path + cc)
           end
         end
-        
         condition_keys = cache.get("#{rest_path}_conditions") || []
         condition_keys.each do |cc|
           cache.delete(rest_path + cc)
@@ -162,9 +165,6 @@ module Amfetamine
       end
     end
 
-
-
-
     def update_attributes(attrs)
       return true if attrs.all? { |k,v| self.send(k) == v } # Don't update if no attributes change
       attrs.each { |k,v| self.send("#{k}=", v) }

data/lib/amfetamine/version.rb

@@ -1,3 +1,3 @@
 module Amfetamine
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/amfetamine/base_spec.rb

@@ -43,7 +43,7 @@ describe Amfetamine::Base do
           response.should be_cached
         end
       end
-      
+
       it "should return nil if object not found" do
         lambda {
         Dummy.prevent_external_connections! do |r|
@@ -69,7 +69,7 @@ describe Amfetamine::Base do
         dummies.should include(dummy2)
         dummies.length.should eq(2)
       end
-      
+
       it "should return empty array if objects are not present" do
         Dummy.prevent_external_connections! do |r|
           r.get(:code => 200) {[]}
@@ -104,20 +104,27 @@ describe Amfetamine::Base do
     end
 
     context "#update" do
-      before(:each) do
+      before do
         dummy.send(:notsaved=, false)
       end
 
       it "should update if response is succesful" do
         Dummy.prevent_external_connections! do |r|
           r.put {}
-
           dummy.update_attributes({:title => 'zomg'})
         end
-
         dummy.should_not be_new
         dummy.title.should eq('zomg')
-        dummy.should be_cached 
+        dummy.should be_cached
+      end
+
+      it "should return true for successful updates even with disabled caching" do
+        Dummy.disable_caching = true
+        Dummy.prevent_external_connections! do |r|
+          r.put {}
+          dummy.update_attributes({ :title => 'zomg' }).should be_true
+        end
+        Dummy.disable_caching = false
       end
 
       it "should show errors if response is not succesful" do
@@ -222,5 +229,5 @@ describe Amfetamine::Base do
     end
 
   end
-      
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amfetamine
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -333,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 764523330913255459
+      hash: 2740467481176466622
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -342,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 764523330913255459
+      hash: 2740467481176466622
 requirements: []
 rubyforge_project: amfetamine
 rubygems_version: 1.8.24