restfully 1.0.0.rc2 → 1.0.0

data/spec/restfully/collection_spec.rb

@@ -9,11 +9,11 @@ describe Restfully::Collection do
     )
     @request = Restfully::HTTP::Request.new(
       @session, :get, "/grid5000/sites/rennes/jobs",
-      :head => {'Accept' => 'application/vnd.grid5000+json'}
+      :head => {'Accept' => 'application/vnd.grid5000.collection+json'}
     )
     @response = Restfully::HTTP::Response.new(
       @session, 200, {
-        'Content-Type' => 'application/vnd.grid5000+json; charset=utf-8',
+        'Content-Type' => 'application/vnd.grid5000.collection+json; charset=utf-8',
         'Allow' => 'GET,POST'
       }, fixture('grid5000-rennes-jobs.json')
     )
@@ -38,6 +38,7 @@ describe Restfully::Collection do
     items = []
     @resource.load.each{|i| items << i}
     items.all?{|i| i.kind_of?(Restfully::Resource)}.should be_true
+    @resource.should be_collection
     items[0].relationships.map(&:to_s).sort.should == ["parent", "self"]
     items[0]['uid'].should == 376505
   end

data/spec/restfully/link_spec.rb

@@ -42,17 +42,15 @@ describe Restfully::Link do
       @media_type = mock(Restfully::MediaType::AbstractMediaType)
     end
     
-    it "should not be valid if there is no type" do
+    it "should be valid even if there is no type" do
       link = Restfully::Link.new(@valid_attributes.merge(:type => ''))
-      link.should_not be_valid
-      link.errors.should == ["type cannot be blank"]
+      link.should be_valid
     end
     
-    it "should not be valid if a media_type cannot be found" do
+    it "should be valid even if a media_type cannot be found" do
       Restfully::MediaType.catalog.clear
       link = Restfully::Link.new(@valid_attributes)
-      link.should_not be_valid
-      link.errors.should == ["cannot find a MediaType for type \"application/json\""]
+      link.should be_valid
     end
     
 

data/spec/restfully/media_type_spec.rb

@@ -31,9 +31,9 @@ describe Restfully::MediaType do
       Restfully::MediaType.find("application/json").should == Restfully::MediaType::ApplicationJson
     end
 
-    it "should find the corresponding media_type [application/vnd.grid5000+json]" do
+    it "should find the corresponding media_type [application/vnd.grid5000.collection+json]" do
       Restfully::MediaType.register Restfully::MediaType::Grid5000
-      Restfully::MediaType.find('application/vnd.grid5000+json; charset=utf-8').should == Restfully::MediaType::Grid5000
+      Restfully::MediaType.find('application/vnd.grid5000.collection+json; charset=utf-8').should == Restfully::MediaType::Grid5000
     end
 
     it "should find the corresponding media_type from the less generic to the most generic [application/json]" do

data/spec/restfully/resource_spec.rb

@@ -11,7 +11,7 @@ describe Restfully::Resource do
     )
     @response = Restfully::HTTP::Response.new(
       @session, 200, {
-        'Content-Type' => 'application/vnd.grid5000+json; charset=utf-8',
+        'Content-Type' => 'application/vnd.grid5000.item+json; charset=utf-8',
         'Allow' => 'GET'
       }, fixture('grid5000-rennes.json')
     )
@@ -41,9 +41,16 @@ describe Restfully::Resource do
         URI.parse("/grid5000/sites/rennes/clusters"),
         :head=>{"Accept"=>"application/vnd.grid5000+json"}
       ).and_return(association=mock(Restfully::Resource))
-      association.should_receive(:load)
       @resource.clusters
     end
+    it "should load the requested association with the additional parameters" do
+      @session.should_receive(:get).once.with(
+        URI.parse("/grid5000/sites/rennes/clusters"),
+        :head=>{"Accept"=>"application/json", 'X-Thing' => 'value'},
+        :query => {"branch" => 'testing'}
+      ).and_return(association=mock(Restfully::Resource))
+      @resource.clusters(:query => {'branch' => "testing"}, :head => {'x-Thing' => 'value', :accept => 'application/json'})
+    end
     {:update => "PUT", :submit => "POST", :delete => "DELETE"}.each do |method, http_method|
       it "should get the Allowed HTTP methods when calling #{method.to_sym}" do
         @response.should_receive(:allow?).with(http_method).and_return(true)
@@ -75,7 +82,7 @@ describe Restfully::Resource do
         'some payload',
         :head => {
           'Content-Type' => 'text/plain',
-          'Origin-Content-Type' => "application/vnd.grid5000+json; charset=utf-8"
+          'Origin-Content-Type' => "application/vnd.grid5000.item+json; charset=utf-8"
         },
         :query => {:k1 => 'v1'},
         :serialization => {}
@@ -93,7 +100,7 @@ describe Restfully::Resource do
         {:key => 'value'},
         :head => {
           'Content-Type' => 'text/plain',
-          'Origin-Content-Type' => "application/vnd.grid5000+json; charset=utf-8"
+          'Origin-Content-Type' => "application/vnd.grid5000.item+json; charset=utf-8"
         },
         :query => {:k1 => 'v1'},
         :serialization => {}

metadata

@@ -1,279 +1,213 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: restfully
-version: !ruby/object:Gem::Version 
-  hash: 15424049
-  prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - rc
-  - 2
-  version: 1.0.0.rc2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-04 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153394980 !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: *2153394980
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2153394520 !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: *2153394520
+- !ruby/object:Gem::Dependency
+  name: rest-client-components
+  requirement: &2153394140 !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: *2153394140
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: &2153380360 !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: *2153380360
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: &2153379940 !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: *2153379940
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &2153379460 !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: ripl
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153379460
+- !ruby/object:Gem::Dependency
+  name: ripl
+  requirement: &2153378800 !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: *id007
-- !ruby/object:Gem::Dependency 
-  name: ripl-multi_line
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2153378800
+- !ruby/object:Gem::Dependency
+  name: ripl-multi_line
+  requirement: &2153378180 !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: *id008
-- !ruby/object:Gem::Dependency 
-  name: ripl-color_streams
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2153378180
+- !ruby/object:Gem::Dependency
+  name: ripl-color_streams
+  requirement: &2153377500 !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: *id009
-- !ruby/object:Gem::Dependency 
-  name: ripl-short_errors
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2153377500
+- !ruby/object:Gem::Dependency
+  name: ripl-short_errors
+  requirement: &2153377080 !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: *id010
-- !ruby/object:Gem::Dependency 
-  name: ripl-play
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2153377080
+- !ruby/object:Gem::Dependency
+  name: ripl-play
+  requirement: &2153376580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rb-readline
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2153376580
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: &2153376160 !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: *id012
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *2153376160
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153375600 !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: *id013
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *2153375600
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153375100 !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: *id014
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *2153375100
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2153374720 !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: *id015
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *2153374720
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &2153374260 !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: *id016
-- !ruby/object:Gem::Dependency 
-  name: autotest-growl
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *2153374260
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: &2153373840 !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: *id017
+  prerelease: false
+  version_requirements: *2153373840
 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/configuration.rb
@@ -325,43 +259,32 @@ files:
 - Rakefile
 - LICENSE
 - README.md
-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
+rubygems_version: 1.8.11
 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