jnunemaker-httparty 0.4.1 → 0.4.2

data/History

@@ -1,3 +1,8 @@
+== 0.4.2 209-03-30
+* 2 minor changes
+  * response code now returns an integer instead of a string (jqr)
+  * rubyforge project setup for crack so i'm now depending on that instead of jnunemaker-crack
+
 == 0.4.1 2009-03-29
 * 1 minor fix
   * gem 'jnunemaker-crack' instead of gem 'crack'

data/Rakefile

@@ -14,7 +14,7 @@ Echoe.new(ProjectName, HTTParty::Version) do |p|
   p.url             = "http://#{ProjectName}.rubyforge.org"
   p.author          = "John Nunemaker"
   p.email           = "nunemaker@gmail.com"
-  p.extra_deps      = [['jnunemaker-crack', '>= 0.1.0']]
+  p.extra_deps      = [['crack', '>= 0.1.1']]
   p.need_tar_gz     = false
   p.docs_host       = WebsitePath
 end

data/features/steps/httparty_response_steps.rb

@@ -17,7 +17,7 @@ Then /it should return a Hash equaling:/ do |hash_table|
 end
 
 Then /it should return a response with a (\d+) response code/ do |code|
-  @response_from_httparty.code.should eql(code)
+  @response_from_httparty.code.should eql(code.to_i)
 end
 
 Then /it should raise an HTTParty::RedirectionTooDeep exception/ do

data/httparty.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-03-29}
+  s.date = %q{2009-04-02}
   s.default_executable = %q{httparty}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.email = %q{nunemaker@gmail.com}
@@ -21,4 +21,20 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{httparty}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<crack>, [">= 0.1.1"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<crack>, [">= 0.1.1"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<crack>, [">= 0.1.1"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
 end

data/lib/httparty.rb

@@ -4,7 +4,7 @@ require 'net/http'
 require 'net/https'
 require 'httparty/module_inheritable_attributes'
 require 'rubygems'
-gem 'jnunemaker-crack'
+gem 'crack'
 require 'crack'
 
 module HTTParty
@@ -18,7 +18,8 @@ module HTTParty
     'text/javascript'        => :json,
     'text/html'              => :html,
     'application/x-yaml'     => :yaml,
-    'text/yaml'              => :yaml
+    'text/yaml'              => :yaml,
+    'text/plain'             => :plain
   } unless defined?(AllowedFormats)
   
   def self.included(base)
@@ -101,7 +102,7 @@ module HTTParty
     #     format :json
     #   end
     def format(f)
-      raise UnsupportedFormat, "Must be one of: #{AllowedFormats.values.join(', ')}" unless AllowedFormats.value?(f)
+      raise UnsupportedFormat, "Must be one of: #{AllowedFormats.values.uniq.join(', ')}" unless AllowedFormats.value?(f)
       default_options[:format] = f
     end
     
@@ -166,13 +167,14 @@ module HTTParty
   end
 
   def self.normalize_base_uri(url) #:nodoc:
-    use_ssl = (url =~ /^https/) || url.include?(':443')
-    ends_with_slash = url =~ /\/$/
+    normalized_url = url.dup
+    use_ssl = (normalized_url =~ /^https/) || normalized_url.include?(':443')
+    ends_with_slash = normalized_url =~ /\/$/
     
-    url.chop! if ends_with_slash
-    url.gsub!(/^https?:\/\//i, '')
+    normalized_url.chop! if ends_with_slash
+    normalized_url.gsub!(/^https?:\/\//i, '')
     
-    "http#{'s' if use_ssl}://#{url}"
+    "http#{'s' if use_ssl}://#{normalized_url}"
   end
   
   class Basement #:nodoc:

data/lib/httparty/response.rb

@@ -6,7 +6,7 @@ module HTTParty
     def initialize(delegate, body, code, headers={})
       @delegate = delegate
       @body = body
-      @code = code
+      @code = code.to_i
       @headers = headers
     end
 

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty #:nodoc:
-  Version = '0.4.1'
+  Version = '0.4.2'
 end

data/spec/httparty/response_spec.rb

@@ -5,7 +5,7 @@ describe HTTParty::Response do
     before do
       @response_object = {'foo' => 'bar'}
       @body = "{foo:'bar'}"
-      @code = 200
+      @code = '200'
       @response = HTTParty::Response.new(@response_object, @body, @code)
     end
     
@@ -18,7 +18,11 @@ describe HTTParty::Response do
     end
     
     it "should set code" do
-      @response.code.should == @code
+      @response.code.should.to_s == @code
+    end
+
+    it "should set code as a Fixnum" do
+      @response.code.should be_an_instance_of(Fixnum)
     end
   end
   

data/spec/httparty_spec.rb

@@ -19,6 +19,12 @@ describe HTTParty do
       @klass.base_uri('http://api.foobar.com')
       @klass.base_uri.should == 'http://api.foobar.com'
     end
+
+    it 'should not modify the parameter during assignment' do
+      uri = 'http://api.foobar.com'
+      @klass.base_uri(uri)
+      uri.should == 'http://api.foobar.com'
+    end
   end
   
   describe "#normalize_base_uri" do
@@ -36,6 +42,12 @@ describe HTTParty do
       uri = HTTParty.normalize_base_uri('https://api.foo.com/v1:443')
       uri.should == 'https://api.foo.com/v1:443'
     end
+
+    it 'should not modify the parameter' do
+      uri = 'http://api.foobar.com'
+      HTTParty.normalize_base_uri(uri)
+      uri.should == 'http://api.foobar.com'
+    end
   end
   
   describe "headers" do
@@ -149,11 +161,23 @@ describe HTTParty do
       @klass.default_options[:format].should == :yaml
     end
     
+    it "should allow plain" do
+      @klass.format :plain
+      @klass.default_options[:format].should == :plain
+    end
+    
     it 'should not allow funky format' do
       lambda do
         @klass.format :foobar
       end.should raise_error(HTTParty::UnsupportedFormat)
     end
+
+    it 'should only print each format once with an exception' do
+      lambda do
+        @klass.format :foobar
+      end.should raise_error(HTTParty::UnsupportedFormat, "Must be one of: json, plain, html, yaml, xml")
+    end
+
   end
 
   describe "with explicit override of automatic redirect handling" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-httparty
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-04-02 00:00:00 -07:00
 default_executable: httparty
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: crack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Makes http fun! Also, makes consuming restful web services dead easy.
 email: nunemaker@gmail.com
 executables: