restfully 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/restfully.rb

@@ -14,7 +14,7 @@ require 'restfully/collection'
 
 
 module Restfully
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
   class << self
     attr_accessor :adapter
   end

data/lib/restfully/resource.rb

@@ -76,14 +76,13 @@ module Restfully
     #                  you may pass it so that the GET request is not triggered.
     def load(options = {})
       options = options.symbolize_keys
-      force_reload = !!options.delete(:reload) || stale?
-      if !force_reload && (request = executed_requests['GET']) && request['options'] == options && request['body']
-        self
-      else  
+      force_reload = !!options.delete(:reload)
+      stale! unless (request = executed_requests['GET']) && request['options'] == options && request['body']
+      if stale?
         reset
-        if options[:body]
+        if !force_reload && options[:body]
           body = options[:body]
-          headers = nil
+          headers = {}
         else
           response = session.get(uri, options)
           body = response.body
@@ -98,8 +97,8 @@ module Restfully
           populate_object(key, value)
         end
         @status = :loaded
-        self
       end
+      self
     end
   
     # == Description
@@ -143,6 +142,7 @@ module Restfully
     
     def reload
       current_options = executed_requests['GET']['options'] rescue {}
+      stale!
       self.load(current_options.merge(:reload => true))
     end
     
@@ -232,7 +232,6 @@ module Restfully
         session.logger.warn link.errors.join("\n")
       end
     end
-
     
   end # class Resource
 end # module Restfully

data/restfully.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restfully}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-09}
   s.default_executable = %q{restfully}
   s.description = %q{Experimental code for auto-generation of wrappers on top of RESTful APIs that follow HATEOAS principles and provide OPTIONS methods and/or Allow headers.}
   s.email = %q{cyril.rohr@gmail.com}

data/spec/resource_spec.rb

@@ -21,9 +21,15 @@ describe Resource do
     end
   end
   
+  describe "reloading" do
+    it "should reload the resource" do
+      resource = Resource.new(@uri, mock('session'))
+      resource.should_receive(:load).with(:reload => true)
+      resource.reload
+    end
+  end
   
   describe "loading" do
-  
     before do
       @raw = {
         'links' => [
@@ -69,6 +75,7 @@ describe Resource do
       }
       @response_200 = Restfully::HTTP::Response.new(200, {'Content-Type' => 'application/json;utf-8', 'Content-Length' => @raw.length}, @raw.to_json)
     end
+    
     it "should not be loaded in its initial state" do
       resource = Resource.new(@uri, mock('session'))
       resource.executed_requests.should == {}
@@ -169,6 +176,12 @@ describe Resource do
       resource.load
       resource.links.keys.should =~ ['versions', 'clusters', 'environments', 'status', 'parent', 'version']
     end
+    
+    it "should reload the resource if user forces reload" do
+      resource = Resource.new(@uri, session = mock("session"))
+      session.should_receive(:get).and_return(response = mock("response", :headers => {}, :body => {}))
+      resource.load(:reload => true, :body => mock("body"))
+    end
   end
   
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +01:00
+date: 2009-12-09 00:00:00 +01:00
 default_executable: restfully
 dependencies: 
 - !ruby/object:Gem::Dependency