ruby-satisfaction 0.1.0 → 0.2.0

data/lib/satisfaction.rb

@@ -58,9 +58,15 @@ class Satisfaction
   end
   
   def me
-    @me ||= Me.new('me', self)
-    @me.load
-    @me
+    me = satisfaction.identity_map.get_record(Me, 'me') do
+      Me.new('me', satisfaction)
+    end
+    
+    if me.loaded?
+      me
+    else
+      me.load 
+    end
   end
   
   def autoload?
@@ -68,15 +74,18 @@ class Satisfaction
   end
   
   def set_basic_auth(user, password)
+    identity_map.expire_record(Me, 'me')
     @user = user
     @password = password
   end
   
   def set_consumer(key, secret)
+    identity_map.expire_record(Me, 'me')
     @consumer = OAuth::Consumer.new(key, secret)
   end
   
   def set_token(token, secret)
+    identity_map.expire_record(Me, 'me')
     @token = OAuth::Token.new(token, secret)
   end
   

data/lib/satisfaction/identity_map.rb

@@ -14,4 +14,8 @@ class Satisfaction::IdentityMap
     end
     result
   end
+  
+  def expire_record(klass, id)
+    @records[[klass, id]] = nil
+  end
 end

data/lib/satisfaction/loader.rb

@@ -12,6 +12,10 @@ class Satisfaction::Loader
   
   def initialize(options={})
     @options = options.reverse_merge({:cache => :hash})
+    reset_cache
+  end
+  
+  def reset_cache
     @cache =  case @options[:cache]
               when :hash then HashCache.new
               when :memcache then MemcacheCache.new(@options[:memcache] || {})
@@ -35,14 +39,20 @@ class Satisfaction::Loader
     
     case response
     when Net::HTTPNotModified
-      return cache_record.body
+      return [:ok, cache_record.body]
     when Net::HTTPSuccess
       cache.put(uri, response)
-      response.body
+      [:ok, response.body]
     when Net::HTTPMovedPermanently
       limit = options[:redirect_limit] || 3
       raise ArgumentError, "Too many redirects" unless limit > 0 #TODO: what is a better error here?
       get(response['location'], options.merge(:redirect_limit => limit - 1))
+    when Net::HTTPBadRequest
+      [:bad_request, response.body]
+    when Net::HTTPForbidden
+      [:forbidden, response.body]
+    when Net::HTTPUnauthorized
+      [:unauthorized, response.body]
     else
       raise "Explode: #{response.to_yaml}"
     end

data/lib/satisfaction/person.rb

@@ -14,12 +14,11 @@ end
 
 class Me < Person  
   def path
-    "/me"
+    loaded? ? super : "/me"
   end
   
-  def load
-    result = satisfaction.get("#{path}.json")    
-    self.attributes = JSON.parse(result)
-    self
+  def was_loaded(result)
+    @id = self.attributes["id"]
+    setup_associations
   end
 end

data/lib/satisfaction/resource.rb

@@ -19,16 +19,25 @@ class Resource < Satisfaction::HasSatisfaction
   end
   
   def load
-    result = satisfaction.get("#{path}.json")    
-    self.attributes = JSON.parse(result)
-    self
+    result = satisfaction.get("#{path}.json")
+    
+    if result.first == :ok
+      self.attributes = JSON.parse(result.last)
+      was_loaded(result.last)
+      self
+    else
+      result
+    end
+  end
+  
+  def was_loaded(result)
+    #override this to augment post-loading behavior
   end
   
   def delete
     satisfaction.delete("#{path}.json")
   end
   
-  
   def put(attrs)
     params = requestify(attrs, self.class.name.underscore)
     result = satisfaction.put("#{path}.json", params)
@@ -175,16 +184,21 @@ class Page < Satisfaction::HasSatisfaction
   
   def load(force=false)
     return @data if loaded? && !force
+        
+    result = satisfaction.get("#{@path}.json", @options.merge(:page => @page))
     
-    results = satisfaction.get("#{@path}.json", @options.merge(:page => @page))
-    json = JSON.parse(results)
-    @total = json["total"]
+    if result.first == :ok
+      json = JSON.parse(result.last)
+      @total = json["total"]
     
-    @data = json["data"].map do |result|
-      obj = @klass.decode_sfn(result, satisfaction)
-      satisfaction.identity_map.get_record(@klass, obj.id) do
-        obj
+      @data = json["data"].map do |result|
+        obj = @klass.decode_sfn(result, satisfaction)
+        satisfaction.identity_map.get_record(@klass, obj.id) do
+          obj
+        end
       end
+    else
+      result
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-satisfaction
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Scott Fleckenstein
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-09 00:00:00 -07:00
+date: 2008-04-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency