madmimi 1.0.13 → 1.0.14

data/README.rdoc

@@ -59,6 +59,10 @@ plain_text = "Plain text email contents [[unsubscribe]]"
 
 mimi.send_plaintext(options, plain_text)
 
+=== Getting the status of a transactional mailing
+
+mimi.status('transaction_id') -> get the status on a specific transactional mailing
+
 === Return values
 
 In most cases, a return value of a single space indicates success.
@@ -92,6 +96,7 @@ will be those for an already-existing "audience."
 
 == Contributors
 tuker
+marcheiligers
 
 == Copyright
 

data/Rakefile

@@ -10,10 +10,10 @@ begin
     gem.email = "nicholas@madmimi.com"
     gem.homepage = "http://github.com/madmimi/madmimi-gem"
     gem.authors = ["Nicholas Young", "Marc Heiligers"]
-    gem.add_dependency "crack", "0.1.7"
-    gem.add_development_dependency "jeweler", "1.4.0"
-    gem.add_development_dependency "fakeweb", "1.2.8"
-    gem.add_development_dependency "shoulda", "2.10.3"
+    gem.add_dependency "crack", ">0.1.7"
+    gem.add_development_dependency "jeweler", ">1.4"
+    gem.add_development_dependency "fakeweb", ">1.2"
+    gem.add_development_dependency "shoulda", ">2.10"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.13
+1.0.14

data/lib/madmimi.rb

@@ -48,6 +48,7 @@ class MadMimi
   SEARCH_PATH = '/audience_members/search.xml'
   MAILER_PATH = '/mailer'
   MAILER_TO_LIST_PATH = '/mailer/to_list'
+  MAILER_STATUS_PATH = '/mailers/status'
 
   def initialize(username, api_key)
     @api_settings = { :username => username, :api_key => api_key }
@@ -172,6 +173,10 @@ class MadMimi
       do_request(MAILER_PATH, :post, options, true)
     end
   end
+  
+  def status(transaction_id)
+    do_request "#{MAILER_STATUS_PATH}/#{transaction_id}", :get, {}, true
+  end
 
   private
 
@@ -180,10 +185,19 @@ class MadMimi
     options = options.merge(default_opt)
     form_data = options.inject({}) { |m, (k, v)| m[k.to_s] = v; m }
     resp = href = ""
+    
+    if transactional == true
+      http = Net::HTTP.new(BASE_URL, 443)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    else
+      http = Net::HTTP.new(BASE_URL, 80)
+    end
+    
     case req_type
+    
     when :get then
       begin
-        http = Net::HTTP.new(BASE_URL, 80)
         http.start do |http|
           req = Net::HTTP::Get.new(path)
           req.set_form_data(form_data)
@@ -196,13 +210,6 @@ class MadMimi
       end
     when :post then
       begin
-        if transactional == true
-          http = Net::HTTP.new(BASE_URL, 443)
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        else
-          http = Net::HTTP.new(BASE_URL, 80)
-        end
         http.start do |http|
           req = Net::HTTP::Post.new(path)
           req.set_form_data(form_data)

data/madmimi.gemspec

@@ -1,43 +1,41 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{madmimi}
-  s.version = "1.0.13"
+  s.version = "1.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicholas Young", "Marc Heiligers"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2011-03-18}
   s.description = %q{Send emails, track statistics, and manage your subscriber base with ease.}
   s.email = %q{nicholas@madmimi.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/madmimi.rb",
-     "madmimi.gemspec",
-     "test/fixtures/lists.xml",
-     "test/fixtures/promotions.xml",
-     "test/fixtures/search.xml",
-     "test/helper.rb",
-     "test/test_madmimi.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/madmimi.rb",
+    "madmimi.gemspec",
+    "test/fixtures/lists.xml",
+    "test/fixtures/promotions.xml",
+    "test/fixtures/search.xml",
+    "test/helper.rb",
+    "test/test_madmimi.rb"
   ]
   s.homepage = %q{http://github.com/madmimi/madmimi-gem}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Mad Mimi API wrapper for Ruby}
   s.test_files = [
     "test/helper.rb",
-     "test/test_madmimi.rb"
+    "test/test_madmimi.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -45,21 +43,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<crack>, ["= 0.1.7"])
-      s.add_development_dependency(%q<jeweler>, ["= 1.4.0"])
-      s.add_development_dependency(%q<fakeweb>, ["= 1.2.8"])
-      s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<crack>, ["> 0.1.7"])
+      s.add_development_dependency(%q<jeweler>, ["> 1.4"])
+      s.add_development_dependency(%q<fakeweb>, ["> 1.2"])
+      s.add_development_dependency(%q<shoulda>, ["> 2.10"])
     else
-      s.add_dependency(%q<crack>, ["= 0.1.7"])
-      s.add_dependency(%q<jeweler>, ["= 1.4.0"])
-      s.add_dependency(%q<fakeweb>, ["= 1.2.8"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<crack>, ["> 0.1.7"])
+      s.add_dependency(%q<jeweler>, ["> 1.4"])
+      s.add_dependency(%q<fakeweb>, ["> 1.2"])
+      s.add_dependency(%q<shoulda>, ["> 2.10"])
     end
   else
-    s.add_dependency(%q<crack>, ["= 0.1.7"])
-    s.add_dependency(%q<jeweler>, ["= 1.4.0"])
-    s.add_dependency(%q<fakeweb>, ["= 1.2.8"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<crack>, ["> 0.1.7"])
+    s.add_dependency(%q<jeweler>, ["> 1.4"])
+    s.add_dependency(%q<fakeweb>, ["> 1.2"])
+    s.add_dependency(%q<shoulda>, ["> 2.10"])
   end
 end
 

data/test/helper.rb

@@ -17,22 +17,27 @@ def fixture_file(filename)
 end
 
 def madmimi_url(url, https = false)
-  if https = false
-    url =~ /^http/ ? url : "http://api.madmimi.com#{url}"
-  else
+  if https
     url =~ /^https/ ? url : "https://api.madmimi.com#{url}"
+  else
+    url =~ /^http/ ? url : "http://api.madmimi.com#{url}"
   end
 end
 
-def stub_get(url, filename, status = nil)
-  options = { :body => fixture_file(filename) }
-  options.merge!({ :status => status }) unless status.nil?
-  FakeWeb.register_uri(:get, madmimi_url(url), options)
+def stub_get(url, options = {})
+  https = options.delete(:https)
+  
+  filename = options.delete(:filename)
+  options = { :body => fixture_file(filename) } if filename
+  
+  FakeWeb.register_uri(:get, madmimi_url(url, https), options)
 end
 
-# In the process of tweaking this. - Nicholas
 def stub_post(url, filename = nil, status = nil)
-  options = { :body => "" }
-  options.merge!({ :status => status }) unless status.nil?
-  FakeWeb.register_url(:get, madmimi_url(url), options)
+  https = options.delete(:https)
+  
+  filename = options.delete(:filename)
+  options = { :body => fixture_file(filename) } if filename
+  
+  FakeWeb.register_uri(:post, madmimi_url(url, https), options)
 end

data/test/test_madmimi.rb

@@ -1,27 +1,33 @@
 require 'helper'
 
 class TestMadmimi < Test::Unit::TestCase
-  context "A API call" do
+  context "An API call" do
     setup do
       @mimi = MadMimi.new('email@example.com', 'testapikey')
     end
     
     should "retrieve a hash of promotions" do
-      stub_get('/promotions.xml', 'promotions.xml')
+      stub_get('/promotions.xml', { :filename => 'promotions.xml'})
       response = @mimi.promotions
       flunk "I couldn't find any promotions." unless response.kind_of?(Hash) || !response.empty?
     end
     
     should "retrieve a hash of lists" do
-      stub_get('/audience_lists/lists.xml', 'lists.xml')
+      stub_get('/audience_lists/lists.xml', { :filename => 'lists.xml'})
       response = @mimi.lists
       flunk "Doesn't return any lists." unless response.kind_of?(Hash) || !response.empty?
     end
     
     should "retrieve a hash of users found with the search term nicholas" do
-      stub_get('/audience_members/search.xml?query=nicholas', 'search.xml')
+      stub_get('/audience_members/search.xml?query=nicholas', { :filename => 'search.xml'})
       response = @mimi.audience_search('nicholas')
       flunk "No users found." unless response.kind_of?(Hash) || !response.empty?
     end
+    
+    should "get a transactional mailing status" do
+      stub_get('/mailers/status/1234', { :https => true, :body => "sent" })
+      response = @mimi.status(1234)
+      assert_equal "sent", response
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: madmimi
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 14
+  version: 1.0.14
 platform: ruby
 authors: 
 - Nicholas Young
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 -05:00
+date: 2011-03-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -41,14 +41,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
         - 1
         - 4
-        - 0
-        version: 1.4.0
+        version: "1.4"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,14 +56,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 1
         - 2
-        - 8
-        version: 1.2.8
+        version: "1.2"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -73,14 +71,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 23
         segments: 
         - 2
         - 10
-        - 3
-        version: 2.10.3
+        version: "2.10"
   type: :development
   version_requirements: *id004
 description: Send emails, track statistics, and manage your subscriber base with ease.
@@ -93,7 +90,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -110,8 +106,8 @@ homepage: http://github.com/madmimi/madmimi-gem
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,3 +0,0 @@
-pkg
-*.gem
-tags