assistly 0.2.1 → 0.2.2

data/HISTORY.mkd

@@ -1,3 +1,12 @@
+0.2.2 - April 18, 2011
+------------------
+Added deep_merge! support so that we keep any custom email headers when creating outbound interactions. 
+Required pony in the gem so you don't have to include it in your app.
+
+0.2.1 - April 18, 2011
+------------------
+Stopped returning only the 'results' array when listing things, because this would cause us to not have access to page numbers, total counts, etc.
+
 0.2.0 - April 16, 2011
 -------------------------
 * Support for Topics, Articles, and Macros added

data/README.mkd

@@ -6,6 +6,15 @@ Installation
 ------------
     gem install assistly
 
+What's new in 0.2.2?
+------------------
+Added deep_merge! support so that we keep any custom email headers when creating outbound interactions. 
+Required pony in the gem so you don't have to include it in your app.
+
+What's new in 0.2.1?
+------------------
+Stopped returning only the 'results' array when listing things, because this would cause us to not have access to page numbers, total counts, etc.
+
 What's new in 0.2.0?
 ------------------
 Added support for Topics, Articles, and Macros, which is currently all that is available in the Assistly API.

data/assistly.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rash', '~> 0.3.0')
   s.add_runtime_dependency('simple_oauth', '~> 0.1.4')
   s.add_runtime_dependency('pony', '~> 1.1')
+  s.add_runtime_dependency('deep_merge', '~> 0.1.0')
   s.authors = ["Chris Warren"]
   s.description = %q{A Ruby wrapper for the Assistly REST API}
   s.post_install_message =<<eos

data/lib/assistly.rb

@@ -2,7 +2,8 @@ require 'assistly/error'
 require 'assistly/configuration'
 require 'assistly/api'
 require 'assistly/client'
-# require 'assistly/search'
+require 'pony'
+require 'deep_merge'
 
 module Assistly
   extend Configuration

data/lib/assistly/client/interaction.rb

@@ -20,7 +20,6 @@ module Assistly
       
       def create_interaction(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        direction = 
         if options[:direction].to_s == "outbound"
           options.delete(:direction)
           to      = options.delete(:customer_email)
@@ -64,7 +63,7 @@ module Assistly
         raise Assistly::SupportEmailNotSet if support_email.blank?
         options = args.last.is_a?(Hash) ? args.pop : {}
         options.merge!(:to => to, :subject => subject, :body => body, :from => support_email, :bcc => support_email)
-        options.merge!(:headers => { "x-assistly-customer-email" => to, 
+        options.deep_merge!(:headers => { "x-assistly-customer-email" => to, 
                                      "x-assistly-interaction-direction" => "out",
                                      "x-assistly-case-status" => options[:status]||"open"})
         Pony.mail(options)

data/lib/assistly/version.rb

@@ -1,4 +1,4 @@
 module Assistly
   # The version of the gem
-  VERSION = '0.2.1'.freeze unless defined?(::Assistly::VERSION)
+  VERSION = '0.2.2'.freeze unless defined?(::Assistly::VERSION)
 end

data/spec/assistly/client/interaction_spec.rb

@@ -146,6 +146,20 @@ describe Assistly::Client do
           end
           
         end
+        
+        context "with customer headers set" do
+          before do
+            @custom_email = @client.create_outbound_interaction("customer@example.com", "Need help?", "Sorry we missed you in chat today.", :headers => { "x-assistly-interaction-user-agent" => "12345"})
+          end
+          
+          it "should merge the custom headers" do
+            @custom_email.last.should have_header("x-assistly-interaction-user-agent","12345")
+          end
+          
+          it "should preserve the existing headers" do
+            @custom_email.last.should have_header("x-assistly-customer-email","customer@example.com")
+          end
+        end
       end
 
       describe ".interactions" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assistly
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Chris Warren
@@ -295,6 +295,22 @@ dependencies:
         version: "1.1"
   type: :runtime
   version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: deep_merge
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id019
 description: A Ruby wrapper for the Assistly REST API
 email: 
 - chris@zencoder.com