halcyon 0.5.2 → 0.5.3

data/Rakefile

@@ -25,14 +25,14 @@ project = {
     --exclude "^(_darcs|spec|pkg|.svn)/"
   ],
   :dependencies => {
-    'json_pure' => '>=1.1.2',
-    'rack' => '>=0.3.0',
-    'extlib' => '>=0.9.4',
-    'merb' => '>=0.9.4',
-    'rubigen' => '>=1.2.4'
+    'json_pure' => '>= 1.1.2',
+    'rack' => '>= 0.4.0',
+    'extlib' => '>= 0.9.5',
+    'merb-core' => '>= 0.9.5',
+    'rubigen' => '>= 1.2.4'
   },
   :requirements => 'install the json gem to get faster JSON parsing',
-  :ruby_version_required => '>=1.8.6'
+  :ruby_version_required => '>= 1.8.6'
 }
 
 BASEDIR = File.expand_path(File.dirname(__FILE__))

data/lib/halcyon.rb

@@ -15,7 +15,7 @@ $:.unshift File.dirname(__FILE__)
 # 
 module Halcyon
   
-  VERSION = [0,5,2] unless defined?(Halcyon::VERSION)
+  VERSION = [0,5,3] unless defined?(Halcyon::VERSION)
   
   autoload :Application, 'halcyon/application'
   autoload :Client, 'halcyon/client'

data/lib/halcyon/client.rb

@@ -41,8 +41,8 @@ module Halcyon
   class Client
     include Exceptions
     
-    USER_AGENT = "JSON/#{JSON::VERSION} Compatible (en-US) Halcyon::Client/#{Halcyon.version}"
-    CONTENT_TYPE = 'application/json'
+    USER_AGENT = "JSON/#{JSON::VERSION} Compatible (en-US) Halcyon::Client/#{Halcyon.version}".freeze
+    CONTENT_TYPE = "application/x-www-form-urlencoded".freeze
     DEFAULT_OPTIONS = {
       :raise_exceptions => false
     }
@@ -162,8 +162,9 @@ module Halcyon
     # exceptions specifically.
     def request(req, headers={})
       # set default headers
-      req["Content-Type"] = CONTENT_TYPE
       req["User-Agent"] = USER_AGENT
+      req["Content-Type"] = CONTENT_TYPE unless req.body.nil?
+      req["Content-Length"] = req.body unless req.body.nil?
       
       # apply provided headers
       self.headers.merge(headers).each do |(header, value)|
@@ -193,27 +194,7 @@ module Halcyon
     # format according to Net::HTTP for sending through as a Hash.
     def format_body(data)
       data = {:body => data} unless data.is_a? Hash
-      data.to_mash
-      # Hash.to_params (from extlib) doesn't escape keys/values
-      build_query(data)
-    end
-    
-    # Ported over from Rack::Utils.build_query which has not been released yet
-    # as of Halcyon 0.5.2's release.
-    # 
-    # The key difference from this and extlib's Hash.to_params is
-    # that the keys and values are escaped (which cause many problems).
-    # 
-    # TODO: Remove when Rack is released with Rack::Utils.build_query included.
-    # 
-    def build_query(params)
-      params.map { |k, v|
-        if v.class == Array
-          build_query(v.map { |x| [k, x] })
-        else
-          Rack::Utils.escape(k) + "=" + Rack::Utils.escape(v)
-        end
-      }.join("&")
+      Rack::Utils.build_query(data)
     end
     
   end

data/spec/halcyon/client_spec.rb

@@ -62,9 +62,22 @@ describe "Halcyon::Client" do
   
   it "should handle ampersands (and others) in POST data correctly" do
     response = @client.post('/returner', :key => "value1&value2=0")
-    
     response[:status].should == 200
     response[:body].should == {'controller' => 'application', 'action' => 'returner', 'key' => "value1&value2=0"}
+    
+    response = @client.post('/returner', :key => "%todd")
+    response[:status].should == 200
+    response[:body].should == {'controller' => 'application', 'action' => 'returner', 'key' => "%todd"}
+  end
+  
+  it "should not handle percent signs in the URL that are not escaped" do
+    should.raise(EOFError){ @client.post('/returner?key=%todd') }
+  end
+  
+  it "should handle pre-escaped percent signs in the URLs" do
+    response = @client.post('/returner?key=%25todd')
+    response[:status].should == 200
+    response[:body].should == {'controller' => 'application', 'action' => 'returner', 'key' => "%todd"}
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: halcyon
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Matt Todd
@@ -9,28 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-20 00:00:00 -04:00
+date: 2008-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: merb-core
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: merb
+  name: rack
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: json_pure