esp-commons 0.2.8 → 0.2.9

data/lib/esp-commons/engine.rb

@@ -4,7 +4,7 @@ module EspCommons
   class Engine < ::Rails::Engine
     isolate_namespace EspCommons
 
-    config.autoload_paths << File.expand_path('../', __FILE__)
+    config.autoload_paths << File.expand_path('../lib/', __FILE__)
 
     config.before_configuration do
       Settings.define 'appeals.url',      :env_var => 'APPEALS_URL'

data/lib/esp-commons/{message_maker.rb → lib/message_maker.rb}

@@ -6,7 +6,7 @@ class MessageMaker
 
     amqp_client.start
 
-    exchange = amqp_client.exchange('esp.exchange', :type => :topic)
+    exchange = amqp_client.exchange('esp', :type => :topic)
 
     queue = amqp_client.queue(queue_name, :durable => true)
 

data/lib/esp-commons/{requester.rb → lib/requester.rb}

@@ -3,7 +3,7 @@ require 'curb'
 class Requester
   def initialize(url, headers_accept = nil)
     @response = Curl::Easy.perform(url) do |curl|
-      curl.headers['Accept'] = headers_accept
+      curl.headers['Accept'] = headers_accept if headers_accept
     end
   end
 
@@ -20,7 +20,7 @@ class Requester
   end
 
   def response_body
-    @response_body ||= response.body_str
+    @response_body ||= response.body_str.force_encoding 'UTF-8'
   end
 
   def response_hash

data/lib/esp-commons/lib/subscriber.rb

@@ -0,0 +1,56 @@
+require 'amqp'
+
+class Subscriber
+  def start
+    subscribers.each do |subscriber|
+      AMQP.start(Settings['amqp.url']) do |connection|
+        channel = AMQP::Channel.new(connection)
+        channel.prefetch(1)
+
+        exchange = channel.topic('esp')
+        queue = channel.queue(queue_name(subscriber), :durable => true)
+
+        queue.bind(exchange, :routing_key => '*')
+
+        Signal.trap("TERM") do
+          connection.close do
+            logger.info "#{subscriber.class} stopped"
+            EM.stop { exit }
+          end
+        end
+
+        queue.subscribe(:ack => true) do |header, message|
+          method = header.routing_key
+          if subscriber.respond_to?(method)
+            logger.debug("#{subscriber.class} receive #{method}: #{message}")
+            subscriber.send(method, message)
+            header.ack
+          else
+            logger.warn "#{subscriber.class} not respond to #{method}"
+          end
+        end
+
+        logger.info "#{subscriber.class} started"
+      end
+    end
+  end
+
+  def subscribers
+    Dir.glob("#{Rails.root}/lib/subscribers/*").map do |subscriber_path|
+      require subscriber_path
+      File.basename(subscriber_path, '.rb').classify.constantize.new
+    end
+  end
+
+  def logger
+    @@logger ||= ActiveSupport::BufferedLogger.new("#{Rails.root}/log/subscriber.log")
+  end
+
+  private
+    def queue_name(subscriber)
+      from = subscriber.class.name.sub(/Subscriber$/, '').underscore
+      to = Rails.application.class.name.sub('::Application', '').underscore
+
+      "esp.#{from}.#{to}"
+    end
+end

data/lib/esp-commons/version.rb

@@ -1,3 +1,3 @@
 module EspCommons
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/generators/esp_commons/install/install_generator.rb

@@ -1,7 +1,12 @@
 module EspCommons
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('..', __FILE__)
+      source_root File.expand_path('../templates', __FILE__)
+
+      def create_scripts
+        copy_file 'script/subscriber'
+        chmod 'script/subscriber', 0755
+      end
     end
   end
 end

data/lib/generators/esp_commons/install/templates/script/subscriber

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../config/environment',  __FILE__)
+
+dir = Rails.root.to_s
+
+daemon_name = (dir.split('/')[-2..-1] << "daemon").join('-')
+
+daemon_options = {
+  :multiple   => false,
+  :dir_mode   => :normal,
+  :dir        => Rails.root.join('tmp', 'pids'),
+  :backtrace  => true
+}
+
+Daemons.run_proc(daemon_name, daemon_options) do
+  if ARGV.include?('--')
+    ARGV.slice! 0..ARGV.index('--')
+  else
+    ARGV.clear
+  end
+
+  Dir.chdir dir
+
+  Subscriber.new.start
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esp-commons
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
-  requirement: &14927960 !ruby/object:Gem::Requirement
+  requirement: &4143620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14927960
+  version_requirements: *4143620
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &14927280 !ruby/object:Gem::Requirement
+  requirement: &4142600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14927280
+  version_requirements: *4142600
 - !ruby/object:Gem::Dependency
   name: openteam-commons
-  requirement: &14925220 !ruby/object:Gem::Requirement
+  requirement: &4141820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14925220
+  version_requirements: *4141820
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14924400 !ruby/object:Gem::Requirement
+  requirement: &4141160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14924400
+  version_requirements: *4141160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14923640 !ruby/object:Gem::Requirement
+  requirement: &4233920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14923640
+  version_requirements: *4233920
 description: Description of EspCommons.
 email:
 - mail@openteam.ru
@@ -75,13 +75,15 @@ extra_rdoc_files: []
 files:
 - app/models/esp_commons/image.rb
 - config/locales/commons.ru.yml
+- lib/esp-commons/lib/message_maker.rb
+- lib/esp-commons/lib/subscriber.rb
+- lib/esp-commons/lib/requester.rb
 - lib/esp-commons/engine.rb
-- lib/esp-commons/message_maker.rb
-- lib/esp-commons/requester.rb
 - lib/esp-commons/version.rb
 - lib/esp-commons.rb
-- lib/generators/esp_commons/install/config/schedule.rb
 - lib/generators/esp_commons/install/install_generator.rb
+- lib/generators/esp_commons/install/templates/config/schedule.rb
+- lib/generators/esp_commons/install/templates/script/subscriber
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -99,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 191960683962064822
+      hash: -3731403451187529304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,10 +110,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 191960683962064822
+      hash: -3731403451187529304
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Summary of EspCommons.