weary 0.7.0 → 0.7.1

data/.gitignore

@@ -1,2 +1,3 @@
 pkg/
-doc/
+doc/
+.bundle/

data/Gemfile

@@ -0,0 +1,11 @@
+source :gemcutter
+
+gem 'crack', '>= 0.1.7'
+gem 'oauth', '>= 0.3.5'
+
+group :test do
+	gem 'rake'
+	gem 'rspec'
+	gem 'fakeweb'
+	gem 'jeweler'
+end

data/Gemfile.lock

@@ -0,0 +1,53 @@
+--- 
+dependencies: 
+  fakeweb: 
+    group: 
+    - :test
+    version: ">= 0"
+  rake: 
+    group: 
+    - :test
+    version: ">= 0"
+  oauth: 
+    group: 
+    - :default
+    version: ">= 0.3.5"
+  rspec: 
+    group: 
+    - :test
+    version: ">= 0"
+  crack: 
+    group: 
+    - :default
+    version: ">= 0.1.7"
+  jeweler: 
+    group: 
+    - :test
+    version: ">= 0"
+specs: 
+- json_pure: 
+    version: 1.2.2
+- git: 
+    version: 1.2.5
+- rubyforge: 
+    version: 2.0.4
+- rspec: 
+    version: 1.3.0
+- ruby-hmac: 
+    version: 0.4.0
+- crack: 
+    version: 0.1.7
+- oauth: 
+    version: 0.3.6
+- rake: 
+    version: 0.8.7
+- gemcutter: 
+    version: 0.4.1
+- jeweler: 
+    version: 1.4.0
+- fakeweb: 
+    version: 1.2.8
+hash: 840ef225827ef421653168c75a110d1a0a2e39a9
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Mark Wunsch
+Copyright (c) 2009-2010 Mark Wunsch
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -9,22 +9,19 @@ What does it do:
 + Authentication with Basic Authentication and [OAuth](http://oauth.net/).
 + Asynchronous, multi-threaded requests.
 
-Browse the documentation here: [http://rdoc.info/projects/mwunsch/weary](http://rdoc.info/projects/mwunsch/weary)
-Peruse the [Wiki](http://wiki.github.com/mwunsch/weary) to discover libraries built with Weary and a more thorough review of the API.
+[RDoc](http://rdoc.info/projects/mwunsch/weary) | [Gem](http://rubygems.org/gems/weary) | [Wiki](http://wiki.github.com/mwunsch/weary) | [Metrics](http://getcaliper.com/caliper/project?repo=git://github.com/mwunsch/weary.git)
 
 ## Requirements
 
-+ [Crack](http://github.com/jnunemaker/crack) >= 0.1.2
++ [Crack](http://github.com/jnunemaker/crack) >= 0.1.7
 + [OAuth](http://github.com/mojodna/oauth) >= 0.3.5
-+ [RSpec](http://rspec.info/) (for running the tests)
-+ [FakeWeb](http://github.com/chrisk/fakeweb) (for running the tests)
 
 ## Installation
 
-You do have Rubygems right? You do use [Gemcutter](http://gemcutter.org/), right?
-
 	gem install weary
 	
+If you're interested in doing development on Weary, clone the repository and run `bundle install` to get the development dependencies.	
+	
 ## Quick Start
 	
 	# http://apiwiki.twitter.com/Twitter-REST-API-Method%3A-users%C2%A0show

data/Rakefile

@@ -1,4 +1,13 @@
-require 'rubygems'
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
 require 'spec/rake/spectask'
 
 task :default => :spec
@@ -22,14 +31,13 @@ begin
     gemspec.homepage = "http://github.com/mwunsch/weary"
     gemspec.description = "A tiny DSL that makes the consumption of RESTful web services simple."
     gemspec.authors = "Mark Wunsch"
-    gemspec.add_dependency 'crack', '>= 0.1.2'
+    gemspec.add_dependency 'crack', '>= 0.1.7'
     gemspec.add_dependency 'oauth', '>= 0.3.5'
-    gemspec.add_development_dependency 'rspec'
-    gemspec.add_development_dependency 'fakeweb'
+    gemspec.add_development_dependency 'bundler', ">= 0.9.7"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
+  puts "Jeweler not available.  Install it with: gem install jeweler"
 end
 
 desc "Open an irb session preloaded with this library"

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/weary.rb

@@ -61,30 +61,30 @@ module Weary
   
   class << self
     def get(url,&block)
-      request url, :get, block
+      request url, :get, &block
     end
     
     def post(url,&block)
-      request url, :post, block
+      request url, :post, &block
     end
     
     def put(url,&block)
-      request url, :put, block
+      request url, :put, &block
     end
     
     def delete(url,&block)
-      request url, :delete, block
+      request url, :delete, &block
     end
     
     def head(url,&block)
-      request url, :head, block
+      request url, :head, &block
     end
     
     # Create a Request for the URL.
     # Defaults to a GET Request. Use a block to further modify the Request
-    def request(url,via = :get,block = nil)
+    def request(url,via = :get, &block)
       req = Request.new(url,via)
-      block.call(req) if block
+      yield req if block_given?
       req
     end
     

data/lib/weary/base.rb

@@ -34,8 +34,7 @@ module Weary
       }
     end
     
-    class << self
-      
+    class << self      
       # Getter for class-level resources
       def resources
         @@resources
@@ -52,23 +51,23 @@ module Weary
       # [<tt>follows</tt>] Boolean; Does this follow redirects? Defaults to true
       # [<tt>headers</tt>] Set headers for the HTTP Request
       def get(name,&block)
-        build_resource(name, :get, block)
+        build_resource(name, :get, &block)
       end
       alias declare get
       
       # Declares a Resource to be requested via POST
       def post(name,&block)
-        build_resource(name, :post, block)
+        build_resource(name, :post, &block)
       end
       
       # Declares a Resource to be requested via PUT
       def put(name,&block)
-        build_resource(name, :put, block)
+        build_resource(name, :put, &block)
       end
 
       # Declares a Resource to be requested via DELETE
       def delete(name,&block)
-        build_resource(name, :delete, block)
+        build_resource(name, :delete, &block)
       end
       
       # Set custom default Headers for your Request
@@ -89,9 +88,9 @@ module Weary
       end
       
       # Prepare and store the Resource
-      def build_resource(name,verb,block=nil)
+      def build_resource(name,verb,&block)
         resource = prepare_resource(name,verb)
-        block.call(resource) if block
+        yield resource if block_given?
         store_resource(resource)
         build_method(resource)
         resource

data/lib/weary/request.rb

@@ -10,20 +10,15 @@ module Weary
       self.credentials = {:username => options[:basic_auth][:username], 
                           :password => options[:basic_auth][:password]} if options[:basic_auth]
       self.credentials = options[:oauth] if options[:oauth]
-      if (options[:body])
-        self.with = options[:body]
-      end
+      self.with = options[:body] if options[:body]
       self.headers = options[:headers] if options[:headers]
-      self.follows = true
-      if options.has_key?(:no_follow)
-        self.follows = options[:no_follow] ? false : true
-      end
+      self.follows = options[:no_follow] ? false : true
     end
     
     # Create a URI object for the given URL
     def uri=(url)
       @uri = URI.parse(url)
-      if (with && !request_preparation.request_body_permitted?)
+      if (with && !connection.request_body_permitted?)
         @uri.query = with
       end
     end
@@ -46,7 +41,7 @@ module Weary
     # set the query string for the url.
     def with=(params)
       @with = (params.respond_to?(:to_params) ? params.to_params : params)
-      if (!request_preparation.request_body_permitted?)
+      if (!connection.request_body_permitted?)
         uri.query = @with
       end
     end
@@ -109,14 +104,14 @@ module Weary
     
     # Build the HTTP connection.
     def http
-      connection = Net::HTTP.new(uri.host, uri.port)
-      connection.verify_mode = OpenSSL::SSL::VERIFY_NONE if connection.use_ssl?
-      connection
+      socket = Net::HTTP.new(uri.host, uri.port)
+      socket.verify_mode = OpenSSL::SSL::VERIFY_NONE if socket.use_ssl?
+      socket
     end
     
     # Build the HTTP Request.
     def request
-      req = request_preparation
+      req = connection
       
       req.body = with if (with && req.request_body_permitted?)
       if (credentials)
@@ -127,11 +122,7 @@ module Weary
         end
       end
       
-      if headers
-        headers.each_pair do |key, value|
-          req[key] = value
-        end
-      end
+      headers.each_pair {|key,value| req[key] = value } if headers
       
       req
     end
@@ -141,7 +132,7 @@ module Weary
     # Prepare with `request_preparation`
     # Build with `request`
     # Fire with `perform`
-    def request_preparation
+    def connection
       HTTPVerb.new(via).request_class.new(uri.request_uri)
     end
 

data/lib/weary/resource.rb

@@ -18,11 +18,7 @@ module Weary
     # The HTTP Method used to fetch the Resource
     def via=(http_verb)
       verb = HTTPVerb.new(http_verb).normalize
-      @via = if Methods.include?(verb)
-        verb
-      else
-        :get
-      end
+      @via = Methods.include?(verb) ? verb : :get
     end
     
     # Optional params. Should be an array. Merges with requires if that is set.
@@ -49,7 +45,7 @@ module Weary
     
     # Sets whether the Resource should follow redirection. Always sets to a boolean value.
     def follows=(bool)
-      @follows = (bool ? true : false)
+      @follows = bool ? true : false
     end
     
     # Should the resource follow redirection?

data/lib/weary/response.rb

@@ -17,7 +17,7 @@ module Weary
     
     # Is this an HTTP redirect?
     def redirected?
-      raw.is_a?(Net::HTTPRedirection)
+      raw.is_a? Net::HTTPRedirection
     end
     
     # Was this Request successful?
@@ -66,6 +66,11 @@ module Weary
       end
     end
     
+    # Puts the body
+    def to_s
+      body.to_s
+    end
+    
     # Same as parse[key]
     def [](key)
       parse[key]

data/spec/spec_helper.rb

@@ -1,7 +1,21 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+begin
+  # Try to require the preresolved locked set of gems.
+  require File.expand_path('../.bundle/environment', __FILE__)
+rescue LoadError
+  # Fall back on doing an unlocked resolve at runtime.
+  require "rubygems"
+  require "bundler"
+  Bundler.setup
+end
+
+begin
+  require 'weary'
+rescue LoadError
+  lib_path = File.join(File.dirname(__FILE__), '..', 'lib')
+  $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+  require 'weary'
+end
 
-require 'rubygems'
-require 'weary'
 require 'spec'
 require 'fakeweb'
 

data/spec/weary/base_spec.rb

@@ -112,7 +112,7 @@ describe Weary::Base do
       end
       
       it 'passes the resource into a block for further refinement' do
-        r = @contest.build_resource("test", :post, Proc.new {|res| res.via = :put })
+        r = @contest.build_resource("test", :post) {|res| res.via = :put }
         r.name.should == "test"
         r.via.should == :put
       end

data/spec/weary/request_spec.rb

@@ -9,7 +9,7 @@ describe Weary::Request do
   
   it 'maps to a Net/HTTPRequest class' do
     test = Weary::Request.new("http://google.com")
-    test.request_preparation.class.should == Net::HTTP::Get
+    test.connection.class.should == Net::HTTP::Get
   end
   
   describe 'Request' do

data/spec/weary/response_spec.rb

@@ -145,6 +145,14 @@ describe Weary::Response do
       response = request.perform
       response['repository'][:name].should == 'rails'
     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')      
+    end
   end
   
   describe 'Exceptions' do

data/spec/weary_spec.rb

@@ -9,8 +9,7 @@ describe Weary do
   end
   
   it 'can alter the request' do
-    block = lambda{|r| r.via = 'POST' }
-    r = Weary.request('http://google.com', :get, block)
+    r = Weary.request('http://google.com', :get) {|r| r.via = 'POST' }
     r.via.should == :post
   end
   

data/weary.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2009-12-30}
+  s.date = %q{2010-03-06}
   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 = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.md",
      "Rakefile",
@@ -50,7 +52,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{weary}
-  s.rubygems_version = %q{1.3.5}
+  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",
@@ -71,21 +73,18 @@ 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<crack>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.3.5"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0.9.7"])
     else
-      s.add_dependency(%q<crack>, [">= 0.1.2"])
+      s.add_dependency(%q<crack>, [">= 0.1.7"])
       s.add_dependency(%q<oauth>, [">= 0.3.5"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0.9.7"])
     end
   else
-    s.add_dependency(%q<crack>, [">= 0.1.2"])
+    s.add_dependency(%q<crack>, [">= 0.1.7"])
     s.add_dependency(%q<oauth>, [">= 0.3.5"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0.9.7"])
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: weary
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,49 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -05:00
+date: 2010-03-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
+        segments: 
+        - 0
+        - 1
+        - 7
+        version: 0.1.7
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: oauth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
+        segments: 
+        - 0
+        - 9
+        - 7
+        version: 0.9.7
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  version_requirements: *id003
 description: A tiny DSL that makes the consumption of RESTful web services simple.
 email: mark@markwunsch.com
 executables: []
@@ -63,6 +70,8 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -103,18 +112,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: weary
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A little DSL for consuming RESTful web services