restfully 0.7.1.rc2 → 0.7.1.rc3

data/lib/restfully/collection.rb

@@ -16,13 +16,15 @@ module Restfully
     end
     
     def find_by_uid(symbol)
-      find{ |i| reload_if_empty(i).media_type.represents?(symbol) }
+      found = find{ |i| i.media_type.represents?(symbol) }
+      found.expand unless found.nil?
+      found
     end
     
     def find_by_index(index)
       index = index+length if index < 0
       each_with_index{|item, i|
-        return reload_if_empty(item) if i == index
+        return item.expand if i == index
       }
       nil
     end

data/lib/restfully/resource.rb

@@ -25,8 +25,7 @@ module Restfully
     #   resource["uid"]
     #   => "rennes"
     def [](key)
-      reload_if_empty(self)
-      media_type.property(key)
+      expand.media_type.property(key)
     end
 
     def uri
@@ -93,7 +92,7 @@ module Restfully
     end
 
     def submit(*args)
-      if allow?(:post)
+      if allow?("POST")
         @request.no_cache!
         payload, options = extract_payload_from_args(args)
         session.post(request.uri, payload, options)
@@ -103,7 +102,7 @@ module Restfully
     end
 
     def delete(options = {})
-      if allow?(:delete)
+      if allow?("DELETE")
         @request.no_cache!
         session.delete(request.uri)
       else
@@ -112,7 +111,7 @@ module Restfully
     end
 
     def update(*args)
-      if allow?(:put)
+      if allow?("PUT")
         @request.no_cache!
         payload, options = extract_payload_from_args(args)
         session.put(request.uri, payload, options)
@@ -122,6 +121,7 @@ module Restfully
     end
 
     def allow?(method)
+      reload
       response.allow?(method)
     end
 
@@ -155,6 +155,7 @@ module Restfully
             end
           end
         else
+          expand
           pp.text "PROPERTIES"
           pp.nest 2 do
             properties.each do |key, value|
@@ -191,7 +192,8 @@ module Restfully
     end
     
     def expand
-      reload_if_empty(self)
+      reload unless complete?
+      self
     end
 
     protected
@@ -212,9 +214,5 @@ module Restfully
       [payload, options]
     end
     
-    def reload_if_empty(resource)
-      resource.reload if resource && !resource.complete?
-      resource
-    end
   end
 end

data/lib/restfully/version.rb

@@ -1,3 +1,3 @@
 module Restfully
-  VERSION = "0.7.1.rc2"
+  VERSION = "0.7.1.rc3"
 end

data/spec/restfully/resource_spec.rb

@@ -44,14 +44,23 @@ describe Restfully::Resource do
       association.should_receive(:load)
       @resource.clusters
     end
-
+    {:update => "PUT", :submit => "POST", :delete => "DELETE"}.each do |method, http_method|
+      it "should reload the resource first, to get the Allowed HTTP methods when calling #{method.to_sym}" do
+        @resource.should_receive(:reload).once.and_return(@resource)
+        @response.should_receive(:allow?).with(http_method).and_return(true)
+        @session.should_receive(http_method.downcase.to_sym).
+          and_return(mock(Restfully::HTTP::Response))
+        @resource.send(method.to_sym)
+      end
+    end
     it "should not allow to submit if POST not allowed on the resource" do
+      @resource.should_receive(:reload).and_return(@resource)
       lambda{
         @resource.submit
       }.should raise_error(Restfully::MethodNotAllowed)
     end
     it "should send a POST request if POST is allowed [payload argument]" do
-      @resource.should_receive(:allow?).with(:post).and_return(true)
+      @resource.should_receive(:allow?).with("POST").and_return(true)
       @session.should_receive(:post).with(
         @resource.uri,
         'some payload',
@@ -66,7 +75,7 @@ describe Restfully::Resource do
       )
     end
     it "should send a POST request if POST is allowed [payload as hash]" do
-      @resource.should_receive(:allow?).with(:post).and_return(true)
+      @resource.should_receive(:allow?).with("POST").and_return(true)
       @session.should_receive(:post).with(
         @resource.uri,
         {:key => 'value'},
@@ -93,7 +102,7 @@ describe Restfully::Resource do
         }, fixture('bonfire-network-existing.xml')
       )
       @resource = Restfully::Resource.new(@session, @response, @request).load
-      @resource.should_receive(:allow?).with(:put).and_return(true)
+      @resource.should_receive(:allow?).with("PUT").and_return(true)
       @session.should_receive(:put).with(
         @resource.uri,
         {:key => 'value'},

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  hash: 15424105
+  hash: 15424107
   prerelease: 6
   segments: 
   - 0
   - 7
   - 1
   - rc
-  - 2
-  version: 0.7.1.rc2
+  - 3
+  version: 0.7.1.rc3
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +02:00
+date: 2011-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency