crohr-restfully 0.1.1 → 0.2.1

data/lib/restfully.rb

@@ -1,8 +1,7 @@
-
-module Restfully
-  class RestfullyError < StandardError; end
-end
-
+require 'restfully/error'
+require 'restfully/parsing'
+require 'restfully/http'
+require 'restfully/http/adapters/rest_client_adapter'
 require 'restfully/extensions'
 require 'restfully/session'
 require 'restfully/special_hash'
@@ -10,3 +9,11 @@ require 'restfully/special_array'
 require 'restfully/link'
 require 'restfully/resource'
 require 'restfully/collection'
+
+
+module Restfully  
+  class << self
+    attr_accessor :adapter
+  end
+  self.adapter = Restfully::HTTP::Adapters::RestClientAdapter
+end

data/restfully.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{restfully}
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-17}
   s.default_executable = %q{restfully}
   s.description = %q{Experimental code for auto-generation of wrappers on top of RESTful APIs that follow HATEOAS principles and provide OPTIONS methods and/or Allow headers.}
   s.email = %q{cyril.rohr@gmail.com}
@@ -24,12 +24,22 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
+     "TODO.rdoc",
      "VERSION",
      "bin/restfully",
      "examples/grid5000.rb",
      "lib/restfully.rb",
      "lib/restfully/collection.rb",
+     "lib/restfully/error.rb",
      "lib/restfully/extensions.rb",
+     "lib/restfully/http.rb",
+     "lib/restfully/http/adapters/abstract_adapter.rb",
+     "lib/restfully/http/adapters/patron_adapter.rb",
+     "lib/restfully/http/adapters/rest_client_adapter.rb",
+     "lib/restfully/http/error.rb",
+     "lib/restfully/http/headers.rb",
+     "lib/restfully/http/request.rb",
+     "lib/restfully/http/response.rb",
      "lib/restfully/link.rb",
      "lib/restfully/parsing.rb",
      "lib/restfully/resource.rb",
@@ -38,7 +48,14 @@ Gem::Specification.new do |s|
      "lib/restfully/special_hash.rb",
      "restfully.gemspec",
      "spec/collection_spec.rb",
+     "spec/fixtures/grid5000-sites.json",
+     "spec/http/error_spec.rb",
+     "spec/http/headers_spec.rb",
+     "spec/http/request_spec.rb",
+     "spec/http/response_spec.rb",
+     "spec/http/rest_client_adapter_spec.rb",
      "spec/link_spec.rb",
+     "spec/parsing_spec.rb",
      "spec/resource_spec.rb",
      "spec/restfully_spec.rb",
      "spec/session_spec.rb",
