Button overlay params and ticket_ids should be accessable from payloa…

…d helper
unamashana · Nov 14, 2012 · 034e013 · 034e013
1 parent 1749809
commit 034e013
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 48 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,7 @@ gem 'faraday'
 gem 'faraday_middleware'
 gem 'hashie'
 gem 'haml'
+gem 'mail'
 
 # App Gems
 gem 'tinder'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -37,10 +37,15 @@ GEM
     json (1.7.5)
     listen (0.5.3)
     lumberjack (1.0.2)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.3.6)
     multipart-post (1.1.5)
+    polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -79,6 +84,9 @@ GEM
       multi_json (~> 1.0)
       multipart-post (~> 1.1)
       twitter-stream (~> 0.1)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
     twitter-stream (0.1.16)
       eventmachine (>= 0.12.8)
       http_parser.rb (~> 0.5.1)
@@ -97,6 +105,7 @@ DEPENDENCIES
   guard-shotgun!
   haml
   hashie
+  mail
   rack-test
   rake
   rspec

diff --git a/apps/jira/config.yml b/apps/jira/config.yml
diff --git a/apps/jira/jira.rb b/apps/jira/jira.rb
diff --git a/lib/base.rb b/lib/base.rb
@@ -247,9 +247,10 @@ def sanitize_log_value(value)
 
 
     def pre_process_payload(raw)
-      raw = Hashie::Mash.new(raw).payload
-      return {} unless raw
-      result = Hashie::Mash.new({:raw => raw})
+      result = Hashie::Mash.new(raw)
+      raw = result.delete(:payload)
+      return result unless raw
+
       if raw[:tickets]
         result[:tickets] = []
         raw[:tickets].each {|ticket| result[:tickets] << SupportBee::Ticket.new(auth, ticket) }