totoro 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1bd582f2fffa08dd029c8d11c77552868322cc8f71bd92f18880966362d70ab
-  data.tar.gz: 0deb992d109d947d598de595b50e3e1f09fcee10e178ac6921ef3d1761aaec9c
+  metadata.gz: d269f2a6ff5d6ce6614c5d54ddff5b23a5c007d84e8a4ec4b2a57cda302bcf4a
+  data.tar.gz: b5f71fbdcf2865d0680f10206654a5cd34d1532eed991a422986bd71ecdbc4d1
 SHA512:
-  metadata.gz: 54f94fdc1deee3e4c2a92eea73ddf8e406989210f95989e19ced9f3f95101d3265fd310a5ebc882cefdc89abcadca079e0a6b5e0a60c5a0d0d5d051100fd76f3
-  data.tar.gz: ebc2e7d9c63fb256b2c7572c60fc284a63016e96327ae93c52a7f45447c761d5c714d8fef1fa0752e7b44ba2f763dc58c4d162ccf2e7980d4622a1a55eb62693
+  metadata.gz: ce032ca8e828afc6ad7a7ad787c0398a34fe390d9ba7b199bfd7814bac3ca3c8c03ca11e53b7f708c531d88ce75019111582103b2793be2c846f658c7c26d51a
+  data.tar.gz: 646da7438886bf68ca7b41b4e30bdca329a1c42198f231ef6643da2a05a08191ea34eead2abf34275f08035153c67547ac80d7f9069dcc29ccf3210355467471

data/Gemfile

@@ -1,6 +1,8 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in totoro.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "totoro"
+require 'bundler/setup'
+require 'totoro'
 
 # 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 +11,5 @@ require "totoro"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/totoro

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'totoro'
 # You might want to change this
 ENV['RAILS_ENV'] ||= 'development'
@@ -12,14 +14,15 @@ Rails.logger = logger = Logger.new STDOUT
 logger.level = Logger.const_get(Rails.configuration.log_level.to_s.upcase)
 
 worker_name = ARGV[0]
+queue_class = Totoro::Queue
 logger.info 'Start to subscribe to Rabbitmq'
-worker = Totoro::Config.get_worker worker_name
+worker = queue_class.get_worker worker_name
 worker_queue = worker.class::QUEUE
-Totoro::Queue.subscribe(worker_queue) do |delivery_info, metadata, payload|
+queue_class.subscribe(worker_queue) do |delivery_info, metadata, payload|
   logger.info "#{worker_queue} Received: #{payload}"
   payload_hash = JSON.parse(payload).with_indifferent_access
   worker.process payload_hash, metadata, delivery_info
 end
 
 logger.info 'Listening to the Rabbitmq'
-Totoro::Queue.channel.work_pool.join
+queue_class.channel.work_pool.join

data/lib/generators/totoro/config_generator.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Totoro
   class ConfigGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
-    desc "Generate totoro config file"
-    
+    desc 'Generate totoro config file'
+
     def copy_config_file
       template 'totoro.yml', File.join('config', 'totoro.yml')
     end

data/lib/generators/totoro/templates/totoro.yml

@@ -1,14 +1,25 @@
 default: &default
-  connect:
-    host: rabbitmq
-    port: 5672
-    user: app
-    pass: app
-
-  queue:
-    # example_queue:
-    #   name: real.queue.name
-    #   durable: true
+  default:
+    connect:
+      host: rabbitmq
+      port: 5672
+      user: app
+      pass: app
+    queue:
+      # example_queue:
+      #   name: real.queue.name
+      #   durable: true
+  
+  custom:
+    connect:
+      host: rabbitmq2
+      port: 5672
+      user: app
+      pass: app
+    queue:
+      # example_queue:
+      #   name: real.queue.name
+      #   durable: true
 
 
 development:

data/lib/generators/totoro/worker_generator.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
+
 module Totoro
   class WorkerGenerator < Rails::Generators::Base
-    desc "Generate totoro worker file"
+    desc 'Generate totoro worker file'
 
     source_root File.expand_path('../templates', __FILE__)
     argument :name, type: :string
     argument :queue, type: :string, required: false
-    
+
     def copy_config_file
-      template 'worker.rb', File.join('app/models/worker', "#{name.underscore}.rb")
+      template 'worker.rb',
+               File.join('app/models/worker', "#{name.underscore}.rb")
     end
   end
 end

data/lib/totoro.rb

@@ -1,4 +1,6 @@
-require "totoro/version"
+# frozen_string_literal: true
+
+require 'totoro/version'
 require 'totoro/config'
 require 'totoro/queue'
 

data/lib/totoro/{queue.rb → base_queue.rb}

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
 module Totoro
-  class Queue
+  class BaseQueue
     class <<self
+      def config
+        @config ||= Totoro::Config.new
+      end
+
       def connection
-        @connection ||= Bunny.new(Totoro::Config.connect).tap(&:start)
+        @connection ||= Bunny.new(config.connect).tap(&:start)
       end
 
       def channel
@@ -15,17 +21,21 @@ module Totoro
 
       # enqueue = publish to direct exchange
       def enqueue(id, payload)
-        queue = channel.queue(*Totoro::Config.queue(id))
+        queue = channel.queue(*config.queue(id))
         payload = JSON.dump payload
         exchange.publish(payload, routing_key: queue.name)
       end
 
       def subscribe(id)
