amfetamine 0.2.5 → 0.2.6

data/lib/amfetamine/base.rb

@@ -24,6 +24,7 @@ module Amfetamine
 
 
     attr_reader :attributes
+    attr_accessor :cache_key
 
     def id=(val)
       @attributes['id'] = val
@@ -98,6 +99,7 @@ module Amfetamine
     def initialize(args={})
       super
       @attributes = {}
+      self.cache_key = self.class.recent_cache_key # Shows how this object was retrieved from cache
       args.each { |k,v| self.send("#{k}=", v) }
       @notsaved = true
       self
@@ -129,11 +131,9 @@ module Amfetamine
       persisted? ? id.to_s : nil
     end
 
-    # Checks if object is cached
-    # TODO this is not very efficient, but dalli doesn't provide a polling function :(
+    # Checks if object is cached by checking if a SINGULAR request was made to this object.
     def cached?
-      keys = belongs_to_relationships.collect { |r| r.singular_path } << self.singular_path
-      keys.any? { |k| cache.get(k) }
+      self.cache_key ? cache.get(self.cache_key).present? : false
     end
 
     # Checks if object is cachable

data/lib/amfetamine/exceptions.rb

@@ -4,6 +4,7 @@ module Amfetamine
   class UnknownRESTMethod < Exception; end; # Only used if rest method is not handled by amfetamine
   class RecordNotFound < Exception; end;
   class InvalidCacheData < Exception; end;
+  class RemoteConnectionError < Exception; end; # Raised when response handling fails
   #class MatcherNotImplemented < Exception; end;
   class ExternalConnectionsNotAllowed < Exception; end; # Used for test helpers if connection is not allowed and attempt is made to connect
 end

data/lib/amfetamine/query_methods.rb

@@ -10,12 +10,16 @@ module Amfetamine
     end
 
     module ClassMethods
+      def recent_cache_key
+        @recent_cache_key
+      end
+
       def find(id, opts={})
         begin
           key = opts[:nested_path] || self.find_path(id)
           data = get_data(key, opts[:conditions])
           if data[:status] == :success
-            build_object(data[:body]) 
+            val = build_object(data[:body]) 
           else
             nil
           end
@@ -31,7 +35,7 @@ module Amfetamine
           data = get_data(key, opts[:conditions])
 
           if data[:status] == :success
-            data[:body].compact.map { |d| build_object(d) }
+            vals = data[:body].compact.map { |d| build_object(d) }
           else
             []
           end
@@ -61,15 +65,15 @@ module Amfetamine
       def get_data(key, conditions=nil, method=:get)
         if cacheable?
           if conditions
-            cache_key = key + conditions.to_query
+            @recent_cache_key = key + conditions.to_query
             cache_conditions(key, conditions)
           else
-            cache_key = key
+            @recent_cache_key = key
           end
 
-          Amfetamine.logger.info "Fetching object from cache: #{cache_key}"
-          cache.fetch(cache_key) do
-            Amfetamine.logger.info "Miss! #{cache_key}"
+          Amfetamine.logger.info "Fetching object from cache: #{@recent_cache_key}"
+          cache.fetch(@recent_cache_key) do
+            Amfetamine.logger.info "Miss! #{@recent_cache_key}"
             handle_request(method, key, { :query => conditions } )
           end
         else
@@ -105,12 +109,19 @@ module Amfetamine
                    end
 
         if handle_response(response)
+
           begin
             update_attributes_from_response(response[:body])
           ensure
             clean_cache!
           end
-          cache.set(singular_path, self.to_cacheable) if cacheable?
+
+          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?
+        else
+          false
         end
       end
     end

data/lib/amfetamine/rest_helpers.rb

@@ -22,15 +22,19 @@ module Amfetamine
     # TODO: Needs refactoring, now just want to make the test pass =)
     # Making assumption here that when response is nil, it should have possitive result. Needs refactor when slept more
     def handle_response(response)
