messagebus-sdk 5.0.2 → 5.0.3

data/README.md

@@ -1,4 +1,3 @@
-![MB icon](https://www.messagebus.com/img/logo.png)
 
 ###Message Bus Ruby SDK
 

data/lib/messagebus-sdk/messagebus_version.rb

@@ -13,7 +13,7 @@
 # under the License.
 
 module MessagebusSDK
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 
   class Info
     @@ClientVersion = MessagebusSDK::VERSION

data/lib/messagebus-sdk/reports_client.rb

@@ -68,29 +68,32 @@ class MessagebusReportsClient < MessagebusSDK::MessagebusBase
     return report_data
   end
 
-  def create_report(report_type, start_date, end_date, scope = 'bounces', format = 'json', channel_key = '', session_key = '')
+  def create_report(report_type, start_date, end_date, scope = nil, format = 'json', channel_key = '', session_key = '', use_send_time = true)
     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
                 }
+
+    post_data[:scope] = scope if (report_type == REPORT_TYPE_FEEDBACK || report_type == REPORT_TYPE_BLOCKLIST)
+    post_data[:useSendTime] = use_send_time if report_type == REPORT_TYPE_FEEDBACK
+
     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)
+  def create_feedback_report(start_date, end_date, scope = 'bounces', format = 'json', channel_key = '', session_key = '', use_send_time = true)
+    create_report(REPORT_TYPE_FEEDBACK, start_date, end_date, scope, format, channel_key, session_key, use_send_time)
   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)
+    create_report(REPORT_TYPE_STATS, start_date, end_date, nil, format, channel_key, session_key)
   end
 
   def create_blocklist_report(start_date, end_date, scope = 'blocks', format = 'json', channel_key = '', session_key = '')

data/spec/messagebus-sdk/reports_client_spec.rb

@@ -51,7 +51,6 @@ describe MessagebusReportsClient do
       format = MessagebusReportsClient::FORMAT_CSV
 
       post_data = {:reportType => report_type,
-                   :scope => scope,
                    :format => format,
                    :startDate => start_date_str,
                    :endDate => end_date_str,
@@ -64,6 +63,11 @@ describe MessagebusReportsClient do
 
       response = client.create_report(report_type, start_date_str, end_date_str, scope, format)
       FakeWeb.last_request.body.should == post_data.to_json
+
+      post_data[:channelKey] = 'A'
+      post_data[:sessionKey] = 'B'
+      response = client.create_report(report_type, start_date_str, end_date_str, scope, format, 'A', 'B')
+      FakeWeb.last_request.body.should == post_data.to_json
     end
 
     it "#create_feedback_report" do
@@ -73,18 +77,25 @@ describe MessagebusReportsClient do
       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 => ''
+                   :sessionKey => '',
+                   :scope => scope,
+                   :useSendTime => true
                   }
 
       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
+
+      post_data[:channelKey] = 'A'
+      post_data[:sessionKey] = 'B'
+      post_data[:useSendTime] = false
+      response = client.create_feedback_report(start_date_str, end_date_str, scope, format, 'A', 'B', false)
+      FakeWeb.last_request.body.should == post_data.to_json
     end
 
     it "#create_stats_report" do
@@ -93,7 +104,6 @@ describe MessagebusReportsClient do
       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,
@@ -106,6 +116,10 @@ describe MessagebusReportsClient do
       response = client.create_stats_report(start_date_str, end_date_str, format)
       FakeWeb.last_request.body.should == post_data.to_json
 
+      post_data[:channelKey] = 'A'
+      post_data[:sessionKey] = 'B'
+      response = client.create_stats_report(start_date_str, end_date_str, format, 'A', 'B')
+      FakeWeb.last_request.body.should == post_data.to_json
     end
 
     it "#create_blocklist_report" do
@@ -115,18 +129,23 @@ describe MessagebusReportsClient do
       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 => ''
+                   :sessionKey => '',
+                   :scope => scope
                   }
 
       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
+
+      post_data[:channelKey] = 'A'
+      post_data[:sessionKey] = 'B'
+      response = client.create_blocklist_report(start_date_str, end_date_str, scope, format, 'A', 'B')
+      FakeWeb.last_request.body.should == post_data.to_json
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: messagebus-sdk
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies: []
 description: SDK for Message Bus service
 email:
@@ -40,7 +40,7 @@ files:
 - Gemfile
 - Rakefile
 - .rvmrc
-homepage: ''
+homepage: http://developer.messagebus.com
 licenses:
 - APACHE2
 post_install_message: