kinetic 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fdcf06cf8d1fc5fff905da13c55c97c5c30f6bc
-  data.tar.gz: ff4a1483557bb7abd8863a87000795b3648ad0db
+  metadata.gz: e122b819ed7edf00284f34983a5c86871638256b
+  data.tar.gz: 320b36ce33d0ec79469250b62710fad9c363ecfb
 SHA512:
-  metadata.gz: 84695516ec05676070029529c68f77aaafd9a72204f329121cbf39eca176a6fe8546074b8b3072d867ce4820ed8bb6817360355e57eba23090e3a790c6906ea5
-  data.tar.gz: 40ad8453c43d7e53a00f0552dfb703329a946e41085211694cf1432a8f94b349d8545734ede32f73b1b9757af7b023169c3054c773b480617b965b89d57a81f7
+  metadata.gz: b6b6d4454c50f76b388c3e46cd0c6182b083d57b10871a2661da0056f5f0115709fc9d11fd92cc38d95851740ee87dc3bf98d80d4d80b8e1adbc61afdf048724
+  data.tar.gz: fd867edf038cd1514c775c397192dae3c8e5ee35696fb185c33adef8579b6f7ddb4d242286e1e331c1b061347a08927750f64c03ca97d1cd94c2e5ecdeefc045

data/examples/simple_worker.rb

@@ -5,4 +5,6 @@ set :port, 5672
 
 on('message') do |message|
   puts message
-end
+end
+
+timed_event(:simple_event, 5) { Kinetic::Publisher.publish('message', message: 'Hello World!') }

data/lib/kinetic/base.rb

@@ -2,6 +2,7 @@
 require 'logger'
 require 'fileutils'
 require 'yaml'
+require 'singleton'
 
 # external dependencies
 require 'amqp'
@@ -9,6 +10,7 @@ require 'confstruct'
 require 'kgio'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/hash/reverse_merge'
+require 'active_support/concern'
 require 'active_support/inflections'
 require 'awesome_print'
 require 'awesome_print/core_ext/logger'
@@ -21,57 +23,49 @@ require_relative '../kinetic/master'
 require_relative '../kinetic/worker'
 require_relative '../kinetic/dsl'
 require_relative '../kinetic/errors'
+require_relative '../kinetic/publisher'
 
 module Kinetic
 
   module Delegator
 
-    %w{on config logging set config_file deserialize}.each { |m| delegate m.to_sym, to: :application }
+    Kinetic::DSL.public_instance_methods.each.each { |m| delegate m, to: :application }
 
     def application
-      Application
+      Application.instance
     end
 
 
   end
 
   class Base
+    include Singleton
+    include Kinetic::DSL
+    
+    def initialize
+      logger.info "Kinetic #{Kinetic::VERSION}"
+      logger.debug "Loading serializer #{config.serializer}"
+      require "kinetic/serializers/#{config.serializer.downcase}"
+      @serializer = Object.const_get("Kinetic::Serializers::#{config.serializer}")
+    end
 
-    class << self
-      include Kinetic::DSL
-
-
-      def after_fork_procs
-        @after_fork_procs ||= []
-      end
-
-      def exchanges
-        @exchanges ||= {}
-      end
-
-      def deserialize(message)
-        @serializer.deserialize(message)
-      end
-
-      private
-
-      def set_serializer(serializer)
-        logger.debug "Loading serializer #{serializer}"
-        require "kinetic/serializers/#{serializer.downcase}"
-        @serializer = Object.const_get("Kinetic::Serializers::#{serializer}")
-      end
+    private
 
-      def direct
-        exchanges[:direct] ||= {}
-      end
+    def direct
+      exchanges[:direct] ||= {}
+    end
 
+    def after_fork_procs
+      @after_fork_procs ||= []
     end
 
-    def initialize
-      self.class.send(:set_serializer, config.serializer)
+    def exchanges
+      @exchanges ||= {}
     end
 
-    delegate :logger, :set, :get, :get!, :exchanges, :after_fork_procs, :deserialize, :config, to: :class
+    def timed_events
+      @timed_events ||= {}
+    end
 
   end
 

data/lib/kinetic/cli.rb

@@ -17,7 +17,7 @@ module Kinetic
     class Application < Base
     end
 
-    at_exit { Master.new(Application.new).send(ARGV[0] || 'run') if $!.nil? }
+    at_exit { Master.new(Application.instance).send(ARGV[0] || 'run') if $!.nil? }
   else
     puts CLI::PARSER.banner
     exit(1)

data/lib/kinetic/configuration.rb

@@ -1,3 +1,4 @@
+require 'confstruct'
 module Kinetic
 
   # Configuration can be set either by passing the {Kinetic::DSL#set set} method and or by using the

data/lib/kinetic/dsl.rb

@@ -1,9 +1,13 @@
 require_relative 'dsl/configuration'
+require_relative 'dsl/timed_events'
+require_relative 'dsl/serialization'
 module Kinetic
 
   module DSL
 
     include Configuration
+    include TimedEvents
+    include Serialization
 
     def after_fork(&block)
       raise Kinetic::Errors::BlockMissing unless block_given?
@@ -11,7 +15,6 @@ module Kinetic
     end
 
 
-
     # Defines a direct queue subscription. Direct queues do not allow fuzzy matching so all messages sent to this queue
     # must exactly match the key.
     #

data/lib/kinetic/dsl/serialization.rb

@@ -0,0 +1,11 @@
+module Kinetic
+  module DSL
+    module Serialization
+
+      def deserialize(message)
+      @serializer.deserialize(message)
+      end
+      
+    end
+  end
+end

data/lib/kinetic/dsl/timed_events.rb

@@ -0,0 +1,13 @@
+module Kinetic
+  module DSL
+    module TimedEvents
+
+      # Creates a timed event that fired at the set interval. Can be used to broadcast messages
+      # to all connected workers.
+      def timed_event(label, interval, options={}, &block)
+        timed_events[label] = {interval: interval, options: options, block: block}
+      end
+
+    end
+  end
+end

data/lib/kinetic/master.rb

@@ -7,7 +7,7 @@ module Kinetic
     WORKERS    = {}
     SIG_QUEUE  = []
 
-    delegate :logger, :config, :set, :after_fork_procs, to: :app
+    delegate :logger, :config, :set, to: :app
 
     attr_reader :app, :reexecpid
 
@@ -32,7 +32,7 @@ module Kinetic
         daemonize if config[:daemonize]
         enable_logging!
         logger.debug 'Configuration:'
-        logger.ap    app.class.send(:config).to_hash
+        logger.ap    app.config.to_hash
         proc_name 'master'
         initialize_self_pipe!
         initialize_signal_traps!
@@ -129,7 +129,7 @@ module Kinetic
           begin
             proc_name "worker-#{worker_nr}"
             logger.debug 'Calling after fork procs'
-            after_fork_procs.each { |p| p.call }
+            app.send(:after_fork_procs).each { |p| p.call }
             #noinspection RubyArgCount
             worker.run
           rescue => e

data/lib/kinetic/publisher.rb

@@ -1,6 +1,92 @@
 require 'logger'
-
-require 'msgpack'
 require 'bunny'
+require 'singleton'
+require 'active_support/core_ext/module/delegation'
+
+
+require_relative 'dsl/configuration'
+require_relative './configuration'
+
+module Kinetic
+
+  class Publisher
+    include Kinetic::DSL::Configuration
+    include Singleton
+
+    class << self
+
+      def method_missing(meth, *args, &block)
+        self.instance.send(meth, *args, &block)
+      end
+
+    end
+
+    def initialize
+      logger.debug "Using serializer #{config.serializer}"
+      require_relative "./serializers/#{config.serializer.to_s.downcase}"
+      @serializer = Kinetic::Serializers.const_get(config.serializer)
+   	end
+
+    def publish_topic(key, message)
+      topic_exchange.publish(serialize(message), routing_key: key)
+      true
+    end
+
+    def publish_fanout(key, message)
+      fanout_exchange.publish(serialize(message), routing_key: key)
+    end
+
+    def publish_direct(key, message)
+      direct_exchange.publish(serialize(message), routing_key: key)
+    end
+
+    alias :publish :publish_direct
+
+    private
+
+    def topic_exchange
+    	exchange(:topic)
+    end
+
+    def fanout_exchange
+    	exchange(:fanout)
+    end
+
+    def direct_exchange
+      exchange(:direct)
+    end
+
+    def serialize(message)
+      @serializer.serialize(message)
+    end
+
+    def deserialize(message)
+      @serializer.deserialize(message)
+    end
+
+    private
+
+    def exchange(type)
+    	Bunny::Exchange.new(channel, type, "#{config.name}.#{type}")
+    end
+
+
+    def channel
+      unless @connection
+        logger.info "Establishing publisher connection to amqp://#{config.host}:#{config.port}"
+        @connection = Bunny.new(host: config.host, port: config.port, threaded: false)
+        logger.debug 'Starting connection'
+        @connection.start
+        @channel    = @connection.channel
+      end
+      @channel
+    end
+
+    def logger
+      @logger ||= Logger.new(File.join(config.root, config.log_file))
+   	end
+
+
+  end
 
-#TODO: Finish publisher
+end

data/lib/kinetic/version.rb

@@ -1,3 +1,3 @@
 module Kinetic
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/kinetic/worker.rb

@@ -29,6 +29,7 @@ module Kinetic
         initialize_channel!(connection)
         initialize_exchanges!
         initialize_subscribers!
+        initialize_timed_events!
       end
     end
 
@@ -60,7 +61,7 @@ module Kinetic
       logger.debug 'Initializing exchanges'
       @exchanges = {}
       prefix = config.name
-      app.exchanges.each_key do |name|
+      app.send(:exchanges).each_key do |name|
         logger.debug "   Initializing #{name} exchange"
         @exchanges[name] = channel.send(name, "#{prefix}.#{name}")
       end
@@ -68,12 +69,12 @@ module Kinetic
 
     def initialize_subscribers!
       logger.debug 'Initializing subscribers'
-      app.exchanges.each do |name, value|
+      app.send(:exchanges).each do |name, value|
         logger.debug "   Building subscribers for '#{name}' exchange"
         value.each do |queue, block|
           logger.debug "   Initializing queue for '#{queue}'"
           q = channel.queue(queue)
-          logger.debug "   Binding queue to '#{name}' exchange"
+          logger.debug "   Binding queue to '#{name}' exchange with routing_key '#{queue}'"
           q.bind(exchanges[name], routing_key: queue)
           logger.debug "   Subscribing to messages for '#{queue}'"
           q.subscribe do |meta, payload|
@@ -87,5 +88,13 @@ module Kinetic
       end
     end
 
+    def initialize_timed_events!
+      logger.debug 'Initializing timed events'
+      app.send(:timed_events).each do |label, event|
+        logger.debug "   Creating timer for #{label}"
+        event[:timer] = EM.add_periodic_timer(event[:interval]) { event[:block].call }
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kinetic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jarod Reid
@@ -186,6 +186,8 @@ files:
 - lib/kinetic/configuration.rb
 - lib/kinetic/dsl.rb
 - lib/kinetic/dsl/configuration.rb
+- lib/kinetic/dsl/serialization.rb
+- lib/kinetic/dsl/timed_events.rb
 - lib/kinetic/errors.rb
 - lib/kinetic/master.rb
 - lib/kinetic/publisher.rb
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A powerful yet simple AMQP worker framework
@@ -223,3 +225,4 @@ test_files:
 - spec/base_spec.rb
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
+has_rdoc: