createsend 0.0.2 → 0.1.0

data/lib/client.rb

@@ -102,10 +102,9 @@ class Client
   end
 
   # Sets the monthly billing settings for this client.
-  def set_monthly_billing(currency, can_purchase_credits, client_pays, markup_percentage)
+  def set_monthly_billing(currency, client_pays, markup_percentage)
     options = { :body => { 
       :Currency => currency,
-      :CanPurchaseCredits => can_purchase_credits,
       :ClientPays => client_pays,
       :MarkupPercentage => markup_percentage }.to_json }
     put 'setmonthlybilling', options

data/lib/createsend.rb

@@ -35,7 +35,7 @@ end
 class ClientError < StandardError; end
 class ServerError < StandardError; end
 class BadRequest < CreateSendError; end
-class Unauthorized < ClientError; end
+class Unauthorized < CreateSendError; end
 class NotFound < ClientError; end
 class Unavailable < StandardError; end
 
@@ -43,7 +43,7 @@ class Unavailable < StandardError; end
 class CreateSend
   include HTTParty
 
-  VER = "0.0.2" unless defined?(CreateSend::VER)
+  VER = "0.1.0" unless defined?(CreateSend::VER)
   headers({ 'User-Agent' => "createsend-ruby-#{CreateSend::VER}", 'Content-Type' => 'application/json' })
   base_uri CreateSendOptions['base_uri']
   basic_auth CreateSendOptions['api_key'], 'x'
@@ -100,7 +100,7 @@ class CreateSend
     when 400
       raise BadRequest.new(Hashie::Mash.new response)
     when 401
-      raise Unauthorized.new
+      raise Unauthorized.new(Hashie::Mash.new response)
     when 404
       raise NotFound.new
     when 400...500

data/test/client_test.rb

@@ -105,7 +105,7 @@ class ClientTest < Test::Unit::TestCase
     
     should "set monthly billing" do
       stub_put(@api_key, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
-      @client.set_monthly_billing "CAD", true, true, 150
+      @client.set_monthly_billing "CAD", true, 150
     end
     
     should "delete a client" do

data/test/createsend_test.rb

@@ -64,14 +64,14 @@ class CreateSendTest < Test::Unit::TestCase
     }.each do |status, exception|
       context "#{status.first}, a get" do
         should "raise a #{exception.name} error" do
-          stub_get(@api_key, "countries.json", status.first == '400' ? 'custom_api_error.json' : nil, status)
+          stub_get(@api_key, "countries.json", (status.first == '400' or status.first == '401') ? 'custom_api_error.json' : nil, status)
           lambda { c = @cs.countries }.should raise_error(exception)
         end
       end
 
       context "#{status.first}, a post" do
         should "raise a #{exception.name} error" do
-          stub_post(@api_key, "clients.json", status.first == '400' ? 'custom_api_error.json' : nil, status)
+          stub_post(@api_key, "clients.json", (status.first == '400' or status.first == '401') ? 'custom_api_error.json' : nil, status)
           lambda { Client.create "Client Company Name", "Client Contact Name", "client@example.com", 
             "(GMT+10:00) Canberra, Melbourne, Sydney", "Australia" }.should raise_error(exception)
         end
@@ -79,7 +79,7 @@ class CreateSendTest < Test::Unit::TestCase
       
       context "#{status.first}, a put" do
         should "raise a #{exception.name} error" do
-          stub_put(@api_key, "templates/#{@template.template_id}.json", status.first == '400' ? 'custom_api_error.json' : nil, status)
+          stub_put(@api_key, "templates/#{@template.template_id}.json", (status.first == '400' or status.first == '401') ? 'custom_api_error.json' : nil, status)
           lambda { @template.update "Template One Updated", "http://templates.org/index.html", 
             "http://templates.org/files.zip", "http://templates.org/screenshot.jpg" }.should raise_error(exception)
         end
@@ -87,7 +87,7 @@ class CreateSendTest < Test::Unit::TestCase
       
       context "#{status.first}, a delete" do
         should "raise a #{exception.name} error" do
-          stub_delete(@api_key, "templates/#{@template.template_id}.json", status.first == '400' ? 'custom_api_error.json' : nil, status)
+          stub_delete(@api_key, "templates/#{@template.template_id}.json", (status.first == '400' or status.first == '401') ? 'custom_api_error.json' : nil, status)
           lambda { @template.delete }.should raise_error(exception)
         end
       end

data/test/fixtures/campaign_unsubscribes.json

@@ -2,7 +2,6 @@
   "Results": [
     {
       "EmailAddress": "subs+6576576576@example.com",
-      "URL": "http://video.google.com.au/?hl=en&tab=wv",
       "ListID": "512a3bc577a58fdf689c654329b50fa0",
       "Date": "2010-10-11 08:29:00",
       "IPAddress": "192.168.126.87"

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - James Dennes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +11:00
+date: 2010-11-25 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency