assistly 0.2.2 → 0.2.3

data/HISTORY.mkd

@@ -1,3 +1,7 @@
+0.2.3 April 18, 2011
+------------------
+Removed deep_merge because it conflicts with rails. Handling the merge inside the create_outbound_interaction method only on headers for now, until we need it elsewhere.
+
 0.2.2 - April 18, 2011
 ------------------
 Added deep_merge! support so that we keep any custom email headers when creating outbound interactions. 

data/README.mkd

@@ -6,9 +6,13 @@ Installation
 ------------
     gem install assistly
 
+What's new in 0.2.3?
+------------------
+Removed deep_merge because it conflicts with rails. Handling the merge inside the create_outbound_interaction method only on headers for now, until we need it elsewhere.
+
 What's new in 0.2.2?
 ------------------
-Added deep_merge! support so that we keep any custom email headers when creating outbound interactions. 
+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?

data/assistly.gemspec

@@ -21,7 +21,6 @@ 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

@@ -3,7 +3,6 @@ require 'assistly/configuration'
 require 'assistly/api'
 require 'assistly/client'
 require 'pony'
-require 'deep_merge'
 
 module Assistly
   extend Configuration

data/lib/assistly/client/interaction.rb

@@ -63,9 +63,11 @@ 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.deep_merge!(:headers => { "x-assistly-customer-email" => to, 
-                                     "x-assistly-interaction-direction" => "out",
-                                     "x-assistly-case-status" => options[:status]||"open"})
+        headers = { "x-assistly-customer-email" => to, 
+                    "x-assistly-interaction-direction" => "out",
+                    "x-assistly-case-status" => options[:status]||"open"}
+        headers.merge!(options[:headers]) if options[:headers]
+        options.merge!(:headers => headers)
         Pony.mail(options)
       end
     end

data/lib/assistly/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assistly
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Chris Warren
@@ -295,22 +295,6 @@ 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