appfuel-service 0.1.7 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d380dded6c4c32db4057a65025b99a57b1a58f
-  data.tar.gz: 262bd00527db2c4e0ff4196244319a4c20307b4f
+  metadata.gz: a3c22097e153fb04fdb6960de41250197d35b497
+  data.tar.gz: f5ff621f80b073bef84cc4e22f530bc8fec3d7e8
 SHA512:
-  metadata.gz: 651d244d4dae5fe65aab6e58fe5cf5ddb800c9bfeaf6cc6655255a1a6efe9797529a7591477caede1dc7c7fb0e8702e4aa5065bef13c390940e814137d2d5794
-  data.tar.gz: 498b51239ad70c3a954de33d3497214980e23a534483f9bdb8cfa3f3c0e42c50a4a842fec5bdc0227473b21fd6a0927565ffd8933641b6fe62ce0cf34a05db6d
+  metadata.gz: 4e3deed6e71ad5616e66e2bdfc105a1068ea2b2c357cb705ac9de6a3fe3db7e1954163a9dc16638ea0d145c07f651cdae8af97a49bdfaa5889822c62b87428d9
+  data.tar.gz: 5d12e7a068976c4a2ef8b30064d0e619be0426ddb67d1a2ed7a97da622575e281d4a2e1195f465740f5bd56e1859a9c18b4de51a932fb8e63b0e4d9002009219

data/CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
+## [[0.2.1]](https://github.com/rsb/appfuel/releases/tag/0.2.8) 2017-06-28
+### Fixed
+- fixed initializer for message broker to allow cli to start up individual
+  queues
+
+## [[0.2.0]](https://github.com/rsb/appfuel/releases/tag/0.2.0) 2017-06-21
+### Added
+- added rpc client to publish rabbitmq messages
+
 ## [[0.1.7]](https://github.com/rsb/appfuel/releases/tag/0.1.7) 2017-06-20
 ### Changed
 - `upgraded` `appfuel` to 0.3.0

data/appfuel-service.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "appfuel",  "~> 0.3"
+  spec.add_dependency "appfuel",  "~> 0.4"
   spec.add_dependency "sneakers", "~> 2.5"
 
   spec.add_development_dependency "bundler",  "~> 1.15"

data/lib/appfuel/service/config/sneakers.rb

@@ -25,7 +25,7 @@ module Appfuel
       #
       #   @returns Config::Definition
       def self.sneakers_definition
-        Appfuel::Configuration.define :sneakers do
+        Appfuel::Config.define :sneakers do
           defaults heartbeat: 60,
                   ack: true,
                   pid_path: 'tmp/sneakers.pid',

data/lib/appfuel/service/config/worker.rb

@@ -18,14 +18,16 @@ module Appfuel
       # aws         Configuration S3 where we store our documents
       # @return Definition
       def self.worker_definition
-        Appfuel::Configuration.define :worker do
+        Appfuel::Config.define :worker do
           file 'config/app.yaml'
-          defaults logfile: 'stdout',
+          defaults log_file:       'stdout',
+                    log_level:     'info',
                     audit_logfile: 'stdout'
 
           validator {
             required(:env).filled(:str?)
-            required(:logfile).filled(:str?)
+            required(:log_file).filled(:str?)
+            required(:log_level).filled(:str?)
             required(:audit_logfile).filled(:str?)
             # Children will be validated on there own
             # we are just ensuring they exist
@@ -34,7 +36,7 @@ module Appfuel
           }
           self << [
             Config.sneakers_definition,
-            Config.db_definition,
+            Appfuel::Config.db_definition,
           ]
         end
       end

data/lib/appfuel/service/config.rb

@@ -1,10 +1,6 @@
 require 'yaml'
-require_relative 'config/database'
 require_relative 'config/sneakers'
-require_relative 'config/aws'
 require_relative 'config/worker'
-require_relative 'config/sentry'
-require_relative 'config/newrelic'
 
 module Appfuel
   module Service

data/lib/appfuel/service/initializers/all.rb

@@ -0,0 +1,2 @@
+require 'appfuel/initializers/all'
+require_relative 'message_broker'

data/lib/appfuel/service/initializers/message_broker.rb

@@ -3,10 +3,9 @@ Appfuel::Initialize.define('global.message_broker') do |config, container|
     fail "[initializer message_broker] :sneakers not found"
   end
 
-  consumer_keys = container['message_brokers.consumer_keys']
-  unless consumer_keys.is_a?(Array)
-    fail "[initializer message_broker] message_borker.consumers must be " +
-         " an Array"
+  unless container['message_brokers.consumer_keys'].is_a?(Array)
+    fail "[initializer message_broker] message_borker.consumer_keys " +
+         "must be an Array"
   end
 
   require 'sneakers'
@@ -15,11 +14,6 @@ Appfuel::Initialize.define('global.message_broker') do |config, container|
   Sneakers.configure(config[:sneakers])
 
 
-  consumers = consumer_keys.each.inject([]) do |result, key|
-    result << container[key]
-    result
-  end
-
-  container.register("message_brokers.runner", Sneakers::Runner.new(consumers))
+  container.register("message_brokers.runner_class", Sneakers::Runner)
   nil
 end

data/lib/appfuel/service/rpc_client.rb

@@ -0,0 +1,57 @@
+module Appfuel
+  module Service
+    class RpcClient < Sneakers::Publisher
+      attr_accessor :call_id, :response
+      attr_reader :channel, :config, :exchange, :reply_queue, :lock, :condition
+
+      def publish(to_queue, action_route, msg, headers = {})
+        @mutex.synchronize do
+          ensure_connection! unless connected?
+        end
+
+        self.call_id = SecureRandom.uuid
+        msg          = msg.to_json
+        @response    = nil
+        params       = {
+          routing_key:    to_queue,
+          correlation_id: call_id,
+          reply_to:       reply_queue.name,
+          content_type:   'application/json',
+          headers:        {action_route: action_route}.merge(headers)
+        }
+
+        exchange.publish(msg, params)
+        lock.synchronize { condition.wait(lock) }
+
+        result = JSON.parse(@response)
+        Appfuel::ResponseHandler.new.create_response(result)
+      end
+
+      private
+
+      def ensure_connection!
+        super
+        @reply_queue = channel.queue('', exclusive: true)
+        subscribe
+      end
+
+      def subscribe
+        @lock      = Mutex.new
+        @condition = ConditionVariable.new
+        that       = self
+
+        reply_queue.bind(@opts[:exchange], routing_key: reply_queue.name)
+
+        reply_queue.subscribe do |_delivery_info, properties, payload|
+          if properties[:correlation_id] == that.call_id
+            that.response = payload.to_s
+            that.lock.synchronize { that.condition.signal }
+          else
+            Sneakers.logger.warn "request not found for correlation_id: " +
+                                 "(#{properties[:correlation_id]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/appfuel/service/version.rb

@@ -1,5 +1,5 @@
 module Appfuel
   module Service
-    VERSION = "0.1.7"
+    VERSION = "0.2.1"
   end
 end

data/lib/appfuel/service.rb

@@ -4,3 +4,4 @@ require "appfuel/service/version"
 require "appfuel/service/msg_request"
 require "appfuel/service/worker"
 require "appfuel/service/config"
+require "appfuel/service/rpc_client"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel-service
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appfuel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: sneakers
   requirement: !ruby/object:Gem::Requirement
@@ -102,17 +102,13 @@ files:
 - lib/appfuel/service.rb
 - lib/appfuel/service/config.rb
 - lib/appfuel/service/config/aws.rb
-- lib/appfuel/service/config/database.rb
-- lib/appfuel/service/config/newrelic.rb
-- lib/appfuel/service/config/sentry.rb
 - lib/appfuel/service/config/sneakers.rb
 - lib/appfuel/service/config/worker.rb
-- lib/appfuel/service/initializers.rb
-- lib/appfuel/service/initializers/db.rb
-- lib/appfuel/service/initializers/logging.rb
+- lib/appfuel/service/initializers/all.rb
 - lib/appfuel/service/initializers/message_broker.rb
 - lib/appfuel/service/initializers/worker.rb
 - lib/appfuel/service/msg_request.rb
+- lib/appfuel/service/rpc_client.rb
 - lib/appfuel/service/version.rb
 - lib/appfuel/service/worker.rb
 homepage: https://github.com/rsb/appfuel-service

data/lib/appfuel/service/config/database.rb

