apify 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/apify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apify}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-03-02}
   s.description = %q{Compact definition of JSON APIs for Rails applications. }
   s.email = %q{github@makandra.de}
   s.extra_rdoc_files = [
@@ -109,7 +109,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/makandra/apify}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Compact definition of JSON APIs for Rails applications.}
   s.test_files = [
     "spec/apify/action_spec.rb",
@@ -154,7 +154,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<jsonschema>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 1.6.1"])

data/lib/apify/client.rb

@@ -3,6 +3,7 @@
 require 'json'
 require 'restclient'
 require 'apify/errors'
+require 'cgi'
 
 module Apify
   class Client
@@ -34,9 +35,13 @@ module Apify
     private
     
     def request(method, path, args = nil)
-      url = build_url(path)
       params = args ? { :args => args.to_json } : {}
-      [:get, :head].include?(method) and params = { :params => params }
+      if [:get, :delete].include?(method)
+        url = build_url(path, params)
+        params = {}
+      else
+        url = build_url(path)
+      end
       json = RestClient.send(method, url, params)
       JSON.parse(json)
     rescue RestClient::Unauthorized => e
@@ -45,7 +50,7 @@ module Apify
       raise Apify::RequestFailed.new("API request failed with status #{e.http_code}", e.http_body)
     end
 
-    def build_url(path)
+    def build_url(path, params = {})
       url =  ""
       url << @protocol
       url << '://'
@@ -53,6 +58,11 @@ module Apify
       url << @host
       url << ":#{@port}" if @port
       url << path
+      unless params.empty?
+        url << '?'
+        url << params.collect { |k, v| "#{k}=#{CGI::escape(v.to_s)}" }.join('&')
+      end
+      url
     end
 
   end

data/spec/apify/client_spec.rb

@@ -35,7 +35,7 @@ describe Apify::Client do
     WebMock.should have_requested(:get, "http://host/api/ping")
   end
 
-  it "should call GET actions correctly" do
+  it "should serialize params into the URL for GET requests" do
     client = Apify::Client.new(:host => 'host')
     args = { :name => 'Jack' }
     stub_request(:get, 'http://host/api/hello').with(:query => { :args => args.to_json }).to_return(:body => '{}')
@@ -43,6 +43,14 @@ describe Apify::Client do
     WebMock.should have_requested(:get, "http://host/api/hello").with(:query => { :args => args.to_json })
   end
 
+  it "should serialize params into the URL for DELETE requests" do
+    client = Apify::Client.new(:host => 'host')
+    args = { :name => 'Jack' }
+    stub_request(:delete, 'http://host/api/terminate').with(:query => { :args => args.to_json }).to_return(:body => '{}')
+    client.delete('/api/terminate', args)
+    WebMock.should have_requested(:delete, "http://host/api/terminate").with(:query => { :args => args.to_json })
+  end
+
   it "should connect using SSL" do
     client = Apify::Client.new(:host => 'host', :protocol => 'https')
     stub_request(:get, 'https://host/api/ping').to_return(:body => '{}')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apify
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: jsonschema
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 6
@@ -163,23 +170,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Compact definition of JSON APIs for Rails applications.