totoro 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054f471cccf811b3c8541b3e0b12ef9939171747d50057012b883ccb5e8cd660
-  data.tar.gz: 17454620d69e705661b1827485826be4d764c4bdee92a5cb841cf61ebc20591c
+  metadata.gz: 3b1f49dd68bdc18d9fa1d15f53d3b2e1948305f1d7e371b11d4ff73bd1222124
+  data.tar.gz: a463608787db8e13d02ec08d015e3cba657bc12e74eae7beb2fd293d6b56c40b
 SHA512:
-  metadata.gz: 7879ada1b51de17ff076392033b14fbe3ddfa0932f9bed680e5fcf64d02c0267745e93f29ad06faf8e929e0770a67b6f275568aad5bb83f09e9cbb2dcab6aec4
-  data.tar.gz: 382b7d954a98576b4efdc1f1ba0b4e56dcb24c2bed80cf580924e0494305f493d6896f183dd174251eeacd48da69a12ad27f80b250ac61f4066e0881e103da01
+  metadata.gz: f501160e0fbc222a82195dabcea85f44c97d2ea82acc4a24bbe3bdae73d97e562982d1c4da938a43dd9b0a28ded4d690958b571d88cbad507f70d7458d60cdea
+  data.tar.gz: 5b7107a0aca94d895e21af9d0c627c0c9210ac127c0c1dbf78991b586635c58cc7ec98100a10770b501e1ed319731b98e1e2ff291554251b70b9384a591da0a2

data/lib/generators/totoro/config_generator.rb

@@ -2,7 +2,7 @@
 
 module Totoro
   class ConfigGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
     desc 'Generate totoro config file'
 
     def copy_config_file

data/lib/generators/totoro/init_generator.rb

@@ -2,7 +2,7 @@
 
 module Totoro
   class InitGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
     desc 'Generate totoro config file'
 
     def copy_config_file

data/lib/generators/totoro/templates/worker.rb.erb

@@ -2,15 +2,9 @@
 
 module Worker
   class <%= name.camelcase %> < Totoro::BaseWorker
+    setup queue_name: '<%= queue || name.underscore %>'<% if prefix.present? %> ,prefix: :<%= prefix %><% end %>
     def process(payload, metadata, delivery_info)
       # worker process
     end
-
-    private
-
-    def setup<% if prefix.present? %>
-      @prefix = :<%= prefix %><% end %>
-      @queue_name = '<%= queue || name.underscore %>'
-    end
   end
 end

data/lib/generators/totoro/worker_generator.rb

@@ -4,7 +4,7 @@ module Totoro
   class WorkerGenerator < Rails::Generators::Base
     desc 'Generate totoro worker file'
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
     argument :name, type: :string
     argument :queue, type: :string, required: false
     argument :prefix, type: :string, required: false

data/lib/totoro/base_queue.rb

@@ -18,7 +18,7 @@ module Totoro
       end
 
       def exchange
-        @exchanges ||= channel.default_exchange
+        @exchange ||= channel.default_exchange
       end
 
       # enqueue = publish to direct exchange

data/lib/totoro/base_worker.rb

@@ -2,8 +2,17 @@
 
 module Totoro
   class BaseWorker
+    def self.setup(attrs)
+      prefix = attrs[:prefix].present? ? attrs[:prefix] : :default
+      queue_name = attrs[:queue_name]
+      define_method('setup') do
+        raise(Totoro::NeedQueueNameError) if queue_name.nil?
+        @prefix = prefix
+        @queue_name = queue_name
+      end
+    end
+
     def initialize
-      @prefix = :default
       Rails.logger = @logger = Logger.new STDOUT
       @logger.level = Logger.const_get(
         Rails.configuration.log_level.to_s.upcase
@@ -26,10 +35,6 @@ module Totoro
 
     private
 
-    def setup
-      raise(Totoro::NeedQueueNameError, 'Need setup @queue_name')
-    end
-
     def queue_class
       if @prefix == :default
         Totoro::Queue

data/lib/totoro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Totoro
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/totoro.gemspec

@@ -1,7 +1,7 @@
 
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'totoro/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: totoro
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ShuHui18
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -103,6 +103,7 @@ files:
 - pkg/totoro-0.1.4.gem
 - pkg/totoro-0.1.5.gem
 - pkg/totoro-0.1.6.gem
+- pkg/totoro-0.2.0.gem
 - spec/spec_helper.rb
 - spec/totoro_spec.rb
 - test/totoro_test/Gemfile