pebblebed 0.0.11 → 0.0.12

data/lib/pebblebed/http.rb

@@ -54,18 +54,20 @@ module Pebblebed
     end
 
     def self.post(url, params, &block)
-      url, params = url_and_params_from_args(url, params, &block)      
-      handle_curl_response(Curl::Easy.http_post(url.to_s, params.to_json) do |curl|
+      url, params = url_and_params_from_args(url, params, &block)
+      body = params.is_a?(String) ? params : params.to_json
+      handle_curl_response(Curl::Easy.http_post(url.to_s, body) do |curl|
         curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = 'application/json'
+        curl.headers['Content-Type'] = params.is_a?(String) ? 'text/plain' : 'application/json'
       end)
     end
 
     def self.put(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)      
-      handle_curl_response(Curl::Easy.http_put(url.to_s, params.to_json) do |curl|
+      body = params.is_a?(String) ? params : params.to_json
+      handle_curl_response(Curl::Easy.http_put(url.to_s, body) do |curl|
         curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = 'application/json'
+        curl.headers['Content-Type'] = params.is_a?(String) ? 'text/plain' : 'application/json'
       end)
     end
 

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/http_spec.rb

@@ -1,6 +1,24 @@
 require 'spec_helper'
 
 describe Pebblebed::Http do 
+
+  let :mock_pebble do
+    MockPebble.new
+  end
+
+  let :pebble_url do
+    "http://localhost:8666/api/mock/v1/echo"
+  end
+
+  before :all do
+    # Starts the mock pebble at localhost:8666/api/mock/v1
+    mock_pebble.start
+  end
+
+  after :all do
+    mock_pebble.shutdown
+  end
+
   it "knows how to pack params into a http query string" do
     Pebblebed::Http.send(:url_with_params, URI("/dingo/"), {a:1}).should eq "/dingo/?a=1"
   end
@@ -25,4 +43,28 @@ describe Pebblebed::Http do
     -> { Pebblebed::Http.send(:handle_http_errors, DeepStruct.wrap(status:400, url:"/foobar", body:"Oh noes")) }.should raise_error Pebblebed::HttpError
   end
 
+  it "encodes posts and puts as json if the params is a hash" do
+    ['post', 'put'].each do |method|    
+      response = Pebblebed::Http.send(method.to_sym, pebble_url, {hello:'world'})
+      result = JSON.parse(response.body)
+      result["CONTENT_TYPE"].should eq "application/json"
+      JSON.parse(result["BODY"])['hello'].should eq 'world'
+    end
+  end
+
+  it "encodes posts and puts as text/plain if param is string" do
+    ['post', 'put'].each do |method|    
+      response = Pebblebed::Http.send(method.to_sym, pebble_url, "Hello world")
+      result = JSON.parse(response.body)
+      result["CONTENT_TYPE"].should eq "text/plain"
+      result["BODY"].should eq "Hello world"
+    end
+  end
+
+  it "encodes gets as url params" do
+    response = Pebblebed::Http.get(pebble_url, {hello: 'world'})
+    result = JSON.parse(response.body)
+    result["QUERY_STRING"].should eq "hello=world"
+  end
+
 end

data/spec/mock_pebble.rb

@@ -0,0 +1,60 @@
+# A simple echo service that emulates a pebble for the purpose of
+# testing http interactions. The mock pebble is mounted at 
+# http://localhost:8666/api/mock/v1
+
+require 'webrick'
+require 'json'
+
+class MockPebble
+  class Servlet < WEBrick::HTTPServlet::AbstractServlet
+
+    def do_GET(request, response)
+      status, content_type, body = do_stuff_with(request)
+      
+      response.status = status
+      response['Content-Type'] = content_type
+      response.body = body
+    end
+
+    def do_POST(request, response)
+      status, content_type, body = do_stuff_with(request)
+      
+      response.status = status
+      response['Content-Type'] = content_type
+      response.body = body
+    end
+
+    def do_PUT(request, response)
+      status, content_type, body = do_stuff_with(request)
+      
+      response.status = status
+      response['Content-Type'] = content_type
+      response.body = body
+    end
+
+    def do_DELETE(request, response)
+      status, content_type, body = do_stuff_with(request)
+      
+      response.status = status
+      response['Content-Type'] = content_type
+      response.body = body
+    end
+    
+    def do_stuff_with(request)
+      return 200, "application/json", request.meta_vars.merge("BODY" => request.body).to_json
+    end
+  end
+
+  def start
+    @server = WEBrick::HTTPServer.new(:Port => 8666, :AccessLog => [])
+    @server.mount "/api/mock/v1", Servlet
+    @server_thread = Thread.new do
+      @server.start
+    end
+  end
+
+  def shutdown
+    @server_thread.kill
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'simplecov'
 require './spec/mockcached'
+require './spec/mock_pebble'
 require 'bundler'
 require 'rspec'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70169859432760 !ruby/object:Gem::Requirement
+  requirement: &70251259507760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169859432760
+  version_requirements: *70251259507760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70169859432160 !ruby/object:Gem::Requirement
+  requirement: &70251259507040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169859432160
+  version_requirements: *70251259507040
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70169859431360 !ruby/object:Gem::Requirement
+  requirement: &70251259506620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70169859431360
+  version_requirements: *70251259506620
 - !ruby/object:Gem::Dependency
   name: deepstruct
-  requirement: &70169859430280 !ruby/object:Gem::Requirement
+  requirement: &70251259506200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859430280
+  version_requirements: *70251259506200
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70169859429020 !ruby/object:Gem::Requirement
+  requirement: &70251259505620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70169859429020
+  version_requirements: *70251259505620
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70169859427740 !ruby/object:Gem::Requirement
+  requirement: &70251259505140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859427740
+  version_requirements: *70251259505140
 - !ruby/object:Gem::Dependency
   name: queryparams
-  requirement: &70169859427260 !ruby/object:Gem::Requirement
+  requirement: &70251259504540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859427260
+  version_requirements: *70251259504540
 - !ruby/object:Gem::Dependency
   name: futurevalue
-  requirement: &70169859426620 !ruby/object:Gem::Requirement
+  requirement: &70251259497380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859426620
+  version_requirements: *70251259497380
 - !ruby/object:Gem::Dependency
   name: pathbuilder
-  requirement: &70169859425580 !ruby/object:Gem::Requirement
+  requirement: &70251259495900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859425580
+  version_requirements: *70251259495900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70169859415540 !ruby/object:Gem::Requirement
+  requirement: &70251259495400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859415540
+  version_requirements: *70251259495400
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70169859414820 !ruby/object:Gem::Requirement
+  requirement: &70251259494960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859414820
+  version_requirements: *70251259494960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70169859412820 !ruby/object:Gem::Requirement
+  requirement: &70251259494220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70169859412820
+  version_requirements: *70251259494220
 description: Development tools for working with Pebblebed
 email:
 - katrina@bengler.no
@@ -175,6 +175,7 @@ files:
 - spec/connector_spec.rb
 - spec/generic_client_spec.rb
 - spec/http_spec.rb
+- spec/mock_pebble.rb
 - spec/mockcached.rb
 - spec/spec_helper.rb
 - spec/uid_spec.rb
@@ -208,6 +209,7 @@ test_files:
 - spec/connector_spec.rb
 - spec/generic_client_spec.rb
 - spec/http_spec.rb
+- spec/mock_pebble.rb
 - spec/mockcached.rb
 - spec/spec_helper.rb
 - spec/uid_spec.rb