@@ -1,57 +0,0 @@
-module Appfuel
-  module Service
-    module Config
-      # Defines database configuration. This is designed to hold more than one
-      # database connection which is why they are named invidually. We are using
-      # active record so the config is taylored to that style connection.
-      #
-      # Configuration Overview
-      #
-      # pool:     Managed connection which controls the amount of thread access to
-      #           a limited number of database connections
-      # adapter:  We always use postgres, rarely changes
-      # encoding: We always use unicode, rarely changes
-      # database  Name of the database
-      # username  Name of the database user
-      # password  Database password
-      # host      Location of the database server
-      #
-      # @return Defintion
-      def self.db_definition
-        Appfuel::Configuration.define :db do
-          validator {
-            required(:main).filled(:hash?)
-            required(:path).filled(:str?)
-            required(:seed_path).filled(:str?)
-            required(:migrations_path).filled(:str?)
-          }
-
-          db_path = 'db'
-          defaults path: db_path,
-            migrations_path: "#{db_path}/migrations",
-            seed_path: 'db/seed'
-
-          define :main do
-            defaults pool:     5,
-              adapter: 'postgresql',
-              encoding: 'unicode',
-              schema_format: 'sql'
-
-            validator do
-              required(:schema_search_path).filled(:str?)
-              required(:schema_format).filled(:str?)
-              required(:database).filled(:str?)
-              required(:username).filled(:str?)
-              required(:password).filled(:str?)
-              required(:host).filled(:str?)
-              required(:adapter).filled(:str?)
-              optional(:pool).filled(:int?)
-              optional(:encoding).filled(:str?)
-              optional(:port).filled(:int?)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/appfuel/service/config/newrelic.rb

@@ -1,20 +0,0 @@
-module Appfuel
-  module Service
-    module Config
-      def self.newrelic_definition
-        Appfuel::Configuration.define :newrelic do
-          defaults log_level:     'info',
-                   monitor_mode:  'true',
-                   agent_enabled: 'true'
-          validator {
-            required(:license_key).filled(:str?)
-            required(:app_name).filled(:str?)
-            optional(:log_level).filled(:str?)
-            optional(:monitor_mode).filled(:str?)
-            optional(:agent_enabled).filled(:str?)
-          }
-        end
-      end
-    end
-  end
-end

data/lib/appfuel/service/config/sentry.rb

@@ -1,13 +0,0 @@
-module Appfuel
-  module Service
-    module Config
-      def self.sentry_definition
-        Appfuel::Configuration.define :sentry do
-          validator {
-             required(:dsn).filled(:str?)
-          }
-        end
-      end
-    end
-  end
-end

data/lib/appfuel/service/initializers/db.rb

@@ -1,21 +0,0 @@
-Appfuel::Initialize.define('global.db') do |config, container|
-  fail "[initializer db] :db config not found" unless config.key?(:db)
-  fail "[initializer db] :main not found in :db" unless config[:db].key?(:main)
-
-  require 'pg'
-  require 'active_record'
-  config[:db][:main] = config[:db][:main].with_indifferent_access
-
-  ActiveSupport.on_load(:active_record) do
-    if ActiveRecord::Base.connected?
-      ActiveRecord::Base.connection_pool.disconnect!
-    end
-
-    if container.key?(:logger)
-      ActiveRecord::Base.logger = container[:logger]
-    end
-
-    ActiveRecord::Base.establish_connection(config[:db][:main])
-  end
-  nil
-end

data/lib/appfuel/service/initializers/logging.rb

@@ -1,27 +0,0 @@
-Appfuel::Initialize.define('global.logging') do |config, container|
-  logfile = config[:logfile] || 'stdout'
-  logger_file = ->(file) {
-    file = file.to_s
-    if file.empty? || file.downcase == 'stdout'
-      file = $stdout
-    elsif file.downcase == 'stderr'
-      file = $stderr
-    else
-      file
-    end
-  }
-
-  factory = ->(file, level = 'info', file_coercer = logger_file) {
-    logger = Logger.new(file_coercer.call(file))
-    if level
-      logger.level = Logger.const_get(level.to_s.upcase)
-    end
-
-    logger.formatter = Sneakers::Support::ProductionFormatter
-    logger
-  }
-
-  container.register(:logger, factory.call(logfile))
-  container.register(:logger_factory, factory)
-  nil
-end

data/lib/appfuel/service/initializers.rb

@@ -1,4 +0,0 @@
-require_relative 'initializers/worker'
-require_relative 'initializers/logging'
-require_relative 'initializers/message_broker'
-require_relative 'initializers/db'