messagebus-sdk 4.1.1 → 5.0.0

data/README.md

@@ -28,7 +28,7 @@ If you have questions not answered by the samples or the online documentation, p
     require 'messagebus-sdk/api_client'
 
     api_key="12345678934628542E2599F7ED712345"
-    api_host="https://api-v4.messagebus.com"
+    api_host="https://api.messagebus.com"
 
     client = MessagebusApiClient.new(api_key, api_host)
 
@@ -39,6 +39,7 @@ If you have questions not answered by the samples or the online documentation, p
          :toName => 'Bobby Flay',
          :fromEmail => 'alice@example.com',
          :fromName => 'Alice Waters',
+         :returnPath => 'bounces@bounces.example.com',
          :subject => 'Sample Message with HTML body.',
          :customHeaders => {"x-messagebus-sdk"=>"ruby-sdk"},
          :plaintextBody => 'This is the plain text body.',
@@ -48,6 +49,7 @@ If you have questions not answered by the samples or the online documentation, p
          :toName => 'Jamie Lauren',
          :fromEmail => 'alice@example.com',
          :fromName => 'Alice Waters',
+         :returnPath => 'bounces@bounces.example.com',
          :subject => 'Simple Example with no HTML body.',
          :customHeaders => {"x-messagebus-sdk"=>"ruby-sdk"},
          :plaintextBody => 'This is the plaintext example.',
@@ -76,7 +78,7 @@ If you have questions not answered by the samples or the online documentation, p
     class MessagebusMailer < MessagebusActionMailerClient
       def initialize(*args)
         api_key = "12345678934628542E2599F7ED712345"
-        api_endpoint = "https://api-v4.messagebus.com"
+        api_endpoint = "https://api.messagebus.com"
         super(api_key, api_endpoint)
       end
     end
@@ -101,77 +103,11 @@ If you have questions not answered by the samples or the online documentation, p
     message = MessageBusActionMailerTest.test_message(to_email, session_key)
     message.deliver
 
-####Checking email statistics
-
-    require 'messagebus-sdk/stats_client'
-
-    api_key = "12345678934628542E2599F7ED712345"
-    api_host = "https://api-v4.messagebus.com"
-
-    client = MessagebusStatsClient.new(api_key, api_host)
-
-    begin
-      response = client.stats
-      if response[:statusCode] == 200
-        stats = response[:stats]
-        puts "Stats"
-        puts "\tMessages Attempted: #{stats[:msgsAttemptedCount]}"
-        puts "\tComplaint Count: #{stats[:complaintCount]}"
-        puts "\tUnsubscribe Count: #{stats[:unsubscribeCount]}"
-        puts "\tOpen Count: #{stats[:openCount]}"
-        puts "\tUnique Open Count: #{stats[:uniqueOpenCount]}"
-        puts "\tClick Count: #{stats[:clickCount]}"
-
-        smtp = response[:smtp]
-        puts "SMTP"
-        puts "\tAccept Count: #{smtp[:acceptCount]}"
-        puts "\tBounce Count: #{smtp[:bounceCount]}"
-        puts "\tReject Count: #{smtp[:rejectCount]}"
-        puts "\tError Count: #{smtp[:errorCount]}"
-
-        filter = response[:filter]
-        puts "Filter"
-        puts "\tBad Mailbox Count: #{filter[:rcptBadMailboxCount]}"
-        puts "\tChannel Block Count: #{filter[:rcptChannelBlockCount]}"
-
-      else
-        puts "#{response[:statusMessage]}"
-      end
-    rescue Exception=>e
-      puts "Exception thrown.  Error during stats retrieval: #{e.message}"
-    end
-
-#### Checking email feedback data
-
-    require 'messagebus-sdk/feedback_client'
-
-    api_key = "12345678934628542E2599F7ED712345"
-    api_host = "https://api-v4.messagebus.com"
-
-    client = MessagebusFeedbackClient.new(api_key, api_host)
-
-    begin
-      response = client.feedback
-      if response[:statusCode] == 200
-        puts "Bounces"
-        response[:bounces].each do |bounce|
-          puts "Email: #{bounce[:email]} Count: #{bounce[:count]} BounceCode: #{bounce[:bounceCode]} LastEventTime: #{bounce[:lastEventTime]}"
-        end
-        puts "Clicks"
-        response[:clicks].each do |click|
-          puts "Email: #{click[:email]} Count: #{click[:count]} LastEventTime: #{click[:lastEventTime]}"
-        end
-      else
-        puts "#{response[:statusMessage]}"
-      end
-    rescue Exception=>e
-      puts "Exception thrown.  Error during feedback retrieval: #{e.message}"
-    end
 
 #### License
 
 
-    Copyright (c) 2013 Mail Bypass, Inc.
+    Copyright (c) 2014 Message Bus
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
     with the License. You may obtain a copy of the License at

data/lib/messagebus-sdk/actionmailer_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain

data/lib/messagebus-sdk/api_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -58,11 +58,11 @@ class MessagebusApiClient < MessagebusSDK::MessagebusBase
 
   def define_rest_endpoints
     {
-      :message_emails_send => "/api/v4/message/email/send",
-      :channels => "/api/v4/channels",
-      :channel_config => "/api/v4/channel/%CHANNEL_KEY%/config",
-      :channel_sessions => "/api/v4/channel/%CHANNEL_KEY%/sessions",
-      :channel_session_rename => "/api/v4/channel/%CHANNEL_KEY%/session/%SESSION_KEY%/rename"
+      :message_emails_send => "/v5/messages/send",
+      :channels => "/v5/channels",
+      :channel_config => "/v5/channel/%CHANNEL_KEY%/config",
+      :channel_sessions => "/v5/channel/%CHANNEL_KEY%/sessions",
+      :channel_session_rename => "/v5/channel/%CHANNEL_KEY%/session/%SESSION_KEY%/rename"
     }
   end
 end

data/lib/messagebus-sdk/messagebus_base.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -20,7 +20,7 @@ require 'messagebus_errors'
 module MessagebusSDK
 
   class MessagebusBase
-    DEFAULT_API_ENDPOINT = 'https://api-v4.messagebus.com'
+    DEFAULT_API_ENDPOINT = 'https://api.messagebus.com'
     DEFAULT = 'DEFAULT'
     HEADER_SESSION_KEY = 'X-MESSAGEBUS-SESSIONKEY'
     SCOPE_ALL = 'all'
@@ -39,6 +39,8 @@ module MessagebusSDK
 
       @results = base_response_params
       @rest_http_errors = define_rest_http_errors
+      @return_json = true
+      @file_handle = nil
     end
 
     def api_version
@@ -108,15 +110,27 @@ module MessagebusSDK
       !address.match(/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i).nil?
     end
 
-    def make_api_request(path, request_type=HTTP_GET, data='')
+    def make_api_request(path, request_type=HTTP_GET, data='', return_json = true, file_name='')
       if (@last_init_time < Time.now.utc - 60)
         init_http_connection(@api_endpoint)
       end
 
+      @return_json = return_json
       headers = common_http_headers
       case request_type
         when HTTP_GET
-          response = @http.request_get(path, headers)
+          if !@return_json && file_name != ''
+            response_file = open(file_name, 'w')
+            @http.request_get(path, headers) do |response|
+              response.read_body do |segment|
+                response_file.write(segment)
+              end
+            end
+            response_file.close
+            return true
+          else
+            response = @http.request_get(path, headers)
+          end
         when HTTP_PUT
           headers = common_http_headers.merge(rest_post_headers)
           response = @http.request_put(path, data, headers)
@@ -130,6 +144,7 @@ module MessagebusSDK
     end
 
     def check_response(response, symbolize_names=true)
+      return response.body if !@return_json
       case response
         when Net::HTTPSuccess
           begin
@@ -183,6 +198,14 @@ module MessagebusSDK
       replace_channel_key(replace_token_with_key(path, "%SESSION_KEY%", session_key), channel_key)
     end
 
+    def replace_webhook_key(path, webhook_key)
+      replace_token_with_key(path, "%WEBHOOK_KEY%", webhook_key)
+    end
+
+    def replace_report_key(path, report_key)
+      replace_token_with_key(path, "%REPORT_KEY%", report_key)
+    end
+
     def feedback_query_args(start_date, end_date, use_send_time, scope)
       query_string_parts = ["useSendTime=#{use_send_time}", "scope=#{scope}"]
       date_range = "#{date_range(start_date, end_date)}"

data/lib/messagebus-sdk/messagebus_errors.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain

data/lib/messagebus-sdk/messagebus_version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Mail Bypass, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -13,7 +13,7 @@
 # under the License.
 
 module MessagebusSDK
-  VERSION = "4.1.1"
+  VERSION = "5.0.0"
 
   class Info
     @@ClientVersion = MessagebusSDK::VERSION

data/lib/messagebus-sdk/reports_client.rb

@@ -0,0 +1,110 @@
+# Copyright 2014 Message Bus
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+require 'messagebus_base'
+
+class MessagebusReportsClient < MessagebusSDK::MessagebusBase
+  FORMAT_JSON = "json"
+  FORMAT_CSV = "csv"
+
+  REPORT_TYPE_STATS = "stats"
+  REPORT_TYPE_FEEDBACK = "feedback"
+  REPORT_TYPE_BLOCKLIST = "blocklist"
+
+  SCOPE_BOUNCES = "bounces"
+  SCOPE_UNSUBSCRIBES = "unsubscribes"
+  SCOPE_COMPLAINTS = "complaints"
+  SCOPE_CLICKS = "clicks"
+  SCOPE_OPENS = "opens"
+  SCOPE_BLOCKS = "blocks"
+
+  STATUS_DONE = "done"
+  STATUS_RUNNING = "running"
+  STATUS_NODATA = "nodata"
+  STATUS_FAILED = "failed"
+
+  def initialize(api_key, api_endpoint = DEFAULT_API_ENDPOINT)
+    super(api_key, api_endpoint)
+    @rest_endpoints = define_rest_endpoints
+  end
+
+  def report_status(report_key)
+    path =  replace_report_key("#{@rest_endpoints[:status]}", report_key)
+    make_api_request(path)
+  end
+
+  def report_data(report_key, file_name = '')
+    path =  replace_report_key("#{@rest_endpoints[:report]}", report_key)
+    make_api_request(path, HTTP_GET, '', false, file_name)
+  end
+
+  def report(report_key, file_name = '', sleep_interval = 5)
+    report_data = ''
+    check_report_status = true
+    while check_report_status
+      response = report_status(report_key)
+      case response[:reportStatus]
+        when STATUS_DONE
+          report_data = report_data(report_key, file_name)
+          check_report_status = false
+        when STATUS_NODATA, STATUS_FAILED
+          report_data = ''
+          check_report_status = false
+        else
+          sleep(sleep_interval)
+      end
+    end
+    return report_data
+  end
+
+  def create_report(report_type, start_date, end_date, scope = 'bounces', format = 'json', channel_key = '', session_key = '')
+    path = @rest_endpoints[:reports]
+    days = 1
+    end_date = set_date(end_date, 0)
+    start_date = set_date(start_date, days)
+
+    post_data = {:reportType => report_type,
+                 :scope => scope,
+                 :format => format,
+                 :startDate => start_date,
+                 :endDate => end_date,
+                 :channelKey => channel_key,
+                 :sessionKey => session_key
+                }
+    make_api_request(path, HTTP_POST, post_data.to_json)
+  end
+
+  def create_feedback_report(start_date, end_date, scope = 'bounces', format = 'json', channel_key = '', session_key = '')
+    create_report(REPORT_TYPE_FEEDBACK, start_date, end_date, scope, format, channel_key, session_key)
+  end
+
+  def create_stats_report(start_date, end_date, format = 'json', channel_key = '', session_key = '')
+    create_report(REPORT_TYPE_STATS, start_date, end_date, SCOPE_ALL, format, channel_key, session_key)
+  end
+
+  def create_blocklist_report(start_date, end_date, scope = 'blocks', format = 'json', channel_key = '', session_key = '')
+    create_report(REPORT_TYPE_BLOCKLIST, start_date, end_date, scope, format, channel_key, session_key)
+  end
+
+  private
+
+  def define_rest_endpoints
+    {
+      :reports => "/v5/reports",
+      :report => "/v5/report/%REPORT_KEY%",
+      :status => "/v5/report/%REPORT_KEY%/status"
+    }
+  end
+end
+

data/lib/messagebus-sdk/template_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -15,7 +15,7 @@
 require 'messagebus_base'
 
 class MessagebusTemplateClient < MessagebusSDK::MessagebusBase
-  DEFAULT_TEMPLATE_ENDPOINT = 'https://templates-v4-jy01-prod.messagebus.com'
+  DEFAULT_TEMPLATE_ENDPOINT = 'https://templates.messagebus.com'
 
   def initialize(api_key, api_endpoint = DEFAULT_TEMPLATE_ENDPOINT)
     super(api_key, api_endpoint)
@@ -55,10 +55,10 @@ class MessagebusTemplateClient < MessagebusSDK::MessagebusBase
   private
   def define_rest_endpoints
     {
-      :template_version => "/api/v4/templates/version",
-      :template => "/api/v4/template/%TEMPLATE_KEY%",
-      :templates => "/api/v4/templates",
-      :templates_send => "/api/v4/templates/email/send"
+      :template_version => "/v5/templates/version",
+      :template => "/v5/template/%TEMPLATE_KEY%",
+      :templates => "/v5/templates",
+      :templates_send => "/v5/templates/email/send"
     }
   end
 

data/lib/messagebus-sdk/webhook_client.rb

@@ -0,0 +1,68 @@
+# Copyright 2014 Message Bus
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+require 'messagebus_base'
+
+class MessagebusWebhookClient < MessagebusSDK::MessagebusBase
+
+  EVENT_TYPE_MESSAGE_ATTEMPT = 'message.attempt'
+  EVENT_TYPE_MESSAGE_ACCEPT = 'message.accept'
+  EVENT_TYPE_MESSAGE_BOUNCE = 'message.bounce'
+  EVENT_TYPE_MESSAGE_DEFERRAL = 'message.deferral'
+  EVENT_TYPE_MESSAGE_OPEN = 'message.open'
+  EVENT_TYPE_LINK_CLICK = 'link.click'
+  EVENT_TYPE_RECIPIENT_UNSUBSCRIBE = 'recipient.unsubscribe'
+  EVENT_TYPE_RECIPIENT_COMPLAINT = 'recipient.complaint'
+  EVENT_TYPE_RECIPIENT_BLOCK = 'recipient.block'
+
+  def initialize(api_key, api_endpoint = DEFAULT_API_ENDPOINT)
+    super(api_key, api_endpoint)
+    @rest_endpoints = define_rest_endpoints
+  end
+
+  def webhooks
+    path = "#{@rest_endpoints[:webhooks]}"
+    make_api_request(path, HTTP_GET)
+  end
+
+  def webhook(webhook_key)
+    path =  replace_webhook_key("#{@rest_endpoints[:webhook]}", webhook_key)
+    make_api_request(path, HTTP_GET)
+  end
+
+  def create(params)
+    path = "#{@rest_endpoints[:webhooks]}"
+    make_api_request(path, HTTP_POST, params.to_json)
+  end
+
+  def update(webhook_key, params)
+    path =  replace_webhook_key("#{@rest_endpoints[:webhook]}", webhook_key)
+    make_api_request(path, HTTP_PUT, params.to_json)
+  end
+
+  def delete(webhook_key)
+    path =  replace_webhook_key("#{@rest_endpoints[:webhook]}", webhook_key)
+    make_api_request(path, HTTP_DELETE)
+  end
+
+  private
+
+  def define_rest_endpoints
+    {
+      :webhooks => "/v5/webhooks",
+      :webhook => "/v5/webhook/%WEBHOOK_KEY%"
+    }
+  end
+end
+

data/lib/messagebus-sdk.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Mail Bypass, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain

data/spec/messagebus-sdk/actionmailer_client_spec.rb

@@ -18,7 +18,7 @@ describe MessagebusActionMailerClient do
       session_key = "DEFAULT"
       message = MessageBusActionMailerTest.new_message(to_email, session_key)
 
-      FakeWeb.register_uri(:post, "#{API_URL}/message/email/send", :body => json_valid_send)
+      FakeWeb.register_uri(:post, "#{API_URL}/messages/send", :body => json_valid_send)
       message.deliver
 
       message_body = JSON.parse(FakeWeb.last_request.body)

data/spec/messagebus-sdk/api_client_spec.rb

@@ -32,7 +32,7 @@ describe MessagebusApiClient do
 
   describe "#send_messages" do
     it "should have user-agent and x-messagebus-key set in request headers" do
-      FakeWeb.register_uri(:post, "#{API_URL}/message/email/send", :body => json_valid_send)
+      FakeWeb.register_uri(:post, "#{API_URL}/messages/send", :body => json_valid_send)
       client.send_messages(default_message_params)
 
       FakeWeb.last_request.get_fields("X-MessageBus-Key").should_not be_nil
@@ -41,7 +41,7 @@ describe MessagebusApiClient do
     end
 
     it "sends messages" do
-      FakeWeb.register_uri(:post, "#{API_URL}/message/email/send", :body => json_valid_send)
+      FakeWeb.register_uri(:post, "#{API_URL}/messages/send", :body => json_valid_send)
       results = client.send_messages(default_message_params)
       results[:results].size.should == 1
     end
@@ -55,7 +55,7 @@ describe MessagebusApiClient do
     it "doesnt reset connection if under a minute old" do
       current_init_time=@http_client.last_init_time
       current_init_time.should be > Time.now.utc-5
-      FakeWeb.register_uri(:post, "#{API_URL}/message/email/send", :body => json_valid_send)
+      FakeWeb.register_uri(:post, "#{API_URL}/messages/send", :body => json_valid_send)
       results = @http_client.send_messages(default_message_params)
       results[:results].size.should == 1
       @http_client.last_init_time.should == current_init_time
@@ -65,7 +65,7 @@ describe MessagebusApiClient do
       @http_client.last_init_time=Time.now.utc-60
       current_init_time=@http_client.last_init_time
       current_init_time.should be < Time.now.utc-59
-      FakeWeb.register_uri(:post, "#{API_URL}/message/email/send", :body => json_valid_send)
+      FakeWeb.register_uri(:post, "#{API_URL}/messages/send", :body => json_valid_send)
       results = @http_client.send_messages(default_message_params)
       results[:results].size.should == 1
       @http_client.last_init_time.should be > current_init_time

data/spec/messagebus-sdk/base_spec.rb

@@ -30,9 +30,9 @@ describe MessagebusSDK::MessagebusBase do
 
   describe "messagebus base object set up correctly" do
     it "has correct headers and accepts a custom endpoint" do
-      test_endpoint = 'https://testapi-v4.messagebus.com/api/v4'
+      test_endpoint = 'https://testapi.messagebus.com/v5'
       client = MessagebusSDK::MessagebusBase.new(@api_key, test_endpoint)
-      client.instance_eval('@http').address.should == "testapi-v4.messagebus.com"
+      client.instance_eval('@http').address.should == "testapi.messagebus.com"
     end
   end
 
@@ -140,7 +140,7 @@ describe MessagebusSDK::MessagebusBase do
 
   describe "#version" do
     it "retrieves the current version of the API" do
-      FakeWeb.register_uri(:get, "https://api-v4.messagebus.com/api/version", :body => json_api_version_results)
+      FakeWeb.register_uri(:get, "https://api.messagebus.com/api/version", :body => json_api_version_results)
       client = MessagebusSDK::MessagebusBase.new(@api_key)
       version = client.api_version
 

data/spec/messagebus-sdk/reports_client_spec.rb

@@ -0,0 +1,132 @@
+
+dir = File.dirname(__FILE__)
+require "#{dir}/../spec_helper"
+require "#{dir}/../../lib/messagebus-sdk/reports_client"
+
+describe MessagebusReportsClient do
+  attr_reader :client, :api_key
+
+  before do
+    FakeWeb.allow_net_connect = false
+    @api_key = "7215ee9c7d9dc229d2921a40e899ec5f"
+    @client = MessagebusReportsClient.new(@api_key)
+  end
+
+  describe "reports" do
+    it "#report_status" do
+      report_key = '125a58512d8446279e3530c8d803f5e2'
+      expected_request="#{API_URL}/report/#{report_key}/status"
+      FakeWeb.register_uri(:get, expected_request, :body => json_report_status_request_response_done200)
+
+      response = client.report_status(report_key)
+      response.should == json_parse(json_report_status_request_response_done200)
+    end
+
+    it "#report_data" do
+      report_key = '125a58512d8446279e3530c8d803f5e2'
+      expected_request="#{API_URL}/report/#{report_key}/status"
+      FakeWeb.register_uri(:get, expected_request, :body => json_report_status_request_response_done200)
+
+      response = client.report_status(report_key)
+      response.should == json_parse(json_report_status_request_response_done200)
+    end
+
+    it "#report" do
+      report_key = '125a58512d8446279e3530c8d803f5e2'
+      expected_request="#{API_URL}/report/#{report_key}/status"
+      FakeWeb.register_uri(:get, expected_request, :body => json_report_status_request_response_done200)
+
+      expected_request="#{API_URL}/report/#{report_key}"
+      FakeWeb.register_uri(:get, expected_request, :body => json_report_request_data_bounce)
+
+      response = client.report(report_key)
+    end
+
+    it "#create_report" do
+      #def create_report(report_type, start_date, end_date, scope = 'bounces', format = 'json', channel_key = '', session_key = '')
+      report_type = MessagebusReportsClient::REPORT_TYPE_STATS
+      start_date_str="2014-01-01"
+      end_date_str="2014-01-02"
+      scope = MessagebusReportsClient::SCOPE_BOUNCES
+      format = MessagebusReportsClient::FORMAT_CSV
+
+      post_data = {:reportType => report_type,
+                   :scope => scope,
+                   :format => format,
+                   :startDate => start_date_str,
+                   :endDate => end_date_str,
+                   :channelKey => '',
+                   :sessionKey => ''
+                  }
+
+      expected_request="#{API_URL}/reports"
+      FakeWeb.register_uri(:post, expected_request, :body => json_report_request_response201)
+
+      response = client.create_report(report_type, start_date_str, end_date_str, scope, format)
+      FakeWeb.last_request.body.should == post_data.to_json
+    end
+
+    it "#create_feedback_report" do
+      start_date_str="2014-01-01"
+      end_date_str="2014-01-02"
+      scope = MessagebusReportsClient::SCOPE_BOUNCES
+      format = MessagebusReportsClient::FORMAT_CSV
+
+      post_data = {:reportType => MessagebusReportsClient::REPORT_TYPE_FEEDBACK,
+                   :scope => scope,
+                   :format => format,
+                   :startDate => start_date_str,
+                   :endDate => end_date_str,
+                   :channelKey => '',
+                   :sessionKey => ''
+                  }
+
+      expected_request="#{API_URL}/reports"
+      FakeWeb.register_uri(:post, expected_request, :body => json_report_request_response201)
+      response = client.create_feedback_report(start_date_str, end_date_str, scope, format)
+      FakeWeb.last_request.body.should == post_data.to_json
+    end
+
+    it "#create_stats_report" do
+      start_date_str="2014-01-01"
+      end_date_str="2014-01-02"
+      format = MessagebusReportsClient::FORMAT_CSV
+
+      post_data = {:reportType => MessagebusReportsClient::REPORT_TYPE_STATS,
+                   :scope => MessagebusReportsClient::SCOPE_ALL,
+                   :format => format,
+                   :startDate => start_date_str,
+                   :endDate => end_date_str,
+                   :channelKey => '',
+                   :sessionKey => ''
+                  }
+
+      expected_request="#{API_URL}/reports"
+      FakeWeb.register_uri(:post, expected_request, :body => json_report_request_response201)
+      response = client.create_stats_report(start_date_str, end_date_str, format)
+      FakeWeb.last_request.body.should == post_data.to_json
+
+    end
+
+    it "#create_blocklist_report" do
+      start_date_str="2014-01-01"
+      end_date_str="2014-01-02"
+      scope = MessagebusReportsClient::SCOPE_BLOCKS
+      format = MessagebusReportsClient::FORMAT_CSV
+
+      post_data = {:reportType => MessagebusReportsClient::REPORT_TYPE_BLOCKLIST,
+                   :scope => scope,
+                   :format => format,
+                   :startDate => start_date_str,
+                   :endDate => end_date_str,
+                   :channelKey => '',
+                   :sessionKey => ''
+                  }
+
+      expected_request="#{API_URL}/reports"
+      FakeWeb.register_uri(:post, expected_request, :body => json_report_request_response201)
+      response = client.create_blocklist_report(start_date_str, end_date_str, scope, format)
+      FakeWeb.last_request.body.should == post_data.to_json
+    end
+  end
+end

data/spec/messagebus-sdk/template_client_spec.rb

@@ -9,7 +9,7 @@ describe MessagebusTemplateClient do
   before do
     FakeWeb.allow_net_connect = false
     @api_key = "7215ee9c7d9dc229d2921a40e899ec5f"
-    @api_endpoint = "https://templates-v4-jy01-prod.messagebus.com"
+    @api_endpoint = "https://templates.messagebus.com"
     @client = MessagebusTemplateClient.new(@api_key)
 
     @test_template = {
@@ -29,7 +29,7 @@ describe MessagebusTemplateClient do
 
   describe "templates" do
     it "#template_version" do
-        FakeWeb.register_uri(:get, "#{@api_endpoint}/api/v4/templates/version", :body => json_template_version_results)
+        FakeWeb.register_uri(:get, "#{@api_endpoint}/v5/templates/version", :body => json_template_version_results)
         result = @client.template_version
 
         result[:statusCode].should == 200
@@ -38,7 +38,7 @@ describe MessagebusTemplateClient do
     end
 
     it "#create_template" do
-      FakeWeb.register_uri(:post, "#{@api_endpoint}/api/v4/templates", :body => json_template_create)
+      FakeWeb.register_uri(:post, "#{@api_endpoint}/v5/templates", :body => json_template_create)
 
 
       result = @client.create_template(@test_template)
@@ -52,7 +52,7 @@ describe MessagebusTemplateClient do
     it "#get_template" do
       template_key = "33ffafac-b15e-4146-b046-14ed897c522b"
 
-      FakeWeb.register_uri(:get, "#{@api_endpoint}/api/v4/template/#{template_key}", :body => json_template_get)
+      FakeWeb.register_uri(:get, "#{@api_endpoint}/v5/template/#{template_key}", :body => json_template_get)
 
       result = @client.get_template(template_key)
 
@@ -66,7 +66,7 @@ describe MessagebusTemplateClient do
 
     it "#templates" do
       # list templates available
-      FakeWeb.register_uri(:get, "#{@api_endpoint}/api/v4/templates", :body => json_templates_get)
+      FakeWeb.register_uri(:get, "#{@api_endpoint}/v5/templates", :body => json_templates_get)
 
       result = @client.templates
 
@@ -93,7 +93,7 @@ describe MessagebusTemplateClient do
       end
 
       it "#send_messages with batch size 25" do
-        FakeWeb.register_uri(:post, "#{@api_endpoint}/api/v4/templates/email/send", :body => json_templates_email_send)
+        FakeWeb.register_uri(:post, "#{@api_endpoint}/v5/templates/email/send", :body => json_templates_email_send)
 
         template_messages = []
         (1..25).each do |i|
@@ -105,7 +105,7 @@ describe MessagebusTemplateClient do
       end
 
       it "#send_messages with batch size 0" do
-        FakeWeb.register_uri(:post, "#{@api_endpoint}/api/v4/templates/email/send", :body => json_templates_email_send_empty)
+        FakeWeb.register_uri(:post, "#{@api_endpoint}/v5/templates/email/send", :body => json_templates_email_send_empty)
 
         template_messages = []
         result = @client.send_messages(@template_key, template_messages)
@@ -113,7 +113,7 @@ describe MessagebusTemplateClient do
       end
 
       it "#send_messages with batch size 26" do
-        FakeWeb.register_uri(:post, "#{@api_endpoint}/api/v4/templates/email/send", :body => json_templates_email_send)
+        FakeWeb.register_uri(:post, "#{@api_endpoint}/v5/templates/email/send", :body => json_templates_email_send)
 
         template_messages = []
         (1..26).each do |i|

data/spec/messagebus-sdk/webhook_client_spec.rb

@@ -0,0 +1,72 @@
+
+dir = File.dirname(__FILE__)
+require "#{dir}/../spec_helper"
+require "#{dir}/../../lib/messagebus-sdk/webhook_client"
+
+describe MessagebusWebhookClient do
+  attr_reader :client, :api_key
+
+  before do
+    FakeWeb.allow_net_connect = false
+    @api_key = "7215ee9c7d9dc229d2921a40e899ec5f"
+    @client = MessagebusWebhookClient.new(@api_key)
+  end
+
+  describe "webhooks" do
+    it "#webhooks" do
+      expected_request="#{API_URL}/webhooks"
+      FakeWeb.register_uri(:get, expected_request, :body => json_webhooks)
+
+      response = client.webhooks
+      response.should == json_parse(json_webhooks)
+
+      response[:webhooks].length.should == 2
+    end
+
+    it "#webhook" do
+      webhook_key = "ab487e9d750a3c50876d12e8f381a79f"
+
+      expected_request="#{API_URL}/webhook/#{webhook_key}"
+      FakeWeb.register_uri(:get, expected_request, :body => json_webhook)
+
+      response = client.webhook(webhook_key)
+      response.should == json_parse(json_webhook)
+    end
+
+    it "#create" do
+      params = {:enabled => false,
+                :uri => 'http://domain.com/events/messagebus/message.accept',
+                :eventType => MessagebusWebhookClient::EVENT_TYPE_MESSAGE_ACCEPT
+               }
+
+      expected_request="#{API_URL}/webhooks"
+      FakeWeb.register_uri(:post, expected_request, :body => json_webhook_create)
+
+      response = client.create(params)
+      response.should == json_parse(json_webhook_create)
+    end
+
+    it "#update" do
+      webhook_key = "ab487e9d750a3c50876d12e8f381a79f"
+      params = {:uri => 'http://domain.com/events/messagebus/message.accepted'}
+
+      expected_request="#{API_URL}/webhook/#{webhook_key}"
+      FakeWeb.register_uri(:put, expected_request, :body => json_webhook_update)
+
+      response = client.update(webhook_key, params)
+      response.should == json_parse(json_webhook_update)
+    end
+
+    it "#delete_webhook" do
+      webhook_key = "ab487e9d750a3c50876d12e8f381a79f"
+
+      expected_request="#{API_URL}/webhook/#{webhook_key}"
+      FakeWeb.register_uri(:delete, expected_request, :body => json_webhook_delete)
+
+      response = client.delete(webhook_key)
+      response.should == json_parse(json_webhook_delete)
+
+    end
+
+  end
+end

data/spec/spec_core_extensions.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright 2013 Message Bus, Inc.
+# Copyright 2014 Message Bus
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -26,7 +26,7 @@ require 'api_client'
 require 'actionmailer_client'
 require 'messagebus_errors'
 
-API_URL = 'https://api-v4.messagebus.com/api/v4'
+API_URL = 'https://api.messagebus.com/v5'
 
 def json_parse(data)
   JSON.parse(data, :symbolize_names => true)
@@ -229,6 +229,161 @@ JAVASCRIPT
   json
 end
 
+def json_webhooks
+  json = <<JAVASCRIPT
+{
+"statusCode":200,
+"statusMessage":"OK",
+"statusTime":"2014-01-22T23:12:45.768Z",
+"webhooks":[
+    {"enabled":true,
+     "eventType":"recipient.block",
+     "uri":"http://webhook.messagebus.com/events/block",
+     "webhookKey":"902e4a3d-24a0-470f-bbde-58f81fc04b79",
+     "lastUpdated":"2014-01-22T23:31:42Z",
+     "dateCreated":"2014-01-22T23:31:42Z",
+     "batching":{
+        "batchingEnabled":true,
+        "batchTimeSeconds":30,
+        "maxBatchSize":500}
+    },
+    {"enabled":true,
+     "eventType":"message.attempt",
+     "uri":"http://webhook.messagebus.com/events/attempt",
+     "webhookKey":"9b4309e1-0551-4c7a-ab0b-4b69f977201f",
+     "lastUpdated":"2014-01-22T23:31:35Z",
+     "dateCreated":"2014-01-22T23:31:35Z",
+     "batching":{
+        "batchingEnabled":true,
+        "batchTimeSeconds":30,
+        "maxBatchSize":500
+     },
+     "channelKey":"DDCEFC35298644A998606CAB10F38501"
+    }
+]
+}
+JAVASCRIPT
+  json
+end
+
+def json_webhook
+  json = <<JAVASCRIPT
+{
+"statusCode":200,
+"statusMessage":"OK",
+"statusTime":"2014-01-22T23:12:45.768Z",
+"webhook":
+    {"enabled":true,
+     "eventType":"recipient.complaint",
+     "uri":"http://webhook.messagebus.com/messagebus/v5/recipient-complaint",
+     "webhookKey":"43980222-6bef-46aa-8644-d6b7e0b8c98a",
+     "lastUpdated":"2014-01-22T22:29:59Z",
+     "dateCreated":"2014-01-22T21:32:17Z",
+     "batching":
+        {"batchingEnabled":true,
+         "batchTimeSeconds":30,
+         "maxBatchSize":500
+        },
+     "channelKey":"DDCEFC35298644A998606CAB10F38501"
+    }
+}
+JAVASCRIPT
+  json
+end
+
+def json_webhook_no_channel
+  json = <<JAVASCRIPT
+{
+"statusCode":200,
+"statusMessage":"OK",
+"statusTime":"2014-01-22T23:12:45.768Z",
+"webhook":
+    {"enabled":true,
+     "eventType":"recipient.complaint",
+     "uri":"http://webhook.messagebus.com/messagebus/v5/recipient-complaint",
+     "webhookKey":"43980222-6bef-46aa-8644-d6b7e0b8c98a",
+     "lastUpdated":"2014-01-22T22:29:59Z",
+     "dateCreated":"2014-01-22T21:32:17Z",
+     "batching":
+        {"batchingEnabled":true,
+         "batchTimeSeconds":30,
+         "maxBatchSize":500
+        }
+    }
+}
+JAVASCRIPT
+  json
+end
+
+def json_webhook_create
+  json = <<JAVASCRIPT
+{
+"statusCode":201,
+"statusMessage":"Webhook created.",
+"statusTime":"2014-01-24T23:35:45.083Z",
+"webhookKey":"8d77789a13144923ba7b38b8ffff0f6c"
+}
+JAVASCRIPT
+  json
+end
+
+def json_webhook_update
+  json = <<JAVASCRIPT
+{
+"statusCode":200,
+"statusMessage":"OK",
+"statusTime":"2014-01-24T23:29:03.483Z"
+}
+JAVASCRIPT
+  json
+end
+
+def json_webhook_delete
+  json = <<JAVASCRIPT
+{
+"statusCode":200,
+"statusMessage":"Webhook deleted.",
+"statusTime":"2014-01-24T23:31:05.546Z"
+}
+JAVASCRIPT
+  json
+end
+
+
+def json_report_request_response201
+  json = <<JAVASCRIPT
+{"statusCode":201,"statusMessage":"Report request received.","statusTime":"1971-01-01T00:00:00.000Z","reportKey":"e98d2f001da5678b39482efbdf5770dc","reportStatus":"created","reportQuota":50,"reportQuotaRemaining":49}
+JAVASCRIPT
+  json
+end
+
+def json_report_status_request_response_done200
+  json = <<JAVASCRIPT
+{"statusCode":200,"statusMessage":"Report has completed.","statusTime":"1971-01-01T00:00:00.000Z","reportStatus":"done"}
+JAVASCRIPT
+  json
+end
+
+def json_report_status_request_response_running200
+  json = <<JAVASCRIPT
+{"statusCode":200,"statusMessage":"Report is still running.","statusTime":"1971-01-01T00:00:00.000Z","reportStatus":"running"}
+JAVASCRIPT
+  json
+end
+
+def json_report_status_request_response_no_data200
+  json = <<JAVASCRIPT
+{"statusCode":200,"statusMessage":"Report contains no data.","statusTime":"1971-01-01T00:00:00.000Z","reportStatus":"nodata"}
+JAVASCRIPT
+  json
+end
+
+def json_report_request_data_bounce
+  json = <<JAVASCRIPT
+{"type":"bounce","channelKey":"0000000000ABCDEF0123456789ABCDEF","sessionKey":"1111111111ABCDEF0123456789ABCDEF","email":"bob@hotmail.com","bounceCode":1000,"eventTime":"1971-01-01T23:45:00.000Z","sendTime":"1971-01-01T00:00:00.000Z"}
+JAVASCRIPT
+  json
+end
 
 class MessagebusMailer < MessagebusActionMailerClient
   def initialize(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: messagebus-sdk
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies: []
 description: SDK for Message Bus service
 email:
@@ -20,20 +20,20 @@ extra_rdoc_files: []
 files:
 - lib/messagebus-sdk/actionmailer_client.rb
 - lib/messagebus-sdk/api_client.rb
-- lib/messagebus-sdk/feedback_client.rb
 - lib/messagebus-sdk/messagebus_base.rb
 - lib/messagebus-sdk/messagebus_errors.rb
 - lib/messagebus-sdk/messagebus_version.rb
-- lib/messagebus-sdk/stats_client.rb
+- lib/messagebus-sdk/reports_client.rb
 - lib/messagebus-sdk/template_client.rb
+- lib/messagebus-sdk/webhook_client.rb
 - lib/messagebus-sdk.rb
 - spec/messagebus-sdk/actionmailer_client_spec.rb
 - spec/messagebus-sdk/api_client_spec.rb
 - spec/messagebus-sdk/base_spec.rb
 - spec/messagebus-sdk/cacert.pem
-- spec/messagebus-sdk/feedback_client_spec.rb
-- spec/messagebus-sdk/stats_client_spec.rb
+- spec/messagebus-sdk/reports_client_spec.rb
 - spec/messagebus-sdk/template_client_spec.rb
+- spec/messagebus-sdk/webhook_client_spec.rb
 - spec/spec_core_extensions.rb
 - spec/spec_helper.rb
 - README.md
@@ -71,8 +71,8 @@ test_files:
 - spec/messagebus-sdk/api_client_spec.rb
 - spec/messagebus-sdk/base_spec.rb
 - spec/messagebus-sdk/cacert.pem
-- spec/messagebus-sdk/feedback_client_spec.rb
-- spec/messagebus-sdk/stats_client_spec.rb
+- spec/messagebus-sdk/reports_client_spec.rb
 - spec/messagebus-sdk/template_client_spec.rb
+- spec/messagebus-sdk/webhook_client_spec.rb
 - spec/spec_core_extensions.rb
 - spec/spec_helper.rb

data/lib/messagebus-sdk/feedback_client.rb

@@ -1,104 +0,0 @@
-# Copyright 2013 Message Bus, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-require 'messagebus_base'
-
-class MessagebusFeedbackClient < MessagebusSDK::MessagebusBase
-
-  def initialize(api_key, api_endpoint = DEFAULT_API_ENDPOINT)
-    super(api_key, api_endpoint)
-    @rest_endpoints = define_rest_endpoints
-  end
-
-  def feedback(start_date = '', end_date = '', scope = SCOPE_ALL, use_send_time = TRUE_VALUE)
-    path = "#{@rest_endpoints[:feedback]}#{feedback_query_args(start_date, end_date, use_send_time, scope)}"
-    make_api_request(path)
-  end
-
-  def feedback_by_channel(channel_key, start_date = '', end_date = '', scope = SCOPE_ALL, use_send_time  = TRUE_VALUE)
-    path = "#{replace_channel_key(@rest_endpoints[:feedback_channel], channel_key)}#{feedback_query_args(start_date, end_date, use_send_time, scope)}"
-    make_api_request(path)
-  end
-
-  def feedback_by_session(channel_key, session_key, start_date = '', end_date = '', scope = SCOPE_ALL, use_send_time  = TRUE_VALUE)
-    path = "#{replace_channel_and_session_key(@rest_endpoints[:feedback_session], channel_key, session_key)}#{feedback_query_args(start_date, end_date, use_send_time, scope)}"
-    make_api_request(path)
-  end
-
-  def unsubs(start_date = '', end_date = '')
-    path = "#{@rest_endpoints[:unsubs]}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def unsubs_by_channel(channel_key, start_date = '', end_date = '')
-    path = "#{replace_channel_key(@rest_endpoints[:unsubs_channel], channel_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def unsubs_by_session(channel_key, session_key, start_date = '', end_date = '')
-    path = "#{replace_channel_and_session_key(@rest_endpoints[:unsubs_session], channel_key, session_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def complaints(start_date = '', end_date = '')
-    path = "#{@rest_endpoints[:complaints]}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def complaints_by_channel(channel_key, start_date = '', end_date = '')
-    path = "#{replace_channel_key(@rest_endpoints[:complaints_channel], channel_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def complaints_by_session(channel_key, session_key, start_date = '', end_date = '')
-    path = "#{replace_channel_and_session_key(@rest_endpoints[:complaints_session], channel_key, session_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def bounces(start_date = '', end_date = '')
-    path = "#{@rest_endpoints[:bounces]}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def bounces_by_channel(channel_key, start_date = '', end_date = '')
-    path = "#{replace_channel_key(@rest_endpoints[:bounces_channel], channel_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def bounces_by_session(channel_key, session_key, start_date = '', end_date = '')
-    path = "#{replace_channel_and_session_key(@rest_endpoints[:bounces_session], channel_key, session_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  private
-
-  def define_rest_endpoints
-    {
-      :feedback => "/api/v4/feedback",
-      :feedback_channel => "/api/v4/feedback/channel/%CHANNEL_KEY%",
-      :feedback_session => "/api/v4/feedback/channel/%CHANNEL_KEY%/session/%SESSION_KEY%",
-      :unsubs => "/api/v4/unsubs",
-      :unsubs_channel => "/api/v4/unsubs/channel/%CHANNEL_KEY%",
-      :unsubs_session => "/api/v4/unsubs/channel/%CHANNEL_KEY%/session/%SESSION_KEY%",
-      :complaints => "/api/v4/complaints",
-      :complaints_channel => "/api/v4/complaints/channel/%CHANNEL_KEY%",
-      :complaints_session => "/api/v4/complaints/channel/%CHANNEL_KEY%/session/%SESSION_KEY%",
-      :bounces => "/api/v4/bounces",
-      :bounces_channel => "/api/v4/bounces/channel/%CHANNEL_KEY%",
-      :bounces_session => "/api/v4/bounces/channel/%CHANNEL_KEY%/session/%SESSION_KEY%"
-    }
-  end
-
-end
-

data/lib/messagebus-sdk/stats_client.rb

@@ -1,50 +0,0 @@
-# Copyright 2013 Message Bus, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-require 'messagebus_base'
-
-class MessagebusStatsClient < MessagebusSDK::MessagebusBase
-
-  def initialize(api_key, api_endpoint = DEFAULT_API_ENDPOINT)
-    super(api_key, api_endpoint)
-    @rest_endpoints = define_rest_endpoints
-  end
-
-  def stats(start_date = '', end_date = '')
-    path = "#{@rest_endpoints[:stats]}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def stats_by_channel(channel_key, start_date = '', end_date = '')
-    path = "#{replace_channel_key(@rest_endpoints[:stats_channel], channel_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  def stats_by_session(channel_key, session_key, start_date = '', end_date = '')
-    path = "#{replace_channel_and_session_key(@rest_endpoints[:stats_session], channel_key, session_key)}?#{date_range(start_date, end_date)}"
-    make_api_request(path)
-  end
-
-  private
-
-  def define_rest_endpoints
-    {
-      :stats => "/api/v4/stats/email",
-      :stats_channel => "/api/v4/stats/email/channel/%CHANNEL_KEY%",
-      :stats_session => "/api/v4/stats/email/channel/%CHANNEL_KEY%/session/%SESSION_KEY%",
-    }
-  end
-
-end
-

data/spec/messagebus-sdk/feedback_client_spec.rb

@@ -1,65 +0,0 @@
-
-dir = File.dirname(__FILE__)
-require "#{dir}/../spec_helper"
-require "#{dir}/../../lib/messagebus-sdk/feedback_client"
-
-
-describe MessagebusFeedbackClient do
-  attr_reader :client, :api_key
-
-
-  before do
-    FakeWeb.allow_net_connect = false
-    @api_key = "7215ee9c7d9dc229d2921a40e899ec5f"
-    @client = MessagebusFeedbackClient.new(@api_key)
-  end
-
-  describe "feedback" do
-    it "call #feedback without dates" do
-      scope = "all"
-      expected_request="#{API_URL}/feedback?useSendTime=true&scope=#{scope}"
-
-      FakeWeb.register_uri(:get, expected_request, :body => json_feedback(scope))
-      response = client.feedback
-      FakeWeb.last_request.body.should be_nil
-      response.should == json_parse(json_feedback(scope))
-    end
-
-    it "call #feedback with dates" do
-      scope = "bounces"
-      start_date_str="2011-01-01T04:30:00+00:00"
-      end_date_str="2011-01-02T04:30:00+00:00"
-      expected_request="#{API_URL}/feedback?useSendTime=true&scope=#{scope}&startDate=#{URI.escape(start_date_str)}&endDate=#{URI.escape(end_date_str)}"
-
-      FakeWeb.register_uri(:get, expected_request, :body => json_feedback(scope))
-      response = client.feedback(start_date_str, end_date_str, scope)
-      FakeWeb.last_request.body.should be_nil
-      response.should == json_parse(json_feedback(scope))
-    end
-
-    it "call #feedback_by_channel without dates" do
-      scope = "all"
-      channel_key = "ab487e9d750a3c50876d12e8f381a79f"
-      expected_request="#{API_URL}/feedback/channel/#{channel_key}?useSendTime=true&scope=#{scope}"
-
-      FakeWeb.register_uri(:get, expected_request, :body => json_feedback(scope))
-      response = client.feedback_by_channel(channel_key)
-      FakeWeb.last_request.body.should be_nil
-      response.should == json_parse(json_feedback(scope))
-    end
-
-    it "call #feedback_by_session without dates" do
-      scope = "all"
-      channel_key = "ab487e9d750a3c50876d12e8f381a79f"
-      session_key = "dab775c6e6aa203324598fefbd1e8baf"
-
-      expected_request="#{API_URL}/feedback/channel/#{channel_key}/session/#{session_key}?useSendTime=true&scope=#{scope}"
-
-      FakeWeb.register_uri(:get, expected_request, :body => json_feedback(scope))
-      response = client.feedback_by_session(channel_key, session_key)
-      FakeWeb.last_request.body.should be_nil
-      response.should == json_parse(json_feedback(scope))
-    end
-  end
-
-end

data/spec/messagebus-sdk/stats_client_spec.rb

@@ -1,56 +0,0 @@
-
-dir = File.dirname(__FILE__)
-require "#{dir}/../spec_helper"
-require "#{dir}/../../lib/messagebus-sdk/stats_client"
-
-describe MessagebusStatsClient do
-  attr_reader :client, :api_key
-
-  before do
-    FakeWeb.allow_net_connect = false
-    @api_key = "7215ee9c7d9dc229d2921a40e899ec5f"
-    @client = MessagebusStatsClient.new(@api_key)
-  end
-
-  describe "stats" do
-    it "#stats with dates" do
-      start_date_str="2011-01-01"
-      end_date_str="2011-01-02"
-
-      expected_request="#{API_URL}/stats/email?startDate=#{start_date_str}&endDate=#{end_date_str}"
-      FakeWeb.register_uri(:get, expected_request, :body => json_stats)
-
-      response = client.stats(start_date_str, end_date_str)
-      response.should == json_parse(json_stats)
-
-      response[:stats].length.should == 4
-      response[:smtp].length.should == 5
-      response[:filter].length.should == 2
-    end
-
-    it "#stats_by_channel with dates" do
-      start_date_str="2011-01-01"
-      end_date_str="2011-01-02"
-      channel_key = "ab487e9d750a3c50876d12e8f381a79f"
-
-      expected_request="#{API_URL}/stats/email/channel/#{channel_key}?startDate=#{start_date_str}&endDate=#{end_date_str}"
-      FakeWeb.register_uri(:get, expected_request, :body => json_stats)
-
-      response = client.stats_by_channel(channel_key, start_date_str, end_date_str)
-      response.should == json_parse(json_stats)
-    end
-
-    it "#stats_by_session with dates" do
-      start_date_str="2011-01-01"
-      end_date_str="2011-01-02"
-      channel_key = "ab487e9d750a3c50876d12e8f381a79f"
-      session_key = "dab775c6e6aa203324598fefbd1e8baf"
-
-      expected_request="#{API_URL}/stats/email/channel/#{channel_key}/session/#{session_key}?startDate=#{start_date_str}&endDate=#{end_date_str}"
-      FakeWeb.register_uri(:get, expected_request, :body => json_stats)
-
-      response = client.stats_by_session(channel_key, session_key, start_date_str, end_date_str)
-      response.should == json_parse(json_stats)
-    end
-  end
-end