alexvollmer-httparty 0.1.5 → 0.2.6

data/spec/httparty_spec.rb

@@ -5,13 +5,20 @@ class Foo
   base_uri 'api.foo.com/v1'
 end
 
-class FooWithHttps
+class GRest
   include HTTParty
-  base_uri 'api.foo.com/v1:443'
+  base_uri "grest.com"
+  default_params :one => 'two'
 end
 
-describe HTTParty do
+class HRest
+  include HTTParty
+  base_uri "hrest.com"
+  default_params :two => 'three'
+end
 
+describe HTTParty do
+  
   describe "base uri" do
     before do
       Foo.base_uri('api.foo.com/v1')
@@ -20,70 +27,72 @@ describe HTTParty do
     it "should have reader" do
       Foo.base_uri.should == 'http://api.foo.com/v1'
     end
-
+    
     it 'should have writer' do
       Foo.base_uri('http://api.foobar.com')
       Foo.base_uri.should == 'http://api.foobar.com'
     end
-
+  end
+  
+  describe "#normalize_base_uri" do
     it "should add http if not present for non ssl requests" do
-      Foo.base_uri('api.foobar.com')
-      Foo.base_uri.should == 'http://api.foobar.com'
+      uri = HTTParty.normalize_base_uri('api.foobar.com')
+      uri.should == 'http://api.foobar.com'
     end
-
+    
     it "should add https if not present for ssl requests" do
-      Foo.base_uri('api.foo.com/v1:443')
-      Foo.base_uri.should == 'https://api.foo.com/v1:443'
+      uri = HTTParty.normalize_base_uri('api.foo.com/v1:443')
+      uri.should == 'https://api.foo.com/v1:443'
     end
-
+    
     it "should not remove https for ssl requests" do
-      Foo.base_uri('https://api.foo.com/v1:443')
-      Foo.base_uri.should == 'https://api.foo.com/v1:443'
+      uri = HTTParty.normalize_base_uri('https://api.foo.com/v1:443')
+      uri.should == 'https://api.foo.com/v1:443'
     end
   end
-
+  
   describe "headers" do
     it "should default to empty hash" do
       Foo.headers.should == {}
     end
-
+    
     it "should be able to be updated" do
       init_headers = {:foo => 'bar', :baz => 'spax'}
       Foo.headers init_headers
       Foo.headers.should == init_headers
     end
   end
-
+  
   describe "default params" do
     it "should default to empty hash" do
       Foo.default_params.should == {}
     end
-
+    
     it "should be able to be updated" do
       new_defaults = {:foo => 'bar', :baz => 'spax'}
       Foo.default_params new_defaults
       Foo.default_params.should == new_defaults
     end
   end
-
+  
   describe "basic http authentication" do
     it "should work" do
       Foo.basic_auth 'foobar', 'secret'
       Foo.default_options[:basic_auth].should == {:username => 'foobar', :password => 'secret'}
     end
   end
-
+  
   describe "format" do
     it "should allow xml" do
       Foo.format :xml
       Foo.default_options[:format].should == :xml
     end
-
+    
     it "should allow json" do
       Foo.format :json
       Foo.default_options[:format].should == :json
     end
-
+    
     it 'should not allow funky format' do
       lambda do
         Foo.format :foobar
@@ -116,34 +125,53 @@ describe HTTParty do
         Foo.put('/foo', :no_follow => true)
       end.should raise_error(HTTParty::RedirectionTooDeep)
     end
-
-    describe "that respond with redirects" do
-      describe "with explicit override of automatic redirect handling" do
-
-        it "should fail with redirected GET" do
-          lambda do
-            Foo.get('/foo', :no_follow => true)
-          end.should raise_error(HTTParty::RedirectionTooDeep)
-        end
-
-        it "should fail with redirected POST" do
-          lambda do
-            Foo.post('/foo', :no_follow => true)
-          end.should raise_error(HTTParty::RedirectionTooDeep)
-        end
-
-        it "should fail with redirected DELETE" do
-          lambda do
-            Foo.delete('/foo', :no_follow => true)
-          end
-        end
-
-        it "should fail with redirected PUT" do
-          lambda do
-            Foo.put('/foo', :no_follow => true)
-          end
-        end
-      end
+  end
+  
+  describe "with multiple class definitions" do
+    it "should not run over each others options" do
+      HRest.default_options.should == {:base_uri => 'http://hrest.com', :default_params => {:two => 'three'}}
+      GRest.default_options.should == {:base_uri => 'http://grest.com', :default_params => {:one => 'two'}}
+    end
+  end
+  
+  describe "#get" do
+    it "should be able to get html" do
+      stub_http_response_with('google.html')
+      HTTParty.get('http://www.google.com').should == file_fixture('google.html')
+    end
+    
+    it "should be able parse response type json automatically" do
+      stub_http_response_with('twitter.json')
+      tweets = HTTParty.get('http://twitter.com/statuses/public_timeline.json')
+      tweets.size.should == 20
+      tweets.first['user'].should == {
+        "name"              => "Pyk", 
+        "url"               => nil, 
+        "id"                => "7694602", 
+        "description"       => nil, 
+        "protected"         => false, 
+        "screen_name"       => "Pyk", 
+        "followers_count"   => 1, 
+        "location"          => "Opera Plaza, California", 
+        "profile_image_url" => "http://static.twitter.com/images/default_profile_normal.png"
+      }
+    end
+    
+    it "should be able parse response type xml automatically" do
+      stub_http_response_with('twitter.xml')
+      tweets = HTTParty.get('http://twitter.com/statuses/public_timeline.xml')
+      tweets['statuses'].size.should == 20
+      tweets['statuses'].first['user'].should == {
+        "name"              => "Magic 8 Bot", 
+        "url"               => nil, 
+        "id"                => "17656026", 
+        "description"       => "ask me a question", 
+        "protected"         => "false", 
+        "screen_name"       => "magic8bot", 
+        "followers_count"   => "90", 
+        "profile_image_url" => "http://s3.amazonaws.com/twitter_production/profile_images/65565851/8ball_large_normal.jpg", 
+        "location"          => nil
+      }
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,24 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
+require 'rubygems'
+gem 'rspec'
+require 'spec'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty')
+
+def file_fixture(filename)
+  open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read
 end
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty')
+def stub_http_response_with(filename)
+  format = filename.split('.').last.intern
+  data = file_fixture(filename)
+  http = Net::HTTP.new('localhost', 80)
+  
+  response = Net::HTTPOK.new("1.1", 200, "Content for you")
+  response.stub!(:body).and_return(data)
+  http.stub!(:request).and_return(response)
+  
+  http_request = HTTParty::Request.new(Net::HTTP::Get, '')
+  http_request.stub!(:get_response).and_return(response)
+  http_request.stub!(:format).and_return(format)
+  
+  HTTParty::Request.should_receive(:new).and_return(http_request)
+end

data/website/index.html

@@ -65,19 +65,10 @@ Twitter.new('username', 'password').post("It's an HTTParty and everyone is invit
 	</div> 
  
 	<div id="footer"> 
-		<p>Created by <a href="http://addictedtonew.com/about/">John Nunemaker</a></p> 
+		<p>Created by <a href="http://addictedtonew.com/about/">John Nunemaker</a> | 
+		  <a href="http://orderedlist.com/">Hire Me at Ordered List</a></p> 
 	</div> 
 </div> 
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-var pageTracker = _gat._getTracker("UA-85301-19");
-pageTracker._initData();
-pageTracker._trackPageview();
-</script>
  
 </body> 
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alexvollmer-httparty
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,78 +9,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-14 00:00:00 -08:00
-default_executable: 
+date: 2009-01-05 00:00:00 -08:00
+default_executable: httparty
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: json
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.1"
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: echoe
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: "0"
     version: 
 description: Makes http fun! Also, makes consuming restful web services dead easy.
-email: 
-- nunemaker@gmail.com
-executables: []
-
+email: nunemaker@gmail.com
+executables: 
+- httparty
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
+- bin/httparty
+- lib/core_extensions.rb
+- lib/httparty/exceptions.rb
+- lib/httparty/request.rb
+- lib/httparty/version.rb
+- lib/httparty.rb
+- lib/module_level_inheritable_attributes.rb
+- README
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- Rakefile
-- config/hoe.rb
-- config/requirements.rb
+- bin/httparty
 - examples/aaws.rb
+- examples/basic.rb
 - examples/delicious.rb
 - examples/google.rb
+- examples/rubyurl.rb
 - examples/twitter.rb
 - examples/whoismyrep.rb
+- History
 - httparty.gemspec
-- lib/httparty.rb
+- lib/core_extensions.rb
+- lib/httparty/exceptions.rb
 - lib/httparty/request.rb
 - lib/httparty/version.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
+- lib/httparty.rb
+- lib/module_level_inheritable_attributes.rb
+- Manifest
+- MIT-LICENSE
+- Rakefile
+- README
 - setup.rb
+- spec/as_buggery_spec.rb
+- spec/fixtures/delicious.xml
+- spec/fixtures/google.html
+- spec/fixtures/twitter.json
+- spec/fixtures/twitter.xml
 - spec/httparty/request_spec.rb
 - spec/httparty_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
 - website/css/common.css
 - website/index.html
 has_rdoc: true
 homepage: http://httparty.rubyforge.org
 post_install_message: When you HTTParty, you must party hard!
 rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Httparty
 - --main
-- README.txt
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -93,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 

data/History.txt

@@ -1,32 +0,0 @@
-== 0.1.5 2008-11-14
-* 2 major enhancements
-  * Refactored send request method out into its own object.
-  * Added :html format if you just want to do that.
-  
-== 0.1.4 2008-11-08
-* 3 major enhancements:
-  * Removed some cruft
-  * Added ability to follow redirects automatically and turn that off (Alex Vollmer)
-
-== 0.1.3 2008-08-22
-
-* 3 major enhancements:
-	* Added http_proxy key for setting proxy server and port (francxk@gmail.com)
-	* Now raises exception when http error occurs (francxk@gmail.com)
-	* Changed auto format detection from file extension to response content type (Jay Pignata)
-
-== 0.1.2 2008-08-09
-
-* 1 major enhancement:
-	* default_params were not being appended to query string if option[:query] was blank
-
-== 0.1.1 2008-07-30
-
-* 2 major enhancement:
-	* Added :basic_auth key for options when making a request
-	* :query and :body both now work with query string or hash
-
-== 0.1.0 2008-07-27
-
-* 1 major enhancement:
-  * Initial release

data/PostInstall.txt

@@ -1 +0,0 @@
-When you HTTParty, you must party hard!

data/README.txt

@@ -1,66 +0,0 @@
-= httparty
-
-== DESCRIPTION:
-
-Makes http fun again!
-
-== FEATURES/PROBLEMS:
-
-* Easy get, post, put, delete requests
-* Basic http authentication
-* Default request query string parameters (ie: for api keys that are needed on each request)
-* Automatic parsing of JSON and XML into ruby hashes based on response content-type
-
-== SYNOPSIS:
-
-The following is a simple example of wrapping Twitter's API for posting updates.
-
-	class Twitter
-	  include HTTParty
-	  base_uri 'twitter.com'
-	  basic_auth 'username', 'password'
-	end
-
-	Twitter.post('/statuses/update.json', :query => {:status => "It's an HTTParty and everyone is invited!"})
-
-That is really it! The object returned is a ruby hash that is decoded from Twitter's json response. JSON parsing is used because of the .json extension in the path of the request. You can also explicitly set a format (see the examples). 
-
-That works and all but what if you don't want to embed your username and password in the class? Below is an example to fix that:
-
-	class Twitter
-	  include HTTParty
-	  base_uri 'twitter.com'
-
-	  def initialize(u, p)
-	    @auth = {:username => u, :password => p}
-	  end
-
-	  def post(text)
-	    options = { :query => {:status => text}, :basic_auth => @auth }
-	    self.class.post('/statuses/update.json', options)
-	  end
-	end
-	
-	Twitter.new('username', 'password').post("It's an HTTParty and everyone is invited!")
-
-=== REQUEST OPTIONS
-
-Each of the HTTP method (get, post, put and delete) each take a hash of options.
-The following keys can be specified in the options:
-
-headers::       A <tt>Hash</tt> of header key/value pairs
-query::         A <tt>Hash</tt> of query key/value pairs
-body::          The body of the request. If it's a <tt>Hash</tt>, it is
-                converted into query-string format, otherwise it is sent
-                as-is.
-basic_auth::    A <tt>Hash</tt> containing keys for <tt>:username</tt> and
-                <tt>:password</tt>.
-no_follow::     Turns off automatic redirect following
-
-== REQUIREMENTS:
-
-* Active Support >= 2.1
-
-== INSTALL:
-
-* sudo gem install httparty

data/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'httparty/version'
-
-AUTHOR = 'John Nunemaker'  # can also be an array of Authors
-EMAIL = "nunemaker@gmail.com"
-DESCRIPTION = "Makes http fun! Also, makes consuming restful web services dead easy."
-GEM_NAME = 'httparty' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'httparty' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-  ['activesupport', '>= 2.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = HTTParty::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'httparty documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -1,15 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/httparty.rb'}"
-puts "Loading httparty gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)