restfully 0.7.1.rc1 → 0.7.1.rc2

data/lib/restfully/http/response.rb

@@ -63,6 +63,10 @@ module Restfully
         )          
       end
       
+      def inspect
+        "#{code}, head=#{head.inspect}, body=#{body.inspect}"
+      end
+      
     end
   end
 end

data/lib/restfully/media_type/application_vnd_bonfire_xml.rb

@@ -135,7 +135,12 @@ module Restfully
             when Restfully::Resource
               dump_object({"href" => object.uri.to_s}, parent)
             when Hash
-              if object.has_key?("href")
+              object.stringify_keys!
+              if object.has_key?("href") || (
+                # or object.keys == ["name"] && parent.parent &&
+                # parent.parent.parent
+                ["save_as"].include?(parent.name)
+              )
                 # only attributes
                 object.each{|kattr,vattr|
                   parent.attributes[kattr.to_s] = vattr
@@ -149,9 +154,13 @@ module Restfully
                 end
               end
             when Array
+              i = 0
+              parent['id'] = i.to_s
               dump_object(object[0], parent)
               object[1..-1].each{|item|
+                i+=1
                 node = XML::Node.new(parent.name)
+                node['id'] = i.to_s
                 dump_object(item, node)
                 parent.parent << node
               }
@@ -178,7 +187,7 @@ module Restfully
       end
 
       def represents?(id)
-        property("id") == id.to_s || property("name") == id.to_s
+        property("id") == id.to_s || property("name") == id.to_s || links.find{|l| l.self? && l.href.to_s.split("/").last == id.to_s}
       end
       
       def complete?

data/lib/restfully/session.rb

@@ -119,14 +119,18 @@ module Restfully
       code, head, body = resource.send(request.method, request.body || {})
 
       response = Restfully::HTTP::Response.new(self, code, head, body)
+      logger.debug response.inspect
+      response
     end
 
     # Process a Restfully::HTTP::Response.
     def process(response, request)
       case code=response.code
       when 200
+        logger.debug "Building response..."
         Resource.new(self, response, request).build
       when 201,202
+        logger.debug "Following redirection to: #{response.head['Location'].inspect}"
         get response.head['Location'], :head => request.head
       when 204
         true

data/lib/restfully/version.rb

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

data/spec/restfully/collection_spec.rb

@@ -38,7 +38,6 @@ describe Restfully::Collection do
     items = []
     @resource.load.each{|i| items << i}
     items.all?{|i| i.kind_of?(Restfully::Resource)}.should be_true
-    pp items
     items[0].relationships.map(&:to_s).sort.should == ["parent", "self"]
     items[0]['uid'].should == 376505
   end

data/spec/restfully/media_type/application_vnd_bonfire_xml_spec.rb

@@ -154,7 +154,21 @@ describe Restfully::MediaType::ApplicationVndBonfireXml do
         @expected_compute_hash,
         :serialization => {"__type__" => "compute"}
       )
-      serialized.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<compute xmlns=\"http://api.bonfire-project.eu/doc/schemas/occi\">\n  <startup href=\"file:///path/to/startup-script/sh\"/>\n  <name>Compute name</name>\n  <instance_type>small</instance_type>\n  <link href=\"/locations/fr-inria\" rel=\"location\" type=\"application/vnd.bonfire+xml\"/>\n  <link href=\"/locations/uk-epcc/computes/1\" rel=\"self\"/>\n  <context>\n    <bonfire_credentials>crohr:p4ssw0rd</bonfire_credentials>\n    <monitoring_ip>123.123.123.2</monitoring_ip>\n  </context>\n  <nic>\n    <device>eth0</device>\n    <mac>AA:AA:AA:AA</mac>\n    <network href=\"/locations/fr-inria/networks/1\"/>\n    <ip>123.123.123.123</ip>\n  </nic>\n  <nic>\n    <device>eth1</device>\n    <mac>BB:BB:BB:BB</mac>\n    <network href=\"/locations/fr-inria/networks/2\"/>\n    <ip>123.123.124.2</ip>\n  </nic>\n  <description>Compute description</description>\n  <disk>\n    <type>OS</type>\n    <storage href=\"/locations/fr-inria/storages/1\"/>\n    <target>sda</target>\n  </disk>\n  <disk>\n    <type>CDROM</type>\n    <storage href=\"/locations/fr-inria/storages/2\"/>\n    <target>sdc</target>\n  </disk>\n  <state>ACTIVE</state>\n</compute>\n"
+      serialized.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<compute xmlns=\"http://api.bonfire-project.eu/doc/schemas/occi\">\n  <startup href=\"file:///path/to/startup-script/sh\"/>\n  <name>Compute name</name>\n  <instance_type>small</instance_type>\n  <link id=\"0\" href=\"/locations/fr-inria\" rel=\"location\" type=\"application/vnd.bonfire+xml\"/>\n  <link id=\"1\" href=\"/locations/uk-epcc/computes/1\" rel=\"self\"/>\n  <context>\n    <bonfire_credentials>crohr:p4ssw0rd</bonfire_credentials>\n    <monitoring_ip>123.123.123.2</monitoring_ip>\n  </context>\n  <nic id=\"0\">\n    <device>eth0</device>\n    <mac>AA:AA:AA:AA</mac>\n    <network href=\"/locations/fr-inria/networks/1\"/>\n    <ip>123.123.123.123</ip>\n  </nic>\n  <nic id=\"1\">\n    <device>eth1</device>\n    <mac>BB:BB:BB:BB</mac>\n    <network href=\"/locations/fr-inria/networks/2\"/>\n    <ip>123.123.124.2</ip>\n  </nic>\n  <description>Compute description</description>\n  <disk id=\"0\">\n    <type>OS</type>\n    <storage href=\"/locations/fr-inria/storages/1\"/>\n    <target>sda</target>\n  </disk>\n  <disk id=\"1\">\n    <type>CDROM</type>\n    <storage href=\"/locations/fr-inria/storages/2\"/>\n    <target>sdc</target>\n  </disk>\n  <state>ACTIVE</state>\n</compute>\n"
+    end
+    
+    it "should correctly deal with SAVE_AS elements" do
+      serialized = Restfully::MediaType::ApplicationVndBonfireXml.serialize(
+        {
+          :name => "whatever", 
+          :disk => [{
+            :storage => {"href" => "/somewhere"}, 
+            :save_as => {:name => "name of storage"}
+          }]
+        },
+        :serialization => {"__type__" => "compute"}
+      )
+      serialized.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<compute xmlns=\"http://api.bonfire-project.eu/doc/schemas/occi\">\n  <name>whatever</name>\n  <disk id=\"0\">\n    <save_as name=\"name of storage\"/>\n    <storage href=\"/somewhere\"/>\n  </disk>\n</compute>\n"
     end
   end
 end

metadata

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