restfully 0.8.6 → 0.8.7

data/bin/restfully

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 # The command line Restfully client
 
-lib_dir = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include? lib_dir
-
 require 'restfully'
 require 'optparse'
 require 'logger'
@@ -71,10 +68,8 @@ if given_uri = ARGV.shift
   @options["uri"] = given_uri
 end
 
-@session = Restfully::Session.new(@options)
-
 def session
-  @session
+  @session ||= Restfully::Session.new(@options)
 end
 
 def root 
@@ -93,32 +88,36 @@ HOME = ENV['HOME'] || ENV['HOMEPATH']
 IRB.conf[:SAVE_HISTORY] = 100
 IRB.conf[:HISTORY_FILE] = "#{HOME}/.irb-save-history"
 
-module Readline
-  module History
-    LOG = "#{HOME}/.irb-history"
-
-    def self.write_log(line)
-      File.open(LOG, 'ab') {|f| 
-        f << "#{line}\n"
-      }
-    end
+# Raises an error on Windows, so disabling it.
+if RUBY_PLATFORM !~ /(win|w)32$/
+  module Readline
+    module History
+      LOG = "#{HOME}/.irb-history"
+
+      def self.write_log(line)
+        File.open(LOG, 'ab') {|f| 
+          f << "#{line}\n"
+        }
+      end
     
-    def self.start_session_log
-      write_log("\n")
+      def self.start_session_log
+        write_log("\n")
+      end
     end
-  end
 
-  alias :old_readline :readline
-  def readline(*args)
-    ln = old_readline(*args)
-    begin
-      History.write_log(ln)
-    rescue
+    alias :old_readline :readline
+    def readline(*args)
+      ln = old_readline(*args)
+      begin
+        History.write_log(ln)
+      rescue
+      end
+      ln
     end
-    ln
   end
+  Readline::History.start_session_log
 end
-Readline::History.start_session_log
+
 ARGV.clear
 ARGV.concat [ "--readline", "--prompt-mode", "simple" ]
 IRB.start

data/lib/restfully/resource.rb

@@ -198,9 +198,8 @@ module Restfully
 
     # Build the resource after loading.
     def build
-      metaclass = class << self; self; end
       extend Collection if collection?
-        
+      metaclass = class << self; self; end
       response.links.each do |link|
         metaclass.send(:define_method, link.id.to_sym) do |*args|
           session.get(link.href, :head => {

data/lib/restfully/version.rb

@@ -1,3 +1,3 @@
 module Restfully
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/spec/restfully/media_type/application_vnd_bonfire_xml_spec.rb

@@ -154,7 +154,7 @@ 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 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"
+      serialized.split("\n").sort.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<compute xmlns=\"http://api.bonfire-project.eu/doc/schemas/occi\">\n  <name>Compute name</name>\n  <startup href=\"file:///path/to/startup-script/sh\"/>\n  <instance_type>small</instance_type>\n  <description>Compute description</description>\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  <context>\n    <bonfire_credentials>crohr:p4ssw0rd</bonfire_credentials>\n    <monitoring_ip>123.123.123.2</monitoring_ip>\n  </context>\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  <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".split("\n").sort
     end
     
     it "should correctly deal with XML::Node elements" do
@@ -163,7 +163,7 @@ describe Restfully::MediaType::ApplicationVndBonfireXml do
           'metrics' => XML::Node.new_cdata('<metric>hello,world</metric>')
         }
       }, :serialization => {"__type__" => "compute"})
-      serialized.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<compute xmlns=\"http://api.bonfire-project.eu/doc/schemas/occi\">\n  <context>\n    <metrics><![CDATA[<metric>hello,world</metric>]]></metrics>\n  </context>\n</compute>\n"
+      serialized.split("\n").sort.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<compute xmlns=\"http://api.bonfire-project.eu/doc/schemas/occi\">\n  <context>\n    <metrics><![CDATA[<metric>hello,world</metric>]]></metrics>\n  </context>\n</compute>\n".split("\n").sort
     end
     
     it "should correctly deal with SAVE_AS elements" do
@@ -171,13 +171,13 @@ describe Restfully::MediaType::ApplicationVndBonfireXml do
         {
           :name => "whatever", 
           :disk => [{
-            :storage => {"href" => "/somewhere"}, 
-            :save_as => {:name => "name of storage"}
+            :save_as => {:name => "name of storage"},
+            :storage => {"href" => "/somewhere"}
           }]
         },
         :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"
+      serialized.split("\n").sort.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".split("\n").sort
     end
   end
 end

metadata

@@ -1,191 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: restfully
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 0.8.7
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 6
-  version: 0.8.6
 platform: ruby
-authors: 
+authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-28 00:00:00 +02:00
+date: 2011-07-28 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153574600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153574600
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2153574140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client-components
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153574140
+- !ruby/object:Gem::Dependency
+  name: rest-client-components
+  requirement: &2153573760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-cache
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153573760
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: &2153573300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: backports
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153573300
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: &2153572880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153572880
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &2153572460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153572460
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153571960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2153571960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153603940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2153603940
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2153603560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2153603560
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &2153603100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: autotest-growl
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2153603100
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: &2153602680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *2153602680
 description: Consume RESTful APIs effortlessly
-email: 
+email:
 - cyril.rohr@gmail.com
-executables: 
+executables:
 - restfully
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - bin/restfully
 - lib/restfully/collection.rb
 - lib/restfully/error.rb
@@ -236,40 +193,30 @@ files:
 has_rdoc: true
 homepage: http://github.com/crohr/restfully
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 31
-      segments: 
-      - 1
-      - 8
-      version: "1.8"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.8'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 9
-      segments: 
-      - 1
-      - 3
-      version: "1.3"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.3'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Consume RESTful APIs effortlessly
-test_files: 
+test_files:
 - spec/fixtures/bonfire-collection-with-fragments.xml
 - spec/fixtures/bonfire-compute-existing.xml
 - spec/fixtures/bonfire-empty-collection.xml