msgr 0.0.0 → 0.1.0

data/lib/msgr/pool.rb

@@ -11,10 +11,11 @@ module Msgr
       @size         = (opts[:size] || Celluloid.cores).to_i
       @running      = false
 
+      raise ArgumentError.new 'Pool size must be greater zero.' if @size <= 0
+
       log(:debug) { "Inialize size => #{@size}" }
 
-      start if opts[:autostart].nil? || opts[:autostart]
-      every(30) { log_status } if opts[:nostats].nil? || opts[:nostats]
+      every([opts.fetch(:stats_interval, 30).to_i, 1].max) { log_status } if opts[:nostats].nil? || opts[:nostats]
     end
 
     def running?
@@ -37,9 +38,7 @@ module Msgr
         idle << Worker.new_link(Actor.current, index, @runner_klass, @runner_args)
       end
 
-      log(:debug) { 'Startup done. Invoke worker polling.' }
-
-      idle.each { |worker| async.poll worker }
+      log(:debug) { 'Pool ready.' }
     end
 
     def log_status
@@ -63,6 +62,7 @@ module Msgr
 
       log(:debug) { 'Graceful shutdown done.' }
     end
+    alias_method :shutdown, :stop
 
     # Check if a worker is available.
     #
@@ -78,9 +78,22 @@ module Msgr
 
     # Dispatch given message to a worker.
     #
-    def dispatch(message, *args)
-      messages.push [message, args]
-      after(0) { signal :dispatch }
+    def dispatch(*args)
+      log(:debug) { 'Dispatch message to worker.' }
+
+      fetch_idle_worker.future :dispatch, args
+    end
+
+    # Return an idle worker.
+    #
+    def fetch_idle_worker
+      if (worker = idle.shift)
+        busy << worker
+        worker
+      else
+        wait :worker_done
+        fetch_idle_worker
+      end
     end
 
     # Called by worker to indicated it has finished processing.
@@ -92,7 +105,7 @@ module Msgr
 
       if running?
         idle << worker
-        poll worker
+        after(0) { signal :worker_done }
       else
         log(:debug) { "Terminate worker. Still #{busy.size} to go..." }
 
@@ -104,24 +117,6 @@ module Msgr
       end
     end
 
-    def poll(worker)
-      return unless worker.alive?
-
-      if running?
-        if (message = exclusive { messages.shift })
-          idle.delete worker
-          busy << worker
-
-          worker.dispatch message[0], message[1]
-        else
-          after(1) { poll worker }
-        end
-      else
-        worker.terminate if worker.alive?
-        after(0) { signal(:shutdown) } if @busy.empty?
-      end
-    end
-
     def to_s
       "#{self.class.name}[#{@runner_klass}]<#{object_id}>"
     end
@@ -146,15 +141,20 @@ module Msgr
       # Dispatch given method and argument to custom runner.
       # Arguments are used to call `#send` on runner instance.
       #
-      def dispatch(method, args)
-        log(:debug) { "Dispatch to runner: #{runner.class.name}##{method.to_s}" }
+      def dispatch(args)
+        log(:debug) { "Dispatch to runner: #{runner.class.name}" }
 
         # Send method to custom runner.
-        runner.send method, *args
+        runner.send :call, *args
+
       rescue => error
         log(:error) { "Received error from runner: #{error.message}\n#{error.backtrace.join("    \n")}" }
       ensure
-        pool.executed Actor.current
+        if pool.alive?
+          pool.executed Actor.current
+        else
+          terminate
+        end
       end
 
       def to_s

data/lib/msgr/railtie.rb

@@ -0,0 +1,51 @@
+module Msgr
+
+  class Railtie < ::Rails::Railtie
+    config.msgr = ActiveSupport::OrderedOptions.new
+    config.autoload_paths << File.expand_path("#{Rails.root}/app/consumers") if File.exist?("#{Rails.root}/app/consumers")
+
+    initializer 'msgr.logger' do |app|
+      app.config.msgr.logger ||= Rails.logger
+    end
+
+    initializer 'msgr.rabbitmq_config' do
+      config.msgr.rabbitmq_config ||= Rails.root.join *%w(config rabbitmq.yml)
+    end
+
+    initializer 'msgr.routes_file' do
+      config.msgr.routes_file ||= Rails.root.join *%w(config msgr.rb)
+    end
+
+    # Start msgr
+    initializer 'msgr.start' do
+      config.after_initialize do |app|
+        Msgr.logger = app.config.msgr.logger
+        Celluloid.logger = app.config.msgr.logger
+
+        cfile  = app.config.msgr.rabbitmq_config.to_s
+        config = YAML.load ERB.new(File.read(cfile)).result
+
+        raise ArgumentError, 'Could not load rabbitmq config.' unless config.is_a? Hash
+        raise ArgumentError, 'Could not load rabbitmq environment config ' unless config[Rails.env]
+
+        client = Msgr::Client.new config[Rails.env]
+        client.routes.files << app.config.msgr.routes_file
+        client.routes.reload
+
+        if Rails.env.development?
+          reloader = ActiveSupport::FileUpdateChecker.new client.routes.files do
+            client.routes.reload
+            client.reload
+          end
+
+          ActionDispatch::Reloader.to_prepare do
+            reloader.execute_if_updated
+          end
+        end
+
+        Msgr.client = client
+        client.start
+      end
+    end
+  end
+end