-      if response[:status] == :success || response[:status] == :created
+      case response[:status]
+      when :success, :created
         self.instance_variable_set('@notsaved', false)
         true
-      elsif response[:status] == :errors
+      when :errors
         Amfetamine.logger.warn "Errors from response\n #{response[:body]}"
         response[:body].each do |attr, mesg|
           errors.add(attr.to_sym, mesg )
         end
         false
+      when :server_error
+        Amfetamine.logger.warn "Something went wrong at the remote end."
+        false
       end
     end
 

data/lib/amfetamine/version.rb

@@ -1,3 +1,3 @@
 module Amfetamine
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/amfetamine/base_spec.rb

@@ -36,10 +36,12 @@ describe Amfetamine::Base do
     context "#find" do
       it "should find dummy" do
         dummy.instance_variable_set('@notsaved', false)
-        stub_single_response(dummy) do
-          Dummy.find(dummy.id).should == dummy
+        Dummy.prevent_external_connections! do |r|
+          r.get { dummy }
+          response = Dummy.find(dummy.id)
+          response.should == dummy
+          response.should be_cached
         end
-        dummy.should be_cached
       end
       
       it "should return nil if object not found" do
@@ -84,6 +86,7 @@ describe Amfetamine::Base do
         end
         new_dummy.should be_a(Dummy)
         new_dummy.should_not be_new
+        puts new_dummy.cache_key
         new_dummy.should be_cached
       end
 
@@ -104,12 +107,14 @@ describe Amfetamine::Base do
       end
 
       it "should update if response is succesful" do
-        stub_update_response do
+        Dummy.prevent_external_connections! do |allowed|
+          allowed.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 show errors if response is not succesful" do

data/spec/amfetamine/relationships_spec.rb

@@ -90,6 +90,7 @@ describe Amfetamine::Relationships do
       stub_post_response(child) do
         new_child = dummy.create_child
       end
+      puts new_child.inspect
 
       new_child.should_not be_new
       new_child.should be_cached

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amfetamine
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103214207640 !ruby/object:Gem::Requirement
+  requirement: &70274617798920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214207640
+  version_requirements: *70274617798920
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70103214207220 !ruby/object:Gem::Requirement
+  requirement: &70274617798500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214207220
+  version_requirements: *70274617798500
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70103214206780 !ruby/object:Gem::Requirement
+  requirement: &70274617798080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214206780
+  version_requirements: *70274617798080
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70103214206320 !ruby/object:Gem::Requirement
+  requirement: &70274617797660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214206320
+  version_requirements: *70274617797660
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70103214205900 !ruby/object:Gem::Requirement
+  requirement: &70274617797220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214205900
+  version_requirements: *70274617797220
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70103214205480 !ruby/object:Gem::Requirement
+  requirement: &70274617796780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214205480
+  version_requirements: *70274617796780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70103214205060 !ruby/object:Gem::Requirement
+  requirement: &70274617796360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214205060
+  version_requirements: *70274617796360
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &70103214204620 !ruby/object:Gem::Requirement
+  requirement: &70274617795940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103214204620
+  version_requirements: *70274617795940
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70103214204180 !ruby/object:Gem::Requirement
+  requirement: &70274617795480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103214204180
+  version_requirements: *70274617795480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70103214203760 !ruby/object:Gem::Requirement
+  requirement: &70274617795040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103214203760
+  version_requirements: *70274617795040
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70103214203340 !ruby/object:Gem::Requirement
+  requirement: &70274617794500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103214203340
+  version_requirements: *70274617794500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70103214233620 !ruby/object:Gem::Requirement
+  requirement: &70274617793960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103214233620
+  version_requirements: *70274617793960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70103214233200 !ruby/object:Gem::Requirement
+  requirement: &70274617825920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103214233200
+  version_requirements: *70274617825920
 description: Wraps REST to objects, provides caching and makes your app go Bzzz!
 email:
 - timon@exvo.com