eventq_aws 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f59d43ccd53c473e52953c7c9148c2dc0b53e8d
-  data.tar.gz: e3c52d01f9d13f3187aa564a3ebd26b0688b38de
+  metadata.gz: 03485b12e0f3d6e734ae5975d2d7d70b576881e8
+  data.tar.gz: 3cf5148f98760516519a41a9689e79e15b96a903
 SHA512:
-  metadata.gz: c14d414adb62321ed87a14870d12d2018bfab6b9c51b39aee771d1e5fbacc03cbc09653de84a3748b4f37cd0735217ab0960d6885c18e63f877047605a8a3d80
-  data.tar.gz: 52075f013c6ddeff487e606089dd3fd3f1caac01fbe7b40a1a37a3ce753b6fc4b233b35e20c9d35ab402e954b2379d836257e5c42e8207122952968d8adb18d6
+  metadata.gz: 2f453802fb0828d85dca5ffb0111385a659633476ab9941801355443cfd023ff1ab343b47f9b4698f88e1b3f1ea4f7137536426ce45ad413a79e477bb4ec5421
+  data.tar.gz: 1d4f9ac52244ffd036c2e2796dce6ecac25f825d2ac066cd8aad2a06ba96999e45b09bac3eaaaf2ad1a848aa3d02d0eb7c6d2a8d698bb71ac60b0844fb5882e8

data/lib/eventq_aws/aws_queue_worker.rb

@@ -9,6 +9,8 @@ module EventQ
         @is_running = false
 
         @retry_exceeded_block = nil
+
+        @hash_helper = HashKit::Helper.new
       end
 
       def start(queue, options = {}, &block)
@@ -67,17 +69,17 @@ module EventQ
                   retry_attempts = msg.attributes['ApproximateReceiveCount'].to_i - 1
 
                   #deserialize the message payload
-                  message = Oj.load(msg.body)
-                  payload = Oj.load(message["Message"])
+                  payload = Oj.load(msg.body)
+                  message = deserialize_message(payload["Message"])
 
-                  message_args = EventQ::MessageArgs.new(payload.type, retry_attempts)
+                  message_args = EventQ::MessageArgs.new(message.type, retry_attempts)
 
                   EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{retry_attempts}")
 
                   #begin worker block for queue message
                   begin
 
-                    block.call(payload.content, message_args)
+                    block.call(message.content, message_args)
 
                     if message_args.abort == true
                       abort = true
@@ -143,6 +145,14 @@ module EventQ
         return @is_running
       end
 
+      def deserialize_message(payload)
+        begin
+          return Oj.load(payload)
+        rescue Oj::ParseError
+          return @hash_helper.symbolize(Oj.load(payload, mode: :compat))
+        end
+      end
+
       private
 
       def reject_message(queue, client, msg, q, retry_attempts)

data/lib/eventq_aws/version.rb

@@ -1,5 +1,5 @@
 module EventQ
   module Amazon
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/lib/eventq_aws.rb

@@ -1,5 +1,6 @@
 require 'aws-sdk-core'
 require 'oj'
+require 'hash_kit'
 require 'eventq_base'
 
 require 'eventq_aws/version'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: eventq_aws
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,42 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventq_base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash_kit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This is the aws implementation for EventQ
@@ -117,13 +131,13 @@ extra_rdoc_files: []
 files:
 - bin/console
 - bin/setup
+- lib/eventq_aws.rb
 - lib/eventq_aws/aws_eventq_client.rb
 - lib/eventq_aws/aws_queue_client.rb
 - lib/eventq_aws/aws_queue_manager.rb
 - lib/eventq_aws/aws_queue_worker.rb
 - lib/eventq_aws/aws_subscription_manager.rb
 - lib/eventq_aws/version.rb
-- lib/eventq_aws.rb
 homepage: https://github.com/vaughanbrittonsage/eventq
 licenses:
 - MIT
@@ -134,19 +148,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This is the aws implementation for EventQ
 test_files: []
-has_rdoc: