weary 0.7.2 → 1.0.0.rc1

data/spec/weary/response_spec.rb

@@ -1,176 +1,99 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'spec_helper'
 
 describe Weary::Response do
-  before do
-    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
-  
-  after do
-    FakeWeb.clean_registry
-  end
-  
-  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 '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 '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 '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
-  
-  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
-  
-  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
-  
-  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'
+  describe "#status" do
+    subject { Weary::Response.new [""], 200, {'Content-Type' => 'text/plain'} }
+    it "returns a response code" do
+      subject.status.should eql 200
+    end
   end
-  
-  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'
+
+  describe "#header" do
+    subject { Weary::Response.new [""], 200, {'Content-Type' => 'text/plain'} }
+    it "returns the headers as a hash" do
+      subject.header.should have_key 'Content-Type'
+    end
   end
-  
-  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')
+
+  describe "#body" do
+    subject { Weary::Response.new ["Hi"], 200, {'Content-Type' => 'text/plain'} }
+    it "returns the body, compacted" do
+      subject.body.should eql "Hi"
+    end
   end
-  
-  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
+
+  describe "#each" do
+    subject { Weary::Response.new ["Hi"], 200, {'Content-Type' => 'text/plain'} }
+    it "calls #each on the body" do
+      iterated = false
+      subject.each {|body| iterated = body.downcase.to_sym }
+      iterated.should eql :hi
+    end
   end
-  
-  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"
+
+  describe "#finish" do
+    subject { Weary::Response.new [""], 200, {'Content-Type' => 'text/plain'} }
+    it "provides a Rack tuple" do
+      subject.finish.length.should be 3
+    end
   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'
+
+  describe "#success?" do
+    subject { Weary::Response.new ["Hi"], 200, {'Content-Type' => 'text/plain'} }
+    it "returns true if the request was successful" do
+      subject.success?.should be true
+    end
   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"'
+
+  describe "#redirected?" do
+    subject { Weary::Response.new ["Hi"], 301, {'Content-Type' => 'text/plain'} }
+    it "returns true if the request was redirected" do
+      subject.redirected?.should be true
     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
+
+  describe "#length" do
+    subject { Weary::Response.new ["Hi"], 301, {'Content-Type' => 'text/plain'} }
+    it "returns the content-length" do
+      subject.length.should eql subject.header['Content-Length'].to_i
     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
+
+  describe "#call" do
+    it_behaves_like "a Rack application" do
+      subject { Weary::Response.new [""], 200, {'Content-Type' => 'text/plain'}}
+      let(:env) { Weary::Request.new("http://github.com/api/v2/json/repos/show/mwunsch/weary").env }
     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
+
+  describe "#parse" do
+    before do
+      @body = {
+        :sales => [
+          :name => "Spring: Just Around the Corner",
+          :sale => "https://api.gilt.com/v1/sales/men/spring-just-arou-108/detail.json",
+          :sale_key => "spring-just-arou-108",
+          :store => "men",
+          :description => "Were you aware that there are seasons? Spring will start soon so etc",
+          :begins => "2012-02-09T17:00:00Z"
+        ]
+      }
     end
-    
-    it 'converts to a string by printing the body' do
-      fixture = get_fixture('github.yml')
-      FakeWeb.register_uri(:get, "http://github.com", :body => fixture, :'Content-Type' => 'text/yaml')
-      request = Weary::Request.new('http://github.com')
-      response = request.perform
-      response.to_s.should == get_fixture('github.yml')      
+
+    it "parses json out of the response" do
+      json = MultiJson.encode @body
+      response = Weary::Response.new json, 200, {'Content-Type' => 'application/json'}
+      response.parse.should eql MultiJson.decode(json)
     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
+
+    it "raises an error if the content type is unknown" do
+      response = Weary::Response.new "<lolxml />", 200, {'Content-Type' => 'application/xml'}
+      expect { response.parse }.to 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
+
+    it "raises an error if there is no body" do
+      response = Weary::Response.new "", 404, {'Content-Type' => 'text/plain'}
+      expect { response.parse }.to raise_error
     end
   end
-  
 end

data/spec/weary/route_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Weary::Route do
+  before do
+    @client = Class.new(Weary::Client)
+    @client.domain "https://api.github.com"
+    @client.get(:list, "/user/repos") {|r| r.basic_auth! }
+    @client.get(:user, "/users/{user}/repos")
+    @client.post(:create, "/user/repos") {|r| r.basic_auth! }
+    @client.get(:repo, "/repos/{user}/{repo}")
+    @client.patch(:edit, "/repos/{user}/{repo}") {|r| r.basic_auth! }
+    @resources = @client.resources
+  end
+
+  describe "#call" do
+    it_behaves_like "a Rack application" do
+      subject { described_class.new @resources.values, @client.domain }
+      let(:env) { @resources[:list].request.env }
+    end
+
+    it "returns a 404 when the url can't be routed" do
+      route = described_class.new @resources.values, @client.domain
+      dummy = @resources[:list].dup
+      dummy.url "http://foo.com/baz"
+      status, header, body = route.call dummy.request.env
+      status.should eql 404
+    end
+
+    it "returns a 405 when the request method is invalid" do
+      route = described_class.new @resources.values, @client.domain
+      bad_request = @resources[:list].request do |request|
+        request.method = "PUT"
+      end
+      status, header, body = route.call bad_request.env
+      status.should eql 405
+    end
+
+    it "returns a 403 (forbidden) when requirements are unmet" do
+      dummy = @resources[:edit].dup
+      dummy.required :name
+      route = described_class.new [dummy], @client.domain
+      env = @resources[:edit].request(:user => "mwunsch", :repo => "weary").env
+      status, header, body = route.call(env)
+      status.should eql 403
+    end
+  end
+
+  describe "#route" do
+    subject { described_class.new @resources.values, @client.domain }
+
+    it "accepts a Rack::Request and returns the best resource" do
+      req = @resources[:list].request
+      rack_req = Rack::Request.new(req.env)
+      subject.route(rack_req).should be @resources[:list]
+    end
+
+    it "raises a 404 (not found) error if no url can be matched" do
+      dummy = @resources[:list].dup
+      dummy.url "http://foo.com/baz"
+      rack_req = Rack::Request.new(dummy.request.env)
+      expect { subject.route(rack_req) }.to raise_error Weary::Route::NotFoundError
+    end
+
+    it "raises a 405 (not allowed) error if no request method can be matched" do
+      bad_request = @resources[:list].request do |request|
+        request.method = "PUT"
+      end
+      rack_req = Rack::Request.new(bad_request.env)
+      expect { subject.route(rack_req) }.to raise_error Weary::Route::NotAllowedError
+    end
+  end
+end

data/spec/weary_spec.rb

@@ -1,57 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require '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
-    r = Weary.request('http://google.com', :get) {|r| r.via = 'POST' }
-    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

@@ -1,90 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "weary/version"
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.7.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = "#{Weary::VERSION}"
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2010-03-08}
-  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",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "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",
-     "lib/weary/resource.rb",
-     "lib/weary/response.rb",
-     "spec/fixtures/github.yml",
-     "spec/fixtures/twitter.xml",
-     "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",
-     "spec/weary/response_spec.rb",
-     "spec/weary_spec.rb",
-     "weary.gemspec"
-  ]
+  s.summary = %q{A framework and DSL for the consumption of RESTful web services.}
+  s.description = %q{A framework and DSL to Ruby clients to RESTful web services. }
   s.homepage = %q{http://github.com/mwunsch/weary}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = %q{weary}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A little DSL for consuming RESTful web services}
-  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"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files = `git ls-files`.split "\n"
+  s.test_files = `git ls-files -- {spec,examples}/*`.split "\n"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_runtime_dependency(%q<oauth>, [">= 0.3.5"])
-      s.add_development_dependency(%q<bundler>, [">= 0.9.7"])
-    else
-      s.add_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_dependency(%q<oauth>, [">= 0.3.5"])
-      s.add_dependency(%q<bundler>, [">= 0.9.7"])
-    end
-  else
-    s.add_dependency(%q<crack>, [">= 0.1.7"])
-    s.add_dependency(%q<oauth>, [">= 0.3.5"])
-    s.add_dependency(%q<bundler>, [">= 0.9.7"])
-  end
-end
+  s.require_paths = ['lib']
 
+  s.add_runtime_dependency "rack", "~> 1.4.0"
+  s.add_runtime_dependency "addressable", "~> 2.2.6"
+  s.add_runtime_dependency "promise", "~> 0.3.0"
+  s.add_runtime_dependency "simple_oauth", "~> 0.1.5"
+  s.add_runtime_dependency "multi_json", "~> 1.1.0"
+  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_development_dependency "webmock", "~> 1.7.10"
+end