data/lib/msgr/route.rb

@@ -1,16 +1,14 @@
 module Msgr
 
   class Route
-    attr_reader :consumer, :action, :opts, :key
-    alias_method :routing_key, :key
+    attr_reader :consumer, :action, :opts
 
     def initialize(key, opts = {})
-      @key  = key.to_s
       @opts = opts
-
-      raise ArgumentError.new 'Routing key required.' unless @key.present?
       raise ArgumentError.new 'Missing `to` options.' unless @opts[:to]
 
+      add key
+
       if (match = /\A(?<consumer>\w+)#(?<action>\w+)\z/.match(opts[:to].strip.to_s))
         @consumer = "#{match[:consumer].camelize}Consumer"
         @action   = match[:action].underscore
@@ -19,8 +17,23 @@ module Msgr
       end
     end
 
+    def keys
+      @keys ||= []
+    end
+    alias_method :routing_keys, :keys
+
+    def add(key)
+      raise ArgumentError.new 'Routing key required.' unless key.present?
+
+      keys << key
+    end
+
+    def accept?(key, opts)
+      self.opts == opts
+    end
+
     def name
-      "msgr.consumer-#{key}//#{consumer}##{action}"
+      "msgr.consumer.#{consumer}.#{action}"
     end
   end
 end

data/lib/msgr/routes.rb

@@ -1,17 +1,49 @@
 module Msgr
 
   class Routes
+    attr_reader :routes
     delegate :each, to: :@routes
 
-    def routes
-      @routes ||= []
+    def initialize
+      @routes = []
     end
 
     def configure(&block)
       instance_eval &block
     end
 
+    def files
+      @files ||= []
+    end
+
+    def files=(files)
+      @files = Array files
+    end
+
+    def reload
+      routes.clear
+      files.each do |file|
+        if File.exists? file
+          load file
+        else
+          Msgr.logger.warn "Routes file `#{file}` does not exists (anymore)."
+        end
+      end
+    end
+
+    def load(file)
+      raise ArgumentError.new "File `#{file}` does not exists." unless File.exists? file
+      instance_eval File.read file
+    end
+
     def route(key, opts = {})
+      routes.each do |route|
+        if route.accept? key, opts
+          route.add key
+          return
+        end
+      end
+
       routes << Msgr::Route.new(key, opts)
     end
   end

data/lib/msgr/version.rb

@@ -1,7 +1,7 @@
 module Msgr
   module VERSION
     MAJOR = 0
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/lib/msgr.rb

@@ -4,11 +4,15 @@ require 'active_support'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/core_ext/hash/keys'
+require 'json'
 
 require 'msgr/logging'
 require 'msgr/binding'
 require 'msgr/client'
 require 'msgr/connection'
+require 'msgr/consumer'
 require 'msgr/dispatcher'
 require 'msgr/errors'
 require 'msgr/message'
@@ -16,21 +20,25 @@ require 'msgr/pool'
 require 'msgr/route'
 require 'msgr/routes'
 
+require 'msgr/railtie' if defined? Rails
+
 module Msgr
 
   class << self
+    attr_accessor :client
+    delegate :publish, to: :client
+
     def logger
-      @logger ||= Logger.new($stdout).tap do |logger|
-        logger.level = Logger::Severity::INFO
+      if @logger.nil?
+        @logger = Logger.new $stdout
+        @logger.level = Logger::Severity::INFO
       end
-    end
 
-    def start
-      # stub
+      @logger
     end
 
-    def publish
-      # stub
+    def logger=(logger)
+      @logger = logger
     end
   end
 end

data/msgr.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Msgr::VERSION
   spec.authors       = ['Jan Graichen']
   spec.email         = ['jg@altimos.de']
-  spec.description   = %q{}
-  spec.summary       = %q{}
+  spec.description   = %q{Msgr: Rails-like Messaging Framework}
+  spec.summary       = %q{Msgr: Rails-like Messaging Framework}
   spec.homepage      = 'https://github.com/jgraichen/msgr'
   spec.license       = 'MIT'
 
@@ -23,7 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'celluloid'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'coveralls'
 end

data/scripts/simple_test.rb

@@ -1,114 +1,38 @@
 require 'msgr'
 
-Msgr.logger.level = Logger::Severity::DEBUG
+Msgr.logger.level = Logger::Severity::INFO
 
-@client = Msgr::Client.new uri: 'amqp://msgr:msgr@localhost'
+class TestConsumer < Msgr::Consumer
+  def index
+    log(:info) { payload }
+  end
 
-@client.routes.configure do
-  route 'abc.#', to: 'test#index'
-  route 'cde.#', to: 'test#index'
-  route '#', to: 'test#another_action'
-end
-
-@client.start
+  def another_action
+    log(:info) { payload }
+  end
 
-10.times do |i|
-  @client.publish 'abc.XXX', "Message #{i} #{rand}"
+  def log_name
+    "<TestConsumer##{action}>"
+  end
 end
 
-sleep 5
+@client = Msgr::Client.new user: 'guest', password: 'guest', size: 1
 
 @client.routes.configure do
   route 'abc.#', to: 'test#index'
+  route 'cde.#', to: 'test#index'
+  route '#', to: 'test#another_action'
 end
 
-@client.reload
+@client.start
 
-10.times do |i|
+100.times do |i|
   @client.publish 'abc.XXX', "Message #{i} #{rand}"
 end
 
 begin
   sleep
 rescue Interrupt
-  @client.stop
+ensure
+  @client.stop timeout: 10
 end
-
-#class Dispatcher
-#  include Msgr::Logging
-#
-#  def call(message)
-#    log(:info) { message }
-#    sleep 5 * rand
-#    log(:info) { 'Done' }
-#  end
-#end
-#
-#pool = Msgr::Pool.new Dispatcher, size: 10
-#pool.start
-#
-#100.times do |i|
-#  pool.dispatch(:call, "Message ##{i}")
-#end
-#
-#sleep 5
-#
-#pool.stop
-#pool.terminate
-#
-#Msgr.logger.info('[ROOT]') { 'Pool terminated.' }
-
-#require 'celluloid'
-#
-#class Worker
-#  include Celluloid
-#
-#  def do_work
-#    sleep 15
-#  end
-#end
-#
-#logger = Logger.new $stdout
-#
-#pool = Worker.pool
-#
-#logger.info 'Start work'
-#
-#4.times do |i|
-#  pool.async.do_work
-#end
-#
-#logger.info 'Wait'
-#
-#sleep 5
-#
-#logger.info 'Terminate'
-#
-#pool.terminate
-#
-#logger.info 'Done.'
-
-
-#require 'bunny'
-#
-#bunny = Bunny.new 'amqp://msgr:msgr@localhost'
-#bunny.start
-#
-#channel  = bunny.create_channel
-#exchange = channel.topic 'msgr.topic'
-#queue    = channel.queue 'msgr.test.single-queue'
-#
-#queue.bind(exchange, routing_key: 'a.b.#')
-#queue.bind(exchange, routing_key: 'a.c.#')
-#queue.subscribe do |delivery_info, metadata, payload|
-#  puts "#{delivery_info.routing_key} #{payload}"
-#end
-#
-#sleep 1
-#
-#10.times { |i| exchange.publish "Message ##{i}", routing_key: [ 'a.b.c', 'a.c.d', 'a.b', 'a' ].sample; sleep 0.2 }
-#
-#sleep 10
-#
-#channel.close
-#bunny.close

data/spec/fixtures/msgr-routes-test-1.rb

@@ -0,0 +1,2 @@
+# Test routes
+route 'abc.#', to: 'test#index'

data/spec/integration/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/integration/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/spec/integration/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/spec/integration/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/spec/integration/dummy/app/consumers/application_consumer.rb

@@ -0,0 +1,3 @@
+class ApplicationConsumer < Msgr::Consumer
+
+end

data/spec/integration/dummy/app/consumers/test_consumer.rb

@@ -0,0 +1,12 @@
+class TestConsumer < ApplicationConsumer
+
+  def index
+    data = { fuubar: 'abc' }
+
+    publish data, to: 'local.test.another_action'
+  end
+
+  def another_action
+    puts "#{payload.inspect}"
+  end
+end

data/spec/integration/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/integration/dummy/app/controllers/test_controller.rb

@@ -0,0 +1,10 @@
+class TestController < ApplicationController
+
+  def index
+    @data = { abc: 'abc' }
+
+    Msgr.publish @data, to: 'local.test.index'
+
+    render nothing: true
+  end
+end

data/spec/integration/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/spec/integration/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/integration/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/integration/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/integration/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/integration/dummy/config/application.rb

@@ -0,0 +1,24 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    config.msgr.logger = Logger.new $stdout
+  end
+end
+

data/spec/integration/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)