-        queue = channel.queue(*Totoro::Config.queue(id))
+        queue = channel.queue(*config.queue(id))
         queue.subscribe do |delivery_info, metadata, payload|
           yield(delivery_info, metadata, payload)
         end
       end
+
+      def get_worker(worker_class)
+        ::Worker.const_get(worker_class.to_s.camelize).new
+      end
     end
   end
 end

data/lib/totoro/config.rb

@@ -1,27 +1,28 @@
+# frozen_string_literal: true
+
 module Totoro
   class Config
-    class <<self
-      def data
-        @data ||= Rails.application.config_for(:totoro).with_indifferent_access
-      end
+    def initialize(prefix)
+      @data = Rails.application.config_for(:totoro).with_indifferent_access
+      @data = @data[prefix] if prefix.present?
+    end
 
-      def reset_data
-        @data = nil
-      end
+    def reset_data
+      @data = nil
+    end
 
-      def connect
-        data[:connect]
-      end
+    def connect
+      @data[:connect]
+    end
 
-      def queue(id)
-        name = data[:queue][id][:name]
-        settings = { durable: data[:queue][id][:durable] }
-        [name, settings]
-      end
+    def queue(id)
+      name = data[:queue][id][:name]
+      settings = { durable: data[:queue][id][:durable] }
+      [name, settings]
+    end
 
-      def get_worker(worker_class)
-        ::Worker.const_get(worker_class.to_s.camelize).new
-      end
+    def get_worker(worker_class)
+      ::Worker.const_get(worker_class.to_s.camelize).new
     end
   end
 end

data/lib/totoro/initializer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Totoro
+  class Initializer
+    DEFAULT_CONFIG = %i[default connect queue].freeze
+    def excute
+      config = Rails.application.config_for(:totoro).with_indifferent_access
+      # set default queue class
+      Totoro.const_set('Queue', default_queue_class(config))
+      # set custom queue class
+      (config.symbolize_keys.keys - DEFAULT_CONFIG).each do |prefix|
+        prefix_module(prefix, queue_class(prefix))
+      end
+    end
+
+    private
+
+    def default_queue_class(config)
+      if config.key?(:default)
+        queue_class(:default)
+      else
+        Class.new(Totoro::BaseQueue)
+      end
+    end
+
+    def queue_class(prefix)
+      custom_queue_class = Class.new(Totoro::BaseQueue)
+      custom_queue_class.define_singleton_method('config') do
+        @config ||= Totoro::Config.new(prefix)
+      end
+      custom_queue_class
+    end
+
+    def prefix_module(prefix, custom_queue_class)
+      prefix_module = Totoro.const_set(prefix.camelize, Module.new)
+      prefix_module.const_set('Queue', custom_queue_class)
+    end
+  end
+end

data/lib/totoro/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Totoro
-  VERSION = "0.1.3"
+  VERSION = '0.1.4'
 end

data/spec/spec_helper.rb

@@ -1,9 +1,9 @@
-require "bundler/setup"
-require "totoro"
+require 'bundler/setup'
+require 'totoro'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
-  config.example_status_persistence_file_path = ".rspec_status"
+  config.example_status_persistence_file_path = '.rspec_status'
 
   # Disable RSpec exposing methods globally on `Module` and `main`
   config.disable_monkey_patching!

data/spec/totoro_spec.rb

@@ -1,9 +1,9 @@
 RSpec.describe Totoro do
-  it "has a version number" do
+  it 'has a version number' do
     expect(Totoro::VERSION).not_to be nil
   end
 
-  it "does something useful" do
+  it 'does something useful' do
     expect(false).to eq(true)
   end
 end

data/totoro.gemspec

@@ -1,24 +1,28 @@
 
-lib = File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "totoro/version"
+require 'totoro/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "totoro"
+  spec.name          = 'totoro'
   spec.version       = Totoro::VERSION
-  spec.authors       = ["ShuHui18"]
-  spec.email         = ["shu.hui@blockchaintech.net.au"]
+  spec.authors       = ['ShuHui18']
+  spec.email         = ['shu.hui@blockchaintech.net.au']
 
-  spec.summary       = %q{tool for rabbitmq}
-  spec.description   = %q{Enpower rabbitmq to make it configrable}
-  spec.homepage      = "https://github.com/blockchaintech-au/totoro"
-  spec.license       = "MIT"
+  spec.summary       = 'tool for rabbitmq'
+  spec.description   = 'Enpower rabbitmq to make it configrable'
+  spec.homepage      = 'https://github.com/blockchaintech-au/totoro'
+  spec.license       = 'MIT'
 
   spec.files         = Dir['**/*'].keep_if { |file| File.file?(file) }
-  spec.executables   = ["totoro"]
-  spec.require_paths = ["lib"]
+  spec.executables   = ['totoro']
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'bunny', '~> 2.10'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: totoro
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ShuHui18
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-06-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,8 +87,9 @@ files:
 - lib/generators/totoro/templates/worker.rb
 - lib/generators/totoro/worker_generator.rb
 - lib/totoro.rb
+- lib/totoro/base_queue.rb
 - lib/totoro/config.rb
-- lib/totoro/queue.rb
+- lib/totoro/initializer.rb
 - lib/totoro/version.rb
 - pkg/totoro-0.1.1.gem
 - pkg/totoro-0.1.2.gem