midwife-client 0.0.9 → 0.0.10

data/lib/midwife/client.rb

@@ -19,7 +19,7 @@ module Midwife
     private
 
     def request(path, attributes)
-      uri = URI.join(@endpoint, 'api', path)
+      uri = join_uri(@endpoint, "api", path)
 
       request = Net::HTTP::Post.new(uri.path)
       request["content-type"] = "application/json"
@@ -43,6 +43,19 @@ module Midwife
         raise RequestError.new(response)
       end
     end
+
+    # Apparently joining URIs in ruby isn't as intuitive as one would
+    # think.  This method helps makes things a little more sane for
+    # our use case.
+    def join_uri(base_uri, *paths)
+      base_uri = URI.parse(base_uri) unless base_uri.is_a?(URI)
+      base_path = base_uri.path
+      base_uri = base_uri.to_s
+      new_path = File.join(base_path, paths)
+
+      URI.join(base_uri, new_path)
+    end
+
   end
 
   class Client

data/lib/midwife/client/version.rb

@@ -1,5 +1,5 @@
 module Midwife
   class Client
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/spec/integration_spec.rb

@@ -12,8 +12,8 @@ describe Midwife::Client do
   describe '#unsubscribe' do
     context 'when the recipient exists' do
       before do
-        stub_request(:post, "http://localhost:3000/unsubscribe").
-          with(:body => "{\"list_id\":42,\"email\":\"exists@email.com\"}").
+        stub_request(:post, "http://localhost:3000/api/unsubscribe").
+          with(:body => { :list_id => 42, :email => 'exists@email.com' }).
           to_return(:body => file_fixture('unsubscribe/recipient_exists.json'))
       end
 
@@ -26,8 +26,8 @@ describe Midwife::Client do
 
     context 'when the recipient does not exist' do
       before do
-        stub_request(:post, "http://localhost:3000/unsubscribe").
-          with(:body => "{\"list_id\":42,\"email\":\"doesnotexist@email.com\"}").
+        stub_request(:post, "http://localhost:3000/api/unsubscribe").
+          with(:body => { :list_id => 42, :email => 'doesnotexist@email.com' }).
           to_return(:status => 404, :body => file_fixture('unsubscribe/recipient_does_not_exist.json'))
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: midwife-client
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Michael Guterl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -04:00
+date: 2011-06-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency