appfuel-service 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d89625ae0ff9e49ecd85a326aec3467a84d91bb
-  data.tar.gz: 910682f71f8d186de81227cd6a77026ef9793732
+  metadata.gz: 61149209ac903dc3cae423f04a741c76fea1ae48
+  data.tar.gz: e81f73fb4a7bcd86f9b286eab347564d1e1de736
 SHA512:
-  metadata.gz: 358fa56770a955568a92c697233f5e5c899eb6f2acabee45569940a12d97c1a2e981986dddf9e4780e6072a51e9ead2d85df3a30b6702a5268830d540d51e85d
-  data.tar.gz: 2189021627302cab3ed90a64cd2ddcddf40204fd03384e5c7ad6ecb6a59a09bfb43ac4fc3d87b30a8e6401f1b861eced2e3713977c8c838d52399c7771402baf
+  metadata.gz: ee88a0fad46adbdd86e00cd121cddd2a65ba74d2e49f93a6f2b63086c5bcbc4b8d3292b484a859174328c6977a850a6e220afee4e45bef99f51558b0c1abff13
+  data.tar.gz: 4870fa74f0eeb0e45361db359dc5b765ad8cdec6d30d50592e534b0ca2cd87fae8faceba0454ce883c5191cfb22c86a5e5fbda475f056f56015c2b468ad7084e

data/CHANGELOG.md

@@ -3,8 +3,14 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 # [Unreleased]
 
+
 # Releases
+## [[0.1.4]](https://github.com/rsb/appfuel/releases/tag/0.1.3) 2017-06-14
+### Added
+- Initialzers for worker and db
 
 ## [[0.1.3]](https://github.com/rsb/appfuel/releases/tag/0.1.3) 2017-06-07
 ### Added
 - Configuration definitions for database, aws, worker, sentry and new relic
+### Added
+- Method in Config.rb such that it overrides the default implimentation.Also added test   case fro Config.rb.

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in appfuel-service.gemspec
 gemspec
 
-#gem 'appfuel',  path: '../appfuel'
+#gem 'appfuel', path:'../appfuel'
 
 group :test do
   gem "simplecov", "~> 0.14"

data/README.md

