createsend 2.0.0 → 2.1.0

data/.travis.yml

@@ -4,4 +4,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
-  - ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    createsend (1.1.1)
+    createsend (2.1.0)
       hashie (~> 1.0)
       httparty (~> 0.8)
       json
@@ -12,6 +12,7 @@ GEM
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    cane (2.0.0)
     fakeweb (1.3.0)
     hashie (1.2.0)
     httparty (0.8.1)
@@ -19,7 +20,7 @@ GEM
       multi_xml
     i18n (0.6.0)
     jnunemaker-matchy (0.4.0)
-    json (1.6.1)
+    json (1.7.4)
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
@@ -37,6 +38,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  cane
   createsend!
   fakeweb (~> 1.3)
   jnunemaker-matchy (~> 0.4)

data/Rakefile

@@ -3,10 +3,29 @@ require "bundler/version"
 require "rake/testtask"
 require "./lib/createsend"
 
+begin
+  if RUBY_VERSION != "1.8.7" # cane not supported on < 1.8.7
+    require 'cane/rake_task'
+
+    desc "Run cane (checks quality metrics)"
+    Cane::RakeTask.new(:quality) do |cane|
+      cane.abc_glob = '{lib,test}/**/*.rb'
+      cane.abc_max = 10
+      puts "running cane."
+    end
+
+    task :default => :quality
+  end
+rescue LoadError
+  warn "cane not available, quality task not provided."
+end
+
+desc "Run tests"
 Rake::TestTask.new(:test) do |test|
   test.ruby_opts = ["-rubygems"] if defined? Gem
   test.libs << "lib" << "test"
   test.pattern = "test/**/*_test.rb"
+  puts "running tests."
 end
 
 desc "Build the gem"

data/createsend.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jnunemaker-matchy', '~> 0.4')
   s.add_development_dependency('mocha', '~> 0.9')
   s.add_development_dependency('shoulda', '~> 3.1.1')
+  s.add_development_dependency('cane')
   s.add_runtime_dependency('json')
   s.add_runtime_dependency('hashie', '~> 1.0')
   s.add_runtime_dependency('httparty', '~> 0.8')
@@ -18,7 +19,7 @@ Gem::Specification.new do |s|
   s.email = ["jdennes@gmail.com"]
   s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   s.files = `git ls-files`.split("\n")
-  s.homepage = "http://github.com/campaignmonitor/createsend-ruby/"
+  s.homepage = "http://campaignmonitor.github.com/createsend-ruby/"
   s.require_paths = ["lib"]
   s.summary = %q{A library which implements the complete functionality of v3 of the createsend API.}
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/createsend/client.rb

@@ -124,11 +124,14 @@ module CreateSend
     end
 
     # Sets the monthly billing settings for this client.
-    def set_monthly_billing(currency, client_pays, markup_percentage)
+    # monthly_scheme must be nil, Basic or Unlimited
+    def set_monthly_billing(currency, client_pays, markup_percentage,
+      monthly_scheme = nil)
       options = { :body => {
         :Currency => currency,
         :ClientPays => client_pays,
-        :MarkupPercentage => markup_percentage }.to_json }
+        :MarkupPercentage => markup_percentage,
+        :MonthlyScheme => monthly_scheme }.to_json }
       put 'setmonthlybilling', options
     end
 

data/lib/createsend/version.rb

@@ -1,3 +1,3 @@
 module CreateSend
-  VERSION = "2.0.0" unless defined?(CreateSend::VERSION)
+  VERSION = "2.1.0" unless defined?(CreateSend::VERSION)
 end

data/test/client_test.rb

@@ -23,6 +23,7 @@ class ClientTest < Test::Unit::TestCase
       cl.BasicDetails.ContactName.should == "Client One (contact)"
       cl.AccessDetails.Username.should == "clientone"
       cl.AccessDetails.AccessLevel.should == 23
+      cl.BillingDetails.MonthlyScheme.should == "Basic"
     end
 
     should "get all campaigns" do
@@ -146,12 +147,28 @@ class ClientTest < Test::Unit::TestCase
       stub_put(@api_key, "clients/#{@client.client_id}/setpaygbilling.json", nil)
       @client.set_payg_billing "CAD", true, true, 150
     end
-
-    should "set monthly billing" do
+    
+    should "set monthly billing (implicit)" do
       stub_put(@api_key, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
-      @client.set_monthly_billing "CAD", true, 150
+      @client.set_monthly_billing "CAD", true, 150 
+      request = FakeWeb.last_request.body
+      assert_equal("{\"Currency\":\"CAD\",\"ClientPays\":true,\"MarkupPercentage\":150,\"MonthlyScheme\":null}", request, "Request wasn't as expected")
     end
 
+    should "set monthly billing (basic)" do
+      stub_put(@api_key, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
+      @client.set_monthly_billing "CAD", true, 150, "Basic"
+      request = FakeWeb.last_request.body
+      assert_equal("{\"Currency\":\"CAD\",\"ClientPays\":true,\"MarkupPercentage\":150,\"MonthlyScheme\":\"Basic\"}", request, "Request wasn't as expected")
+    end
+       
+    should "set monthly billing (unlimited)" do
+      stub_put(@api_key, "clients/#{@client.client_id}/setmonthlybilling.json", nil)
+      @client.set_monthly_billing "CAD", false, 120, "Unlimited"
+      request = FakeWeb.last_request.body
+      assert_equal("{\"Currency\":\"CAD\",\"ClientPays\":false,\"MarkupPercentage\":120,\"MonthlyScheme\":\"Unlimited\"}", request, "Request wasn't as expected")
+    end
+     
     should "delete a client" do
       stub_delete(@api_key, "clients/#{@client.client_id}.json", nil)
       @client.delete

data/test/fixtures/client_details.json

@@ -21,6 +21,7 @@
      "MarkupOnDelivery": 0.0,
      "BaseDeliveryRate": 5.0,
      "Currency": "USD",
-     "BaseDesignSpamTestRate": 5.0
+     "BaseDesignSpamTestRate": 5.0,
+     "MonthlyScheme": "Basic"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: createsend
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70279968073360 !ruby/object:Gem::Requirement
+  requirement: &70108177254420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279968073360
+  version_requirements: *70108177254420
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70279968072660 !ruby/object:Gem::Requirement
+  requirement: &70108177253700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70279968072660
+  version_requirements: *70108177253700
 - !ruby/object:Gem::Dependency
   name: jnunemaker-matchy
-  requirement: &70279968072160 !ruby/object:Gem::Requirement
+  requirement: &70108177252980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70279968072160
+  version_requirements: *70108177252980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70279968071620 !ruby/object:Gem::Requirement
+  requirement: &70108177249420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70279968071620
+  version_requirements: *70108177249420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70279968070900 !ruby/object:Gem::Requirement
+  requirement: &70108177248920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,21 @@ dependencies:
         version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *70279968070900
+  version_requirements: *70108177248920
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: &70108177248500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70108177248500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70279968070360 !ruby/object:Gem::Requirement
+  requirement: &70108177248020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70279968070360
+  version_requirements: *70108177248020
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70279968069500 !ruby/object:Gem::Requirement
+  requirement: &70108177247440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70279968069500
+  version_requirements: *70108177247440
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70279968068780 !ruby/object:Gem::Requirement
+  requirement: &70108177246860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +109,7 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70279968068780
+  version_requirements: *70108177246860
 description: Implements the complete functionality of the createsend API.
 email:
 - jdennes@gmail.com
@@ -189,7 +200,7 @@ files:
 - test/segment_test.rb
 - test/subscriber_test.rb
 - test/template_test.rb
-homepage: http://github.com/campaignmonitor/createsend-ruby/
+homepage: http://campaignmonitor.github.com/createsend-ruby/
 licenses: []
 post_install_message: 
 rdoc_options: []