restfully 0.7.1.pre → 0.7.1.rc1

data/lib/restfully/collection.rb

@@ -68,6 +68,12 @@ module Restfully
       total == 0
     end
     
+    # Expand the items that 
+    def expand
+      each {|i| i.expand}
+      self
+    end
+    
     def inspect
       map{|item| item}.inspect
     end

data/lib/restfully/http/request.rb

@@ -50,11 +50,7 @@ module Restfully
       end
       
       def inspect
-        [
-          "#{method.to_s.upcase} #{uri.to_s}",
-          head.map{|(k,v)| "#{k}: #{v}"}.join("\n"),
-          body
-        ].compact.join("\n")
+        "#{method.to_s.upcase} #{uri.to_s}, head=#{head.inspect}, body=#{body.inspect}"
       end
       
       def no_cache?

data/lib/restfully/resource.rb

@@ -36,6 +36,10 @@ module Restfully
     def media_type
       response.media_type
     end
+    
+    def complete?
+      media_type.complete?
+    end
 
     def collection?
       media_type.collection?
@@ -185,6 +189,10 @@ module Restfully
       # end
       self
     end
+    
+    def expand
+      reload_if_empty(self)
+    end
 
     protected
     def extract_payload_from_args(args)
@@ -205,7 +213,7 @@ module Restfully
     end
     
     def reload_if_empty(resource)
-      resource.reload if resource && !resource.media_type.complete?
+      resource.reload if resource && !resource.complete?
       resource
     end
   end

data/lib/restfully/version.rb

@@ -1,3 +1,3 @@
 module Restfully
-  VERSION = "0.7.1.pre"
+  VERSION = "0.7.1.rc1"
 end

data/spec/fixtures/bonfire-location-collection.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<collection xmlns="http://api.bonfire-project.eu/doc/schemas/occi" href="/locations">
+  <items offset="0" total="5">
+<location href="/locations/be-ibbt">
+  <name>be-ibbt</name>
+  <url>https://bonfire.test.atlantis.ugent.be</url>
+  <link rel="parent" href="/" type="application/vnd.bonfire+xml"/>
+  <link rel="computes" href="/locations/be-ibbt/computes" type="application/vnd.bonfire+xml"/>
+  <link rel="networks" href="/locations/be-ibbt/networks" type="application/vnd.bonfire+xml"/>
+  <link rel="storages" href="/locations/be-ibbt/storages" type="application/vnd.bonfire+xml"/>
+</location>
+<location href="/locations/de-hlrs">
+  <name>de-hlrs</name>
+  <url>https://nebulosus.hlrs.de:8443</url>
+  <link rel="parent" href="/" type="application/vnd.bonfire+xml"/>
+  <link rel="computes" href="/locations/de-hlrs/computes" type="application/vnd.bonfire+xml"/>
+  <link rel="networks" href="/locations/de-hlrs/networks" type="application/vnd.bonfire+xml"/>
+  <link rel="storages" href="/locations/de-hlrs/storages" type="application/vnd.bonfire+xml"/>
+</location>
+<location href="/locations/fr-inria">
+  <name>fr-inria</name>
+  <url>https://bonfire.grid5000.fr:443</url>
+  <link rel="parent" href="/" type="application/vnd.bonfire+xml"/>
+  <link rel="computes" href="/locations/fr-inria/computes" type="application/vnd.bonfire+xml"/>
+  <link rel="networks" href="/locations/fr-inria/networks" type="application/vnd.bonfire+xml"/>
+  <link rel="storages" href="/locations/fr-inria/storages" type="application/vnd.bonfire+xml"/>
+</location>
+<location href="/locations/uk-epcc">
+  <name>uk-epcc</name>
+  <url>https://crockett.epcc.ed.ac.uk:8443</url>
+  <link rel="parent" href="/" type="application/vnd.bonfire+xml"/>
+  <link rel="computes" href="/locations/uk-epcc/computes" type="application/vnd.bonfire+xml"/>
+  <link rel="networks" href="/locations/uk-epcc/networks" type="application/vnd.bonfire+xml"/>
+  <link rel="storages" href="/locations/uk-epcc/storages" type="application/vnd.bonfire+xml"/>
+</location>
+<location href="/locations/uk-hplabs">
+  <name>uk-hplabs</name>
+  <url>https://occisvr-vif0.occi.ext8.bonfire.hpl.hp.com:8443</url>
+  <link rel="parent" href="/" type="application/vnd.bonfire+xml"/>
+  <link rel="computes" href="/locations/uk-hplabs/computes" type="application/vnd.bonfire+xml"/>
+  <link rel="networks" href="/locations/uk-hplabs/networks" type="application/vnd.bonfire+xml"/>
+  <link rel="storages" href="/locations/uk-hplabs/storages" type="application/vnd.bonfire+xml"/>
+</location>
+  </items>
+  <link href="/" rel="parent" type="application/vnd.bonfire+xml"/>
+</collection>

data/spec/restfully/collection_spec.rb

@@ -43,6 +43,21 @@ describe Restfully::Collection do
     items[0]['uid'].should == 376505
   end
   
+  it "should expand the items" do
+    @response = Restfully::HTTP::Response.new(
+      @session, 200, {
+        'Content-Type' => 'application/vnd.bonfire+xml; charset=utf-8'
+      }, fixture('bonfire-collection-with-fragments.xml')
+    )
+    @resource = Restfully::Resource.new(@session, @response, @request).load
+    @resource.all?{|i| i.complete?}.should be_false
+    stub_request(:get, "https://api.grid5000.fr/locations/de-hlrs/networks/29").
+      with(:headers => {'Accept'=>'application/vnd.bonfire+xml', 'Accept-Encoding'=>'gzip, deflate', 'Cache-Control'=>'no-cache'}).
+      to_return(:status => 200, :body => fixture("bonfire-network-existing.xml"), :headers => {'Content-Type' => 'application/vnd.bonfire+xml'})
+    @resource.expand
+    @resource.all?{|i| i.complete?}.should be_true
+  end
+  
   it "should be empty if no item" do
     @response = Restfully::HTTP::Response.new(
       @session, 200, {

data/spec/restfully/resource_spec.rb

@@ -17,7 +17,7 @@ describe Restfully::Resource do
     )
     Restfully::MediaType.register Restfully::MediaType::Grid5000
   end
-  
+
   it "should correctly initialize a resource" do
     resource = Restfully::Resource.new(@session, @response, @request)
     resource.uri.to_s.should == "https://api.grid5000.fr/grid5000/sites/rennes"
@@ -29,13 +29,13 @@ describe Restfully::Resource do
       resource.should respond_to(rel.to_sym)
     end
   end
-  
+
   describe "loaded" do
     before do
       @resource = Restfully::Resource.new(@session, @response, @request)
       @resource.load
     end
-    
+
     it "should load the requested association" do
       @session.should_receive(:get).once.with(
         URI.parse("/grid5000/sites/rennes/clusters"),
@@ -44,7 +44,7 @@ describe Restfully::Resource do
       association.should_receive(:load)
       @resource.clusters
     end
-    
+
     it "should not allow to submit if POST not allowed on the resource" do
       lambda{
         @resource.submit
@@ -60,7 +60,7 @@ describe Restfully::Resource do
         :serialization => {}
       )
       @resource.submit(
-        'some payload', 
+        'some payload',
         :headers => {'Content-Type' => 'text/plain'},
         :query => {:k1 => 'v1'}
       )
@@ -75,7 +75,7 @@ describe Restfully::Resource do
         :serialization => {}
       )
       @resource.submit(
-        :key => 'value', 
+        :key => 'value',
         :headers => {'Content-Type' => 'text/plain'},
         :query => {:k1 => 'v1'}
       )
@@ -102,26 +102,26 @@ describe Restfully::Resource do
         :serialization => {"__type__"=>"network"}
       )
       @resource.update(
-        :key => 'value', 
+        :key => 'value',
         :headers => {'Content-Type' => 'text/plain'},
         :query => {:k1 => 'v1'}
       )
     end
