weary 0.6.0 → 0.7.0

data/spec/weary/resource_spec.rb

@@ -242,8 +242,8 @@ describe Weary::Resource do
       request = @test.build!(params, defaults, basic_auth)
       
       request.class.should == Weary::Request
-      request.method.should == :get
-      request.options[:basic_auth].should == basic_auth
+      request.via.should == :get
+      request.credentials.should == basic_auth
     end
   end
   

data/spec/weary/response_spec.rb

@@ -2,71 +2,167 @@ require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe Weary::Response do
   before do
-    @test = Weary::Response.new(mock_response, :get)
+    FakeWeb.register_uri(:get, "http://twitter.com", :body => get_fixture('twitter.xml'))
+    FakeWeb.register_uri(:get, "http://github.com", :body => get_fixture('github.yml'))
   end
   
-  it 'should wrap a Net::Response' do
-    @test.raw.is_a?(Net::HTTPResponse).should == true
+  after do
+    FakeWeb.clean_registry
   end
   
-  it 'should store the HTTP method' do
-    @test.method.should == :get
+  it 'wraps a raw Net::HTTPResponse' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.raw.is_a?(Net::HTTPResponse).should == true
   end
   
-  it 'should have an HTTP code' do
-    @test.code.should == 200
+  it 'stores the Request object that requested it' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.requester.should == request
   end
   
-  it 'should have an HTTP message' do
-    @test.message.should == "OK"
+  it 'has an HTTP code' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :status => http_status_message(418))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.code.should == 418
   end
   
-  it 'should know if the request was successful' do
-    @test.success?.should == true
+  it 'has an HTTP message associated with it' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :status => http_status_message(418))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.message.should == "I'm a teapot"
   end
   
-  # replace with better mocking method
-  it 'should parse JSON' do
-    test = Weary::Response.new(mock_response(:get, 200, {'content-type' => 'text/json'}, get_fixture("vimeo.json")), :get)
-    test.parse[0]["title"].should == "\"The Noises Rest\""
+  it 'knows if the request cycle was successful' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.success?.should == true
   end
   
-  # replace with better mocking method
-  it 'should parse XML' do
-    test = Weary::Response.new(mock_response(:get, 200, {'content-type' => 'text/xml'}, get_fixture("twitter.xml")), :get)
-    test.parse.class.should == Hash
-    test.parse['statuses'][0]['id'].should == "2186350626"
+  it 'stores the HTTP header' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :Server => 'Apache')
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.header['server'][0].should == 'Apache'
   end
   
-  # replace with better mocking method
-  it 'should parse YAML' do
-    test = Weary::Response.new(mock_response(:get, 200, {'content-type' => 'text/yaml'}, get_fixture("github.yml")), :get)
-    test.parse.class.should == Hash
-    test.parse["repository"][:name].should == "rails"
+  it 'stores the content-type of the response' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :'Content-Type' => 'text/json')
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.content_type.should == 'text/json'
   end
   
-  # replace with better mocking method
-  it 'should use [] to parse the document' do
-    test = Weary::Response.new(mock_response(:get, 200, {'content-type' => 'text/xml'}, get_fixture("twitter.xml")), :get).parse
-    test['statuses'][0]['id'].should == "2186350626"
+  it 'stores the cookies sent by the response' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :'Set-Cookie' => 'cookie=true')
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.cookie.should == 'cookie=true'
   end
   
-  # replace with better mocking method
-  it 'should raise an exception if there was a Server Error' do
-    test = Weary::Response.new(mock_response(:get, 500), :get)
-    lambda { test.parse }.should raise_error
+  it 'stores the body of the response' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.body.should == get_fixture('vimeo.json')
   end
   
-  # replace with better mocking method
-  it 'should raise an exception if there was a Client Error'  do
-    test = Weary::Response.new(mock_response(:get, 404), :get)
-    lambda { test.parse }.should raise_error
+  it 'normalizes the format type of the response' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :'Content-Type' => 'text/json')
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.format.should == :json
   end
   
-  # replace with better mocking method
-  it 'should follow HTTP redirects' do
-    test = Weary::Response.new(mock_response(:get, 301), :get)
-    test.redirected?.should == true
+  it 'can follow redirects' do
+    FakeWeb.register_uri(:get, "http://markwunsch.com", :status => http_status_message(301), :Location => 'http://redirected.com')
+    FakeWeb.register_uri(:get, "http://redirected.com", :body => "Hello world")
+    
+    request = Weary::Request.new('http://markwunsch.com')
+    request.follows = false
+    response = request.perform
+    response.code.should == 301
+    response.follow_redirect.code.should == 200
+    response.follow_redirect.body.should == "Hello world"
+  end
+  
+  it 'stores the url' do
+    FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'))
+    
+    request = Weary::Request.new('http://vimeo.com')
+    response = request.perform
+    response.url.to_s.should == 'http://vimeo.com'
+  end
+  
+  describe 'Parsing' do
+    it 'parses JSON' do
+      FakeWeb.register_uri(:get, "http://vimeo.com", :body => get_fixture('vimeo.json'), :'Content-Type' => 'text/json')
+      
+      request = Weary::Request.new('http://vimeo.com')
+      response = request.perform
+      response.parse[0].class.should == Hash
+      response.parse[0]['title'].should == '"The Noises Rest"'
+    end
+    
+    it 'parses XML' do
+      FakeWeb.register_uri(:get, "http://twitter.com", :body => get_fixture('twitter.xml'), :'Content-Type' => 'application/xml')
+      
+      request = Weary::Request.new('http://twitter.com')
+      response = request.perform
+      response.parse.class.should == Hash
+      response.parse['statuses'].size.should == 20
+    end
+    
+    it 'parses YAML' do
+      FakeWeb.register_uri(:get, "http://github.com", :body => get_fixture('github.yml'), :'Content-Type' => 'text/yaml')
+      
+      request = Weary::Request.new('http://github.com')
+      response = request.perform
+      response.parse.class.should == Hash
+      response.parse['repository'][:name].should == 'rails'
+    end
+    
+    it 'can parse with the [] method' do
+      FakeWeb.register_uri(:get, "http://github.com", :body => get_fixture('github.yml'), :'Content-Type' => 'text/yaml')
+      
+      request = Weary::Request.new('http://github.com')
+      response = request.perform
+      response['repository'][:name].should == 'rails'
+    end
+  end
+  
+  describe 'Exceptions' do
+    it 'raises an exception if there is a Server Error' do
+      FakeWeb.register_uri(:get, "http://github.com", :status => http_status_message(500))
+      
+      request = Weary::Request.new('http://github.com')
+      response = request.perform
+      lambda { response.parse }.should raise_error
+    end
+    
+    it 'raises an exception if there is a Client Error' do
+      FakeWeb.register_uri(:get, "http://github.com", :status => http_status_message(404))
+      
+      request = Weary::Request.new('http://github.com')
+      response = request.perform
+      lambda { response.parse }.should raise_error
+    end
   end
   
 end

data/spec/weary_spec.rb

@@ -1,4 +1,58 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Weary do
+  it 'makes a request' do
+    r = Weary.request('http://google.com')
+    r.class.should == Weary::Request
+    r.uri.to_s.should == 'http://google.com'
+    r.via.should == :get
+  end
+  
+  it 'can alter the request' do
+    block = lambda{|r| r.via = 'POST' }
+    r = Weary.request('http://google.com', :get, block)
+    r.via.should == :post
+  end
+  
+  it 'makes a GET request' do
+    r = Weary.get 'http://google.com'
+    r.class.should == Weary::Request
+    r.uri.to_s.should == 'http://google.com'
+    r.via.should == :get
+  end
+    
+  it 'makes a POST request' do
+    r = Weary.post 'http://google.com'
+    r.via.should == :post
+  end
+  
+  it 'makes a PUT request' do
+    r = Weary.put 'http://google.com'
+    r.via.should == :put
+  end
+  
+  it 'makes a DELETE request' do
+    r = Weary.delete 'http://google.com'
+    r.via.should == :delete
+  end
+  
+  it 'makes a HEAD request' do
+    r = Weary.head 'http://google.com'
+    r.via.should == :head
+  end
+  
+  it 'makes requests with an optional block' do
+    r = Weary.get 'http://google.com' do |req| 
+      req.with = {:id => 'markwunsch'} 
+    end
+    r.uri.query.should == r.with
+  end
+  
+  it 'prepares a Batch request' do
+    requests = [ Weary.get('http://twitter.com'),
+                 Weary.get('http://github.com'),
+                 Weary.get('http://vimeo.com'),
+                 Weary.get('http://tumblr.com')]
+    Weary.batch(requests).class.should == Weary::Batch             
+  end
 end

data/weary.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2009-12-06}
-  s.description = %q{The Weary need REST: a tiny DSL that makes the consumption of RESTful web services simple.}
+  s.date = %q{2009-12-30}
+  s.description = %q{A tiny DSL that makes the consumption of RESTful web services simple.}
   s.email = %q{mark@markwunsch.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,10 +22,12 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "examples/batch.rb",
      "examples/repo.rb",
      "examples/status.rb",
      "lib/weary.rb",
      "lib/weary/base.rb",
+     "lib/weary/batch.rb",
      "lib/weary/exceptions.rb",
      "lib/weary/httpverb.rb",
      "lib/weary/request.rb",
@@ -36,6 +38,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/vimeo.json",
      "spec/spec_helper.rb",
      "spec/weary/base_spec.rb",
+     "spec/weary/batch_spec.rb",
      "spec/weary/httpverb_spec.rb",
      "spec/weary/request_spec.rb",
      "spec/weary/resource_spec.rb",
@@ -52,11 +55,13 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/weary/base_spec.rb",
+     "spec/weary/batch_spec.rb",
      "spec/weary/httpverb_spec.rb",
      "spec/weary/request_spec.rb",
      "spec/weary/resource_spec.rb",
      "spec/weary/response_spec.rb",
      "spec/weary_spec.rb",
+     "examples/batch.rb",
      "examples/repo.rb",
      "examples/status.rb"
   ]
@@ -68,13 +73,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<crack>, [">= 0.1.2"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.3.5"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
     else
       s.add_dependency(%q<crack>, [">= 0.1.2"])
       s.add_dependency(%q<oauth>, [">= 0.3.5"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
     end
   else
     s.add_dependency(%q<crack>, [">= 0.1.2"])
     s.add_dependency(%q<oauth>, [">= 0.3.5"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weary
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 -05:00
+date: 2009-12-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,27 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.5
     version: 
-description: "The Weary need REST: a tiny DSL that makes the consumption of RESTful web services simple."
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: A tiny DSL that makes the consumption of RESTful web services simple.
 email: mark@markwunsch.com
 executables: []
 
@@ -47,10 +67,12 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/batch.rb
 - examples/repo.rb
 - examples/status.rb
 - lib/weary.rb
 - lib/weary/base.rb
+- lib/weary/batch.rb
 - lib/weary/exceptions.rb
 - lib/weary/httpverb.rb
 - lib/weary/request.rb
@@ -61,6 +83,7 @@ files:
 - spec/fixtures/vimeo.json
 - spec/spec_helper.rb
 - spec/weary/base_spec.rb
+- spec/weary/batch_spec.rb
 - spec/weary/httpverb_spec.rb
 - spec/weary/request_spec.rb
 - spec/weary/resource_spec.rb
@@ -98,10 +121,12 @@ summary: A little DSL for consuming RESTful web services
 test_files: 
 - spec/spec_helper.rb
 - spec/weary/base_spec.rb
+- spec/weary/batch_spec.rb
 - spec/weary/httpverb_spec.rb
 - spec/weary/request_spec.rb
 - spec/weary/resource_spec.rb
 - spec/weary/response_spec.rb
 - spec/weary_spec.rb
+- examples/batch.rb
 - examples/repo.rb
 - examples/status.rb