midwife-client 0.0.5 → 0.0.6

data/lib/midwife/client/version.rb

@@ -1,5 +1,5 @@
 module Midwife
   class Client
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/midwife/client.rb

@@ -1,7 +1,6 @@
 require "net/http"
 require "uri"
 require "json"
-require 'excon'
 
 module Midwife
   class RequestError < StandardError
@@ -16,9 +15,17 @@ module Midwife
     private
 
     def request(path, attributes)
-      response = Excon.post(@endpoint + path, :query => attributes)
+      uri = URI.parse(@endpoint + path)
 
-      if response.status.to_s =~ /2../
+      request = Net::HTTP::Post.new(uri.path)
+      request["content-type"] = "application/json"
+      request.body = attributes.to_json
+
+      response = Net::HTTP.start(uri.host, uri.port) { |http|
+        http.request(request)
+      }
+
+      if response.code =~ /2../
         JSON.parse(response.body)
       else
         raise RequestError.new(response)
@@ -43,9 +50,6 @@ module Midwife
         raise ArgumentError, "list_id is required"
       }
 
-      # transform into an array
-      attributes['subscription_ids[]'] = attributes.delete(:subscription_ids) || []
-
       request "/lists/#{list_id}/recipients", attributes
     end
 
@@ -65,6 +69,12 @@ module Midwife
       request "/campaigns/#{campaign_id}/deliver", attributes
     end
 
+    def deliver_campaign_test(attributes)
+      campaign_id = attributes.delete(:campaign_id)
+
+      request "/campaigns/#{campaign_id}/deliver_test", attributes
+    end
+
     def unsubscribe(attributes)
       request "/unsubscribe", attributes
     end

data/midwife-client.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'json'
-  s.add_dependency 'excon', '~> 0.6.3'
 
   s.add_development_dependency 'rspec', '~> 2.5'
 end

data/spec/client_spec.rb

@@ -33,14 +33,6 @@ describe Midwife::Client do
 
     before do
       client.reset
-      @campaign_attributes = {
-        'name'       => 'April 2011 eVetTen',
-        'from_name'  => 'Robert Eversole',
-        'from_email' => 'robert.eversole@recruitmilitary.com',
-        'subject'    => '[RecruitMilitary] April eVetTen',
-        'html_body'  => '<p>Hello world</p>',
-        'plain_body' => 'hello world'
-      }
     end
 
     def last_request
@@ -63,7 +55,7 @@ describe Midwife::Client do
 
         last_request.path.should == "/lists/42/recipients"
         last_request.method.should == :post
-        last_request.params.should == { :email => 'michael@jordan.com', 'subscription_ids[]' => [1, 2] }
+        last_request.params.should == { :email => 'michael@jordan.com', :subscription_ids => [1, 2] }
       end
 
       context 'when list_id is missing' do
@@ -77,11 +69,26 @@ describe Midwife::Client do
 
     describe '#create_campaign' do
       it 'creates a campaign' do
-        client.create_campaign(@campaign_attributes)
+        client.create_campaign(
+          :filters    => [{:column => 'location', :operator => 'near', :value => '45140', :extras => { :distance => 150 }}],
+          :name       => 'April 2011 eVetTen',
+          :from_name  => 'Robert Eversole',
+          :from_email => 'robert.eversole@recruitmilitary.com',
+          :subject    => '[RecruitMilitary] April eVetTen',
+          :html_body  => '<p>Hello world</p>',
+          :plain_body => 'hello world')
 
         last_request.path.should == "/campaigns"
         last_request.method.should == :post
-        last_request.params.should == @campaign_attributes
+        last_request.params.should == {
+          :filters    => [{:column => 'location', :operator => 'near', :value => '45140', :extras => { :distance => 150 }}],
+          :name       => 'April 2011 eVetTen',
+          :from_name  => 'Robert Eversole',
+          :from_email => 'robert.eversole@recruitmilitary.com',
+          :subject    => '[RecruitMilitary] April eVetTen',
+          :html_body  => '<p>Hello world</p>',
+          :plain_body => 'hello world'
+        }
       end
     end
 
@@ -120,15 +127,25 @@ describe Midwife::Client do
         last_request.params.should == { :email => 'foo@bar.com', :list_id => 42 }
       end
     end
+
+    describe '#deliver_campaign_test' do
+      it 'generates the correct request' do
+        client.deliver_campaign_test(:campaign_id => 42, :emails => ['a@b.com', 'c@d.com'])
+
+        last_request.path.should == "/campaigns/42/deliver_test"
+        last_request.method.should == :post
+        last_request.params.should == { :emails => ['a@b.com', 'c@d.com'] }
+      end
+    end
   end
 
   context 'when processing a non-success response' do
     let(:client) { Midwife::Client.new }
-    let(:response) { double(:status => 404) }
+    let(:response) { double(:code => '404') }
 
 
     before do
-      Excon.stub!(:post).and_return(response)
+      Net::HTTP.stub(:start).and_return(response)
     end
 
     it 'raises an exception' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: midwife-client
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Guterl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -04:00
+date: 2011-05-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,26 +32,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: excon
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,7 +46,7 @@ dependencies:
         - 5
         version: "2.5"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: A ruby wrapper for the Midwife HTTP API
 email: 
 - mguterl@gmail.com