weary 0.5.0 → 0.5.1

data/Rakefile

@@ -24,6 +24,7 @@ begin
     gemspec.authors = "Mark Wunsch"
     gemspec.add_dependency('crack', '>= 0.1.2')
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
 end

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/weary.rb

@@ -17,15 +17,12 @@ require 'weary/request'
 require 'weary/response'
 require 'weary/resource'
 require 'weary/exceptions'
+require 'weary/httpverb'
 
 
 module Weary
   
-  Methods = { :get    => [:get, :GET, /\bget\b/i],
-              :post   => [:post, :POST, /\bpost\b/i],
-              :put    => [:put, :PUT, /\bput\b/i],
-              :delete => [:delete, :del, :DELETE, :DEL, /\bdelete\b/i],
-              :head   => [:head, :HEAD, /\bhead\b/i] }
+  Methods = [:get, :post, :put, :delete, :head]
   ContentTypes = { :json  => [:json, 'json', 'application/json', 'text/json', 'application/javascript', 'text/javascript'],
                    :xml   => [:xml, 'xml', 'text/xml', 'application/xml'],
                    :html  => [:html, 'html', 'text/html'],
@@ -115,67 +112,62 @@ module Weary
   # [<tt>follows</tt>] Boolean; Does this follow redirects? Defaults to true
   # [<tt>domain</tt>] Sets the domain you would like this individual resource to be on (if you include the domain flag in <tt>url</tt>)
   # [<tt>headers</tt>] Set headers for the HTTP Request
-  def declare(name)
-    resource = prepare_resource(name,:get)
-    yield resource if block_given?
-    form_resource(resource)
-    return resource
+  def declare(name,&block)
+    build_resource(name, :get, block)
   end
   alias get declare
   
-  def post(name)
-    resource = prepare_resource(name,:post)
-    yield resource if block_given?
-    form_resource(resource)
-    return resource
+  def post(name,&block)
+    build_resource(name, :post, block)
   end
   
-  def put(name)
-    resource = prepare_resource(name,:put)
-    yield resource if block_given?
-    form_resource(resource)
-    return resource
+  def put(name,&block)
+    build_resource(name, :put, block)
   end
   
-  def delete(name)
-    resource = prepare_resource(name,:delete)
-    yield resource if block_given?
+  def delete(name,&block)
+    build_resource(name, :delete, block)
+  end
+  
+  def build_resource(name,verb,block=nil)
+    resource = prepare_resource(name,verb)
+    block.call(resource) unless block.nil?
     form_resource(resource)
     return resource
   end
-
-  private
   
-    def prepare_resource(name,via)
-      preparation = Weary::Resource.new(name)
-      preparation.via = via
-      preparation.format = (@default_format || :json)
-      preparation.domain = @domain
-      preparation.url = (@url_pattern || "<domain><resource>.<format>")
-      preparation.with = @always_with unless @always_with.nil?
-      preparation.headers = @headers unless (@headers.nil? || @headers.empty?)
-      if !@oauth.nil?
-        preparation.oauth = true
-        preparation.access_token = @oauth
-      end
-      return preparation
+  def prepare_resource(name,via)
+    preparation = Weary::Resource.new(name)
+    preparation.via = via
+    preparation.format = (@default_format || :json)
+    preparation.domain = @domain
+    preparation.url = (@url_pattern || "<domain><resource>.<format>")
+    preparation.with = @always_with unless @always_with.nil?
+    preparation.headers = @headers unless (@headers.nil? || @headers.empty?)
+    if !@oauth.nil?
+      preparation.oauth = true
+      preparation.access_token = @oauth
     end
-    
-    def form_resource(resource)
-      if resource.authenticates?
-        raise StandardError, "Can not authenticate unless username and password are defined" unless (@username && @password)
-      end
-      if resource.oauth?
-        if resource.access_token.nil?
-          raise StandardError, "Access Token is not provided" if @oauth.nil?
-          resource.access_token = @oauth
-        end
+    return preparation
+  end
+  
+  def form_resource(resource)
+    if resource.authenticates?
+      raise StandardError, "Can not authenticate unless username and password are defined" unless (@username && @password)
+    end
+    if resource.oauth?
+      if resource.access_token.nil?
+        raise StandardError, "Access Token is not provided" if @oauth.nil?
+        resource.access_token = @oauth
       end
-      @resources ||= []
-      @resources << resource.to_hash 
-      craft_methods(resource)
-      return resource.to_hash
     end
+    @resources ||= []
+    @resources << resource.to_hash 
+    craft_methods(resource)
+    return resource.to_hash
+  end
+
+  private
     
     def craft_methods(resource)
       code = %Q{

data/lib/weary/httpverb.rb

@@ -0,0 +1,32 @@
+module Weary
+  class HTTPVerb
+    
+    attr_accessor :verb
+    
+    def initialize(http_verb = :get)
+      self.verb = http_verb      
+    end
+    
+    def normalize
+      return verb.to_s.strip.downcase.intern
+    end
+    
+    def request_class
+      case normalize
+        when :get
+          Net::HTTP::Get
+        when :post
+          Net::HTTP::Post
+        when :put
+          Net::HTTP::Put
+        when :delete
+          Net::HTTP::Delete
+        when :head
+          Net::HTTP::Head
+        else
+          Net::HTTP::Get  
+      end
+    end
+    
+  end
+end

data/lib/weary/request.rb

@@ -15,19 +15,11 @@ module Weary
     end
     
     def method=(http_verb)
-      @http_verb = case http_verb
-        when *Methods[:get]
-          :get
-        when *Methods[:post]
-          :post
-        when *Methods[:put]
-          :put
-        when *Methods[:delete]
-          :delete
-        when *Methods[:head]
-          :head
-        else
-          raise ArgumentError, "Only GET, POST, PUT, DELETE, and HEAD methods are supported"
+      verb = HTTPVerb.new(http_verb).normalize
+      @http_verb = if Methods.include?(verb)
+        verb
+      else
+        :get
       end
     end
     
@@ -48,7 +40,6 @@ module Weary
         response
       end
     end
-    alias make perform
     
     private
       def http
@@ -59,18 +50,9 @@ module Weary
       end
     
       def request
-        prepare = case @http_verb
-          when :get
-            Net::HTTP::Get.new(@uri.request_uri)
-          when :post
-            Net::HTTP::Post.new(@uri.request_uri)
-          when :put
-            Net::HTTP::Put.new(@uri.request_uri)
-          when :delete
-            Net::HTTP::Delete.new(@uri.request_uri)
-          when :head
-            Net::HTTP::Head.new(@uri.request_uri)
-        end
+        request_class = HTTPVerb.new(@http_verb).request_class        
+        prepare = request_class.new(@uri.request_uri)
+        
         prepare.body = options[:body].is_a?(Hash) ? options[:body].to_params : options[:body] if options[:body]
         prepare.basic_auth(options[:basic_auth][:username], options[:basic_auth][:password]) if options[:basic_auth]
         if options[:headers]

data/lib/weary/resource.rb

@@ -18,17 +18,11 @@ module Weary
     end
     
     def via=(http_verb)
-      @via = case http_verb
-        when *Methods[:get]
-          :get
-        when *Methods[:post]
-          :post
-        when *Methods[:put]
-          :put
-        when *Methods[:delete]
-          :delete
-        else
-          raise ArgumentError, "#{http_verb} is not a supported method"
+      verb = HTTPVerb.new(http_verb).normalize
+      @via = if Methods.include?(verb)
+        verb
+      else
+        :get
       end
     end
     
@@ -63,7 +57,7 @@ module Weary
       end
     end
     
-    def requires=(params)        
+    def requires=(params)
       if @with.is_a?(Hash)
         params.each { |key| @with[key] = nil unless @with.has_key?(key) }
         @requires = params.collect {|x| x.to_sym}

data/spec/weary/httpverb_spec.rb

@@ -0,0 +1,20 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Weary::HTTPVerb do
+  before do
+    @test = Weary::HTTPVerb.new("Get")
+  end
+  
+  it 'should set the verb' do
+    @test.verb.should == "Get"
+  end
+  
+  it 'should normalize' do
+    @test.normalize.should == :get
+  end
+  
+  it 'should know what net/http class to request with' do
+    @test.request_class.should == Net::HTTP::Get
+  end
+  
+end

data/spec/weary/resource_spec.rb

@@ -77,7 +77,8 @@ describe Weary::Resource do
   it 'should only allow specified http methods' do
     @test.via = "Post"
     @test.via.should == :post
-    lambda { @test.via = :foobar }.should raise_error
+    @test.via = :foobar
+    @test.via.should == :get
   end
 
   it 'format should be a symbol' do

data/spec/weary_spec.rb

@@ -124,6 +124,14 @@ describe Weary do
       @test.on_domain "http://foobar.com/"
     end
     
+    it 'should have a common method for building requests' do
+      block = Proc.new { |r| r.via = :post; r.url = "http://bar.foo/name.json"}
+      test = @test.build_resource('name',:get,block)
+      test.class.should == Weary::Resource
+      test.url.should == "http://bar.foo/name.json"
+      test.via.should == :post
+    end
+    
     it 'should add a new resource' do
       @test.get "resource"
       @test.resources[0].has_key?(:resource).should == true

data/weary.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2009-07-15}
+  s.date = %q{2009-10-26}
   s.description = %q{The Weary need REST: a tiny DSL that makes the consumption of RESTful web services simple.}
   s.email = %q{mark@markwunsch.com}
   s.extra_rdoc_files = [
@@ -23,6 +26,7 @@ Gem::Specification.new do |s|
      "examples/status.rb",
      "lib/weary.rb",
      "lib/weary/exceptions.rb",
+     "lib/weary/httpverb.rb",
      "lib/weary/request.rb",
      "lib/weary/resource.rb",
      "lib/weary/response.rb",
@@ -30,21 +34,22 @@ Gem::Specification.new do |s|
      "spec/fixtures/twitter.xml",
      "spec/fixtures/vimeo.json",
      "spec/spec_helper.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.has_rdoc = true
   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.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A little DSL for consuming RESTful web services}
   s.test_files = [
     "spec/spec_helper.rb",
+     "spec/weary/httpverb_spec.rb",
      "spec/weary/request_spec.rb",
      "spec/weary/resource_spec.rb",
      "spec/weary/response_spec.rb",
@@ -55,7 +60,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<crack>, [">= 0.1.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weary
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -04:00
+date: 2009-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ files:
 - examples/status.rb
 - lib/weary.rb
 - lib/weary/exceptions.rb
+- lib/weary/httpverb.rb
 - lib/weary/request.rb
 - lib/weary/resource.rb
 - lib/weary/response.rb
@@ -48,6 +49,7 @@ files:
 - spec/fixtures/twitter.xml
 - spec/fixtures/vimeo.json
 - spec/spec_helper.rb
+- spec/weary/httpverb_spec.rb
 - spec/weary/request_spec.rb
 - spec/weary/resource_spec.rb
 - spec/weary/response_spec.rb
@@ -55,6 +57,8 @@ files:
 - weary.gemspec
 has_rdoc: true
 homepage: http://github.com/mwunsch/weary
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -75,12 +79,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: weary
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A little DSL for consuming RESTful web services
 test_files: 
 - spec/spec_helper.rb
+- spec/weary/httpverb_spec.rb
 - spec/weary/request_spec.rb
 - spec/weary/resource_spec.rb
 - spec/weary/response_spec.rb