restfully 0.2.3 → 0.3.0

data/spec/http/error_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/../spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
 describe Restfully::HTTP::Error do
   it "should have a response reader" do
     response = mock("restfully response", :status => 404, :body => {'title' => 'Not Found', 'message' => 'The requested resource cannot be found.', 'code' => 404})

data/spec/http/headers_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/../spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
 describe Restfully::HTTP::Headers do
   class IncludeHeadersModule
     include Restfully::HTTP::Headers

data/spec/http/request_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/../spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
 describe Restfully::HTTP::Request do
 
   it "should correctly initialize the attributes" do

data/spec/http/response_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/../spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
 describe Restfully::HTTP::Response do
 
   it "should correctly initialize the attributes" do

data/spec/http/rest_client_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/../spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/../spec_helper')
 describe Restfully::HTTP::Adapters::RestClientAdapter do
   it "should correctly get the resource corresponding to the request" do
     adapter = Restfully::HTTP::Adapters::RestClientAdapter.new("https://api.grid5000.fr", :username => 'crohr', :password => 'password')

data/spec/link_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
 
 include Restfully
 describe Link do

data/spec/parsing_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
 
 include Restfully::Parsing
 

data/spec/resource_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
 
 include Restfully
 
@@ -29,9 +29,9 @@ describe Resource do
       resource.uri.should == "uri"
     end
     it "should have a reader on the raw property" do
-      resource = Resource.new("uri", session=mock("session"), 'raw' => {})
+      resource = Resource.new("uri", session=mock("session"))
       resource.should_not respond_to(:raw=)
-      resource.raw.should == {}
+      resource.load('raw' => {:a => :b}).raw.should == {:a => :b}
     end
     it "should have a reader on the state property" do
       resource = Resource.new("uri", session=mock("session"))

data/spec/restfully_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
 
 describe Restfully do
   it "should have a default adapter" do

data/spec/session_spec.rb

@@ -1,57 +1,62 @@
-require File.dirname(__FILE__)+'/spec_helper'
+require File.expand_path(File.dirname(__FILE__)+'/spec_helper')
+
+restfully_version = File.read(File.dirname(__FILE__)+'/../VERSION').strip
 
 include Restfully
 describe Session do
   describe "initialization" do
     it "should have a logger reader" do
-      session = Session.new('https://api.grid5000.fr')
+      session = Session.new(:base_uri => 'https://api.grid5000.fr')
       session.should_not respond_to(:logger=)
       session.should respond_to(:logger)
     end
     it "should have a base_uri reader" do
-      session = Session.new('https://api.grid5000.fr')
+      session = Session.new(:base_uri => 'https://api.grid5000.fr')
       session.should_not respond_to(:base_uri=)
       session.base_uri.should == 'https://api.grid5000.fr'
     end
     it "should have a root_path reader that returns the path of the root resource, relative to the base URI" do
-      session = Session.new('https://api.grid5000.fr/sid', 'root_path' => '/grid5000')
+      session = Session.new(:base_uri => 'https://api.grid5000.fr/sid', 'root_path' => '/grid5000')
       session.should_not respond_to(:root_path=)
       session.root_path.should == '/grid5000'
     end
     it "should set the default root_path to /" do
-      session = Session.new('https://api.grid5000.fr')
+      session = Session.new(:base_uri => 'https://api.grid5000.fr')
       session.root_path.should == '/'
     end
     it "should log to NullLogger by default" do
-      NullLogger.should_receive(:new).and_return(logger = mock(NullLogger))
-      session = Session.new('https://api.grid5000.fr')
+      NullLogger.should_receive(:new).and_return(logger = mock(NullLogger, :debug => Proc.new{}))
+      session = Session.new(:base_uri => 'https://api.grid5000.fr')
       session.logger.should == logger
     end
     it "should use the given logger" do
-      logger = mock("custom logger")
-      session = Session.new('https://api.grid5000.fr', 'logger' => logger)
+      logger = mock("custom logger", :debug => Proc.new{})
+      session = Session.new(:base_uri => 'https://api.grid5000.fr', 'logger' => logger)
       session.logger.should == logger
     end
     it "should set a default Accept HTTP header if no default headers are given" do
-      session = Session.new('https://api.grid5000.fr')
+      session = Session.new(:base_uri => 'https://api.grid5000.fr')
       session.default_headers.should == {
+        "User-Agent"=>"Restfully/#{restfully_version}",
         'Accept' => 'application/json'
       }
     end
     it "should use the given default headers" do
-      session = Session.new('https://api.grid5000.fr', :default_headers => {:accept => 'application/xml'})
+      session = Session.new(:base_uri => 'https://api.grid5000.fr', :default_headers => {:accept => 'application/xml'})
       session.default_headers.should == {
-        :accept => 'application/xml'
+        "User-Agent"=>"Restfully/#{restfully_version}",
+        "Accept" => 'application/xml'
       }
     end
     it "should correctly initialize the connection" do
-      Restfully.adapter.should_receive(:new).with('https://api.grid5000.fr/sid', :user => 'crohr', :password => 'password').and_return(connection = mock("restfully connection"))
-      session = Session.new('https://api.grid5000.fr/sid', 'root_path' => '/grid5000', :user => 'crohr', :password => 'password')
+      mock_logger = mock("logger", :debug => Proc.new{})
+      Restfully.adapter.should_receive(:new).with('https://api.grid5000.fr/sid', :user => 'crohr', :password => 'password', :logger => mock_logger).and_return(connection = mock("restfully connection"))
+      session = Session.new(:base_uri => 'https://api.grid5000.fr/sid', 'root_path' => '/grid5000', :user => 'crohr', :password => 'password', :logger => mock_logger)
       session.connection.should == connection
     end
   
     it "should initialize the root resource" do
-      session = Session.new('https://api.grid5000.fr', 'root_path' => '/grid5000', :user => 'crohr', :password => 'password')
+      session = Session.new(:base_uri => 'https://api.grid5000.fr', 'root_path' => '/grid5000', :user => 'crohr', :password => 'password')
       session.root.should be_a Restfully::Resource
       session.root.uri.to_s.should == '/grid5000'
       session.root.should_not be_loaded
@@ -60,7 +65,7 @@ describe Session do
     it "should yield the loaded root resource and the session object" do
       Restfully::Resource.stub!(:new).and_return(root_resource = mock(Restfully::Resource))
       root_resource.should_receive(:load).and_return(root_resource)
-      Session.new('https://api.grid5000.fr', :root_path => '/grid5000', :user => 'crohr', :password => 'password') do |root, session|
+      Session.new(:base_uri => 'https://api.grid5000.fr', :root_path => '/grid5000', :user => 'crohr', :password => 'password') do |root, session|
         session.root.should == root
         root.should == root_resource
       end
@@ -69,8 +74,9 @@ describe Session do
   
   describe "Getting resources" do
     before(:each) do
-      @session = Session.new('https://api.grid5000.fr/sid', :root_path => '/grid5000', :user => 'crohr', :password => 'password', :default_headers => {})
+      @session = Session.new(:base_uri => 'https://api.grid5000.fr/sid', :root_path => '/grid5000', :user => 'crohr', :password => 'password', :default_headers => {})
       @request = mock("restfully http request", :uri => mock("uri"), :headers => mock("headers"))
+      @request.should_receive(:add_headers).with("User-Agent"=>"Restfully/#{restfully_version}", "Accept"=>"application/json")
       @response = mock("restfully http response", :status => 200, :headers => mock("headers"))
     end
     it "should create a new Request object and pass it to the connection" do
@@ -85,8 +91,6 @@ describe Session do
     end
     it "should add the session's default headers to the request's headers" do
       Restfully::HTTP::Request.should_receive(:new).with(URI.parse('http://somehost.com/some/path'), :headers => {}, :query => {}).and_return(@request)
-      @session.default_headers['cache-control'] = 'max-age=0'
-      @request.should_receive(:add_headers).with('cache-control' => 'max-age=0')
       @session.connection.should_receive(:get).with(@request).and_return(@response)
       @session.get('http://somehost.com/some/path').should == @response
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: restfully
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +02:00
+date: 2009-10-26 00:00:00 +01:00
 default_executable: restfully
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: restfully
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Experimental code for auto-generation of wrappers on top of RESTful APIs that follow some specific conventions.