@@ -1,36 +1,7 @@
-[![Build
-Status](https://travis-ci.org/rsb/appfuel-service.svg?branch=master)](https://travis-ci.org/rsb/appfuel-service)
+[![Travis Build Status](https://travis-ci.org/rsb/appfuel-service.svg?branch=master)](https://travis-ci.org/rsb/appfuel-service)
 # Appfuel::Service
+A `microservice` pattern using `Appfuel` with a [Sneaker's](http://jondot.github.io/sneakers/) and [RabbitMQ](https://www.rabbitmq.com/)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/appfuel/service`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'appfuel-service'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install appfuel-service
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

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.2.7"
+  spec.add_dependency "appfuel",  "~> 0.2"
   spec.add_dependency "sneakers", "~> 2.5"
 
   spec.add_development_dependency "bundler",  "~> 1.15"

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

@@ -3,17 +3,15 @@ module Appfuel
     module Config
       def self.newrelic_definition
         Appfuel::Configuration.define :newrelic do
-          defaults license_key: '',
-                   app_name: '',
-                   log_level: 'info',
-                   monitor_mode: 'true',
-                   agent_enabled:'true'
+          defaults log_level:     'info',
+                   monitor_mode:  'true',
+                   agent_enabled: 'true'
           validator {
-            required(:new_relic_license_key).filled(:str?)
-            required(:new_relic_app_name).filled(:str?)
-            required(:new_relic_log_level).filled(:str?)
-            required(:new_relic_monitor_mode).filled(:str?)
-            required(:new_relic_agent_enabled).filled(:str?)
+            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

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

@@ -28,6 +28,8 @@ module Appfuel
         Appfuel::Configuration.define :sneakers do
           defaults heartbeat: 60,
                   ack: true,
+                  pid_path: 'tmp/sneakers.pid',
+                  log: 'tmp/log/sneakers.log',
                   daemonize: true,
                   workers: 1,
                   threads: 1,

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

@@ -30,17 +30,11 @@ module Appfuel
             # Children will be validated on there own
             # we are just ensuring they exist
             required(:db).filled(:hash?)
-            optional(:sneakers).filled(:hash?)
-            optional(:aws).filled(:hash?)
-            optional(:sentry).filled(:hash?)
-            optional(:newrelic).filled(:hash?)
+            required(:sneakers).filled(:hash?)
           }
           self << [
-            Config.db_definition,
             Config.sneakers_definition,
-            Config.aws_definition,
-            Config.sentry_definition,
-            Config.newrelic_definition
+            Config.db_definition,
           ]
         end
       end

data/lib/appfuel/service/config.rb

@@ -5,3 +5,75 @@ require_relative 'config/aws'
 require_relative 'config/worker'
 require_relative 'config/sentry'
 require_relative 'config/newrelic'
+
+module Appfuel
+  module Service
+    module Config
+
+      class << self
+
+        # Returns the worker definition while allowing you to override it and
+        # its child definition values through the options hash
+        #
+        # @param options [Hash]
+        # @return Appfuel::Configuration::DefinitionDsl
+        def definition(options = {})
+          definition = options.delete(:definition) || worker_definition
+          update_definition(definition, options)
+        end
+
+        def update_definition(definition, options)
+          options = validate_hash!(options)
+          return definition if options.empty?
+
+          [:defaults, :file, :env, :exclude, :children].each do |type|
+            name = "definition_#{type}"
+            send(name, definition, options[type]) if options.key?(type)
+          end
+
+          definition
+        end
+
+        private
+
+        def definition_file(definition, file)
+          definition.file(file)
+        end
+
+        def definition_defaults(definition, defaults)
+          defaults = validate_hash!(defaults, :defaults)
+          definition.defaults(definition.defaults.merge(defaults))
+        end
+
+        def definition_env(definition, env)
+          env = validate_hash!(options[:env], :env)
+          definition.env(definition.env.merge(env))
+        end
+
+        def definition_exclude(definition, excludes)
+          if excludes.is_a?(String) || excludes.is_a?(Symbol)
+            excludes = [exlcudes]
+          end
+          Fail "Options (excludes) must be an array" unless excludes.is_a?(Array)
+
+          excludes.each do |item|
+            definition.delete(item)
+          end
+        end
+
+        def definition_children(definition, children)
+          validate_hash!(children, :children).each do |key, options|
+            update_definition(definition[key], options)
+          end
+        end
+
+        def validate_hash!(value, key =  nil)
+          msg = "Options"
+          msg << " (#{key})" unless key.nil?
+          fail "#{msg} must be a hash" unless value.is_a?(Hash)
+          value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,27 @@
+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/message_broker.rb

@@ -0,0 +1,25 @@
+Appfuel::Initialize.define('global.message_broker') do |config, container|
+  unless config.key?(:sneakers)
+    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"
+  end
+
+  require 'sneakers'
+  require 'sneakers/runner'
+
+  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))
+  nil
+end

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

@@ -0,0 +1,4 @@
+Appfuel::Initialize.define('global.worker') do |config, container|
+
+
+end

data/lib/appfuel/service/initializers.rb

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

data/lib/appfuel/service/version.rb

@@ -1,5 +1,5 @@
 module Appfuel
   module Service
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/appfuel/service/worker.rb

@@ -7,7 +7,22 @@ module Appfuel
 
       class << self
         def inherited(klass)
-          stage_class_for_registration(klass)
+          container = klass.app_container
+          consumer_key = "#{klass.top_container_key}.consumer_keys"
+          unless container.key?(consumer_key)
+            container.register(consumer_key, [])
+          end
+          key = klass.container_class_path
+          container.register(key, klass)
+          container[consumer_key] << key
+        end
+
+        def top_container_key
+          "message_brokers"
+        end
+
+        def container_class_type
+          'consumers'
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel-service
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appfuel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sneakers
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,11 @@ files:
 - 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/message_broker.rb
+- lib/appfuel/service/initializers/worker.rb
 - lib/appfuel/service/msg_request.rb
 - lib/appfuel/service/version.rb
 - lib/appfuel/service/worker.rb