@@ -48,11 +65,18 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/crohr/restfully}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{restfully}
   s.rubygems_version = %q{1.3.2}
   s.summary = %q{Experimental code for auto-generation of wrappers on top of RESTful APIs that follow some specific conventions.}
   s.test_files = [
     "spec/collection_spec.rb",
+     "spec/http/error_spec.rb",
+     "spec/http/headers_spec.rb",
+     "spec/http/request_spec.rb",
+     "spec/http/response_spec.rb",
+     "spec/http/rest_client_adapter_spec.rb",
      "spec/link_spec.rb",
+     "spec/parsing_spec.rb",
      "spec/resource_spec.rb",
      "spec/restfully_spec.rb",
      "spec/session_spec.rb",
@@ -65,11 +89,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.0"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 1.0"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 1.0"])
   end
 end

data/spec/collection_spec.rb

@@ -15,23 +15,79 @@ describe Collection do
     collection.should respond_to(:length)
   end
   
-  it "should not load if already loaded and no force_reload" do
-    collection = Collection.new("uri", mock("session"))
-    collection.should_receive(:loaded?).and_return(true)
-    collection.load(:reload => false).should == collection
-  end
-  it "should load when force_reload is true [already loaded]" do
-    collection = Collection.new("uri", session=mock("session", :logger => Logger.new(STDOUT)))
-    collection.should_receive(:loaded?).and_return(true)
-    session.should_receive(:get).and_return({})
-    collection.load(:reload => true).should == collection    
-  end
-  it "should load when force_reload is true [not loaded]" do
-    collection = Collection.new("uri", session=mock("session", :logger => Logger.new(STDOUT)))
-    collection.should_receive(:loaded?).and_return(false)
-    session.should_receive(:get).and_return({})
-    collection.load(:reload => true).should == collection    
+  
+  
+  describe "loading" do
+    before(:all) do
+      @raw = fixture("grid5000-sites.json")
+      @response_200 = Restfully::HTTP::Response.new(200, {'Content-Type' => 'application/json;charset=utf-8', 'Content-Length' => @raw.length}, @raw)
+      @logger = Logger.new(STDOUT)
+    end
+    it "should not load if already loaded and no :reload" do
+      collection = Collection.new("uri", mock("session"))
+      collection.should_receive(:loaded?).and_return(true)
+      collection.load(:reload => false).should == collection
+    end
+    it "should load when :reload param is true [already loaded]" do
+      collection = Collection.new("uri", session=mock("session", :logger => Logger.new(STDOUT)))
+      collection.should_receive(:loaded?).and_return(true)
+      session.should_receive(:get).and_return(@response_200)
+      collection.load(:reload => true).should == collection    
+    end
+    it "should load when force_reload is true [not loaded]" do
+      collection = Collection.new("uri", session=mock("session", :logger => Logger.new(STDOUT)))
+      collection.should_receive(:loaded?).and_return(false)
+      session.should_receive(:get).and_return(@response_200)
+      collection.load(:reload => true).should == collection    
+    end
+    it "should force reload when query parameters are given" do
+      collection = Collection.new("uri", session=mock("session", :logger => Logger.new(STDOUT)))
+      session.should_receive(:get).and_return(@response_200)
+      collection.load(:query => {:q1 => 'v1'}).should == collection
+    end
+    it "should not initialize resources lacking a self link" do
+      collection = Collection.new("uri", session = mock("session", :get => mock("restfully response", :body => {
+        'rennes' => {
+          'links' => [
+            {'rel' => 'collection', 'href' => '/grid5000/sites/rennes/versions', 'resolvable' => false, 'title' => 'versions'}
+          ],
+          'uid' => 'rennes'
+        }
+      }), :logger => @logger))
+      Resource.should_not_receive(:new)
+      collection.load
+      collection['rennes'].should be_nil
+    end
+    it "should initialize resources having a self link" do
+      collection = Collection.new("uri", session = mock("session", :get => mock("restfully response", :body => {
+        'rennes' => {
+          'links' => [
+            {'rel' => 'self', 'href' => '/grid5000/sites/rennes'},
+            {'rel' => 'collection', 'href' => '/grid5000/sites/rennes/versions', 'resolvable' => false, 'title' => 'versions'}
+          ],
+          'uid' => 'rennes'
+        }
+      }), :logger => @logger))
+      Resource.should_receive(:new).with('/grid5000/sites/rennes', session, :raw => {
+        'links' => [
+          {'rel' => 'self', 'href' => '/grid5000/sites/rennes'},
+          {'rel' => 'collection', 'href' => '/grid5000/sites/rennes/versions', 'resolvable' => false, 'title' => 'versions'}
+        ],
+        'uid' => 'rennes'
+      }).and_return(resource=mock("restfully resource"))
+      resource.should_receive(:load).and_return(resource)
+      collection.load
+      collection['rennes'].should == resource
+    end
+    it "should correctly initialize its resources [integration test]" do
+      collection = Collection.new("uri", session=mock("session", :logger => Logger.new(STDOUT), :get => @response_200))
+      collection.load
+      collection.should be_loaded
+      collection.uri.should == "uri"
+      collection['rennes'].uid.should == 'rennes'
+      collection['rennes'].type.should == 'site'
+      collection.keys.should =~ ['rennes', 'lille', 'bordeaux', 'nancy', 'sophia', 'toulouse', 'lyon', 'grenoble', 'orsay']
+    end 
   end
-  it "should force reload when query parameters are given"
   
 end