-    
+
     it "should reload the resource" do
       @request.should_receive(:no_cache!)
       @resource.should_receive(:load).
         and_return(@resource)
       @resource.reload.should == @resource
     end
-    
+
     it "should reload the resource even after having reloaded it once before" do
       @session.should_receive(:execute).twice.with(@request).
         and_return(@response)
       @resource.reload
       @resource.reload
     end
-    
+
     it "should raise an error if it cannot reload the resource" do
       @session.should_receive(:execute).with(@request).
         and_return(res=mock(Restfully::HTTP::Response))
@@ -132,7 +132,38 @@ describe Restfully::Resource do
       }.should raise_error(Restfully::Error, "Cannot reload the resource")
     end
   end
-  
-  
-  
+
+  describe "integration tests" do
+
+    it "should not interfere with another previously loaded resource" do
+      Restfully::MediaType.register Restfully::MediaType::ApplicationVndBonfireXml
+      @session = Restfully::Session.new(
+        :uri => "http://localhost:8000"
+      )
+      @request = Restfully::HTTP::Request.new(
+        @session, :get, "/locations",
+        :head => {'Accept' => 'application/vnd.bonfire+xml'}
+      )
+      @response = Restfully::HTTP::Response.new(
+        @session, 200, {
+          'Content-Type' => 'application/vnd.bonfire+xml; charset=utf-8',
+          'Allow' => 'GET'
+        }, fixture('bonfire-location-collection.xml')
+      )
+
+      resource = Restfully::Resource.new(@session, @response, @request).load
+      resource1 = resource[:'uk-epcc']
+      resource2 = resource[:'fr-inria']
+      stub_request(:get, "http://localhost:8000/locations/uk-epcc/networks").
+               with(:headers => {'Accept'=>'application/vnd.bonfire+xml', 'Accept-Encoding'=>'gzip, deflate'}).
+               to_return(:status => 200, :body => fixture("bonfire-network-collection.xml"), :headers => {'Content-Type' => 'application/vnd.bonfire+xml'})
+      stub_request(:get, "http://localhost:8000/locations/fr-inria/networks").
+               with(:headers => {'Accept'=>'application/vnd.bonfire+xml', 'Accept-Encoding'=>'gzip, deflate'}).
+               to_return(:status => 200, :body => fixture("bonfire-network-collection.xml"), :headers => {'Content-Type' => 'application/vnd.bonfire+xml'})
+      resource1.networks
+      resource2.networks
+    end
+
+  end # describe "integration tests"
+
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  hash: 961916024
+  hash: 15424111
   prerelease: 6
   segments: 
   - 0
   - 7
   - 1
-  - pre
-  version: 0.7.1.pre
+  - rc
+  - 1
+  version: 0.7.1.rc1
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +02:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -214,6 +215,7 @@ files:
 - spec/fixtures/bonfire-empty-collection.xml
 - spec/fixtures/bonfire-experiment-collection.xml
 - spec/fixtures/bonfire-experiment.xml
+- spec/fixtures/bonfire-location-collection.xml
 - spec/fixtures/bonfire-network-collection.xml
 - spec/fixtures/bonfire-network-existing.xml
 - spec/fixtures/bonfire-root.xml
@@ -274,6 +276,7 @@ test_files:
 - spec/fixtures/bonfire-empty-collection.xml
 - spec/fixtures/bonfire-experiment-collection.xml
 - spec/fixtures/bonfire-experiment.xml
+- spec/fixtures/bonfire-location-collection.xml
 - spec/fixtures/bonfire-network-collection.xml
 - spec/fixtures/bonfire-network-existing.xml
 - spec/fixtures/bonfire-root.xml