rising_dragon 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c5d93d6e463303f924ecf079f76eb71d9a119b9
-  data.tar.gz: d129eaa86cdc2cac07d6f57f7d8a87fe7e2f5479
+SHA256:
+  metadata.gz: cb5dc5654759f81fba65dc418831a23d1ecc4ceb73db69ca8fef62f72b3c557c
+  data.tar.gz: 7e6eeee3233eb3beb3ceee64d5c7715e79f38486d8e92cb7aea634e0149805f4
 SHA512:
-  metadata.gz: 4bc67eae15b2d2e78c97102bc64d1bf8642368c45548fe9f22eb76dfce5f34a9bc112af92cf9e29b752da7e3be4556e0e986ce9f8b3c3545f5ef7aa6331a5b5b
-  data.tar.gz: 2f548e49ae67e1306a1876b42d0ea86a31410a02bc49f5e991d99532aed4fc328c1c69097453115e4a22ef76da3ced9de138788e4a5f9bc53d70b3e0aa32e350
+  metadata.gz: efdfb06d72a98f0ff4199b28336af0f111d5af155e62a4250beb990226f0d05676080ec12a95e91afc579e6ecac8745011446f3458782a1545bd41cbef3db716
+  data.tar.gz: 278d17f1fad7a5174c4f946e013bd9155e23d6a758e6c71ce146e985a97dbb94ba91a777376307b369eacd03c2459266dd327d2de61f62e27e44440839ebd81d

data/.rubocop.yml

@@ -1,14 +1,10 @@
 inherit_gem:
-  onkcop:
-    - 'config/rubocop.yml'
+  fincop:
+    - 'config/rails.yml'
     - 'config/rspec.yml'
+    - 'config/rubocop.yml'
 
 AllCops:
-  TargetRubyVersion: 2.4
-  DisplayStyleGuide: true
+  TargetRubyVersion: 2.5
 
-RSpec/ExampleLength:
-  Max: 100
-
-RSpec/MultipleExpectations:
-  Max: 30
+  DisplayStyleGuide: true

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rising_dragon.gemspec
 gemspec

data/README.md

@@ -13,7 +13,7 @@ Use AWS SQS/SNS as event worker for Microservices.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rising_dragon', '>= 0.3.4'
+gem 'rising_dragon'
 ```
 
 And then execute:

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rising_dragon"
+require 'bundler/setup'
+require 'rising_dragon'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "rising_dragon"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/rising_dragon.rb

@@ -1,15 +1,15 @@
-require "json"
-require "securerandom"
+require 'json'
+require 'securerandom'
 
-require "shoryuken"
+require 'shoryuken'
 
-require "rising_dragon/version"
-require "rising_dragon/event"
-require "rising_dragon/error"
-require "rising_dragon/sns/publisher"
-require "rising_dragon/sqs/emitter"
-require "rising_dragon/sqs/handler"
-require "rising_dragon/sqs/worker"
+require 'rising_dragon/version'
+require 'rising_dragon/event'
+require 'rising_dragon/error'
+require 'rising_dragon/sns/publisher'
+require 'rising_dragon/sqs/emitter'
+require 'rising_dragon/sqs/handler'
+require 'rising_dragon/sqs/worker'
 
 module RisingDragon
   extend SingleForwardable

data/lib/rising_dragon/event.rb

@@ -1,11 +1,12 @@
 module RisingDragon
   class Event
     attr_reader :id, :type, :timestamp, :data
-    def initialize(id:, type:, timestamp:, data:)
+    def initialize(id:, type:, timestamp:, data:, sqs_msg:)
       @id = id
       @type = type
       @timestamp = timestamp
       @data = data
+      @sqs_msg = sqs_msg
     end
 
     def to_json(*option)
@@ -16,5 +17,9 @@ module RisingDragon
         data: @data,
       }.to_json(*option)
     end
+
+    def delete!
+      @sqs_msg.delete
+    end
   end
 end

data/lib/rising_dragon/sns/publisher.rb

@@ -18,7 +18,7 @@ module RisingDragon
       private
 
         def create_event(type, data)
-          ::RisingDragon::Event.new(id: uuid, timestamp: unixtime, type: type, data: data)
+          ::RisingDragon::Event.new(id: uuid, timestamp: unixtime, type: type, data: data, sqs_msg: nil)
         end
 
         def uuid

data/lib/rising_dragon/sqs/emitter.rb

@@ -44,19 +44,19 @@ module RisingDragon
         nil
       end
 
-      def event_from_json(body)
-        msg = JSON.parse(body["Message"])
+      def event_from_json(sqs_msg, body)
+        msg = JSON.parse(body['Message'])
 
-        id = msg["id"]
-        type = msg["type"]
-        timestamp = Time.at(msg["timestamp"] / 1000.0)
-        data = msg["data"]
+        id = msg['id']
+        type = msg['type']
+        timestamp = Time.at(msg['timestamp'] / 1000.0)
+        data = msg['data']
 
-        ::RisingDragon::Event.new(id: id, type: type, timestamp: timestamp, data: data)
+        ::RisingDragon::Event.new(id: id, type: type, timestamp: timestamp, data: data, sqs_msg: sqs_msg)
       end
 
-      def emit_sns_msg(body)
-        event = event_from_json(body)
+      def emit_sqs_msg(sqs_msg, body)
+        event = event_from_json(sqs_msg, body)
         emit_event(event)
       end
     end

data/lib/rising_dragon/sqs/worker.rb

@@ -10,17 +10,17 @@ module RisingDragon
 
       module ClassMethods
         def rising_dragon_options(sqs_queue_name, opt = {})
-          shoryuken_opt = { queue: sqs_queue_name, body_parser: :json, auto_delete: true, shoryuken_group: "default" }.merge(opt)
+          shoryuken_opt = { queue: sqs_queue_name, body_parser: :json, auto_delete: true, shoryuken_group: 'default' }.merge(opt)
           shoryuken_options(shoryuken_opt)
 
-          register_queue(sqs_queue_name, shoryuken_opt["shoryuken_group"], opt) # shoryuken_options will change hash key.... :(
+          register_queue(sqs_queue_name, shoryuken_opt['shoryuken_group'], opt) # shoryuken_options will change hash key.... :(
         end
 
         def register_queue(sqs_queue_name, group_name, option)
-          concurrency = option["concurrency"] || 25
+          concurrency = option['concurrency'] || 25
           Shoryuken.add_group(group_name, concurrency)
 
-          weight = option["weight"] || 1
+          weight = option['weight'] || 1
           Shoryuken.add_queue(sqs_queue_name, weight, group_name)
         end
 
@@ -37,9 +37,9 @@ module RisingDragon
         end
       end
 
-      def perform(_sqs_msg, body)
-        self.class.emitter.emit_sns_msg(body)
-      rescue => e
+      def perform(sqs_msg, body)
+        self.class.emitter.emit_sqs_msg(sqs_msg, body)
+      rescue StandardError => e
         rescue_from(e)
       end
 

data/lib/rising_dragon/version.rb

@@ -1,3 +1,3 @@
 module RisingDragon
-  VERSION = "0.3.4".freeze
+  VERSION = '0.4.0'.freeze
 end

data/rising_dragon.gemspec

@@ -1,44 +1,41 @@
-# coding: utf-8
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rising_dragon/version"
+require 'rising_dragon/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rising_dragon"
+  spec.name          = 'rising_dragon'
   spec.version       = RisingDragon::VERSION
-  spec.authors       = ["ota42y"]
-  spec.email         = ["ota42y@gmail.com"]
+  spec.authors       = ['ota42y']
+  spec.email         = ['ota42y@gmail.com']
 
-  spec.summary       = "Event driven architecture library for AWS SNS/SQS"
-  spec.homepage      = "https://github.com/ota42y/rising_dragon"
-  spec.description   = "Event driven architecture library for AWS SNS/SQS include SQS worker and SNS publisher"
-  spec.license       = "MIT"
+  spec.summary       = 'Event driven architecture library for AWS SNS/SQS'
+  spec.homepage      = 'https://github.com/ota42y/rising_dragon'
+  spec.description   = 'Event driven architecture library for AWS SNS/SQS include SQS worker and SNS publisher'
+  spec.license       = 'MIT'
 
   if spec.respond_to?(:metadata)
     # allow push to any host
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "shoryuken", "~> 3.1.7"
+  spec.add_dependency 'shoryuken', '>= 3.1.7'
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3"
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3'
 
-  spec.add_development_dependency "rubocop", "~> 0.49.1"
-  spec.add_development_dependency "onkcop", "~> 0.49.1"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "pry-byebug", "~> 3.4"
-  spec.add_development_dependency "aws-sdk-core", ">= 3"
-  spec.add_development_dependency "aws-sdk-sqs"
+  spec.add_development_dependency 'aws-sdk-core', '>= 3'
+  spec.add_development_dependency 'aws-sdk-sqs'
+  spec.add_development_dependency 'fincop', '>= 0.52.1.0'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry-byebug', '~> 3.4'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rising_dragon
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - ota42y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoryuken
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.7
 - !ruby/object:Gem::Dependency
@@ -67,89 +67,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: onkcop
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: fincop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.52.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.52.1.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-sqs
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: Event driven architecture library for AWS SNS/SQS include SQS worker
   and SNS publisher
 email:
@@ -198,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Event driven architecture library for AWS SNS/SQS