jackal 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87d40ed9a2151a4e456b7a80a817e81856b471b5
-  data.tar.gz: cfda4c42c5e359630c8d296c1f8be8f4fbb1956a
+  metadata.gz: aad960864456381c1973a63d0410dea7200be1fc
+  data.tar.gz: 43787842bebae529547b90613402f0f84f77eab0
 SHA512:
-  metadata.gz: d3b2963e4f7f5ee5078665980843904fd17afd1edd04b1ff1865e6bbfa109826fb688f1a68645d0f11e8465c549337cd7450de81f578070ccd2e0477c021645b
-  data.tar.gz: d2dc8f35b125bdf42beb18a30786d9396adcf5e67d1b17e7a059fa50a19310c8353c51555f1c30c639e7b6455e4b3f188262ff2f3b0dd27812683b55045ebb2d
+  metadata.gz: 3edc50f45995b3154e0c6726b85c44a41403ef3b4f7a020321a802a29a076c9ef5a7fee9af6596f15d2272fa92273d4057a9ab917ac3228720f03f270733b217
+  data.tar.gz: 46d2b9a99c0fac02cbd7bff500b840a778389b3484d867df4ee1d5fe3db9624a22f78c4a4baeeb422f446a3a7cbb261e982def6c3191252bc148b35fed109751

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.2
+* Add support for `pre` and `post` formatters
+
 # v0.3.0
 * Force source looping on `Callback#completed`
 * Move HTTP hook configuration within jackal namespace

data/lib/jackal/callback.rb

@@ -13,8 +13,10 @@ module Jackal
     include Bogo::Constants
     include Bogo::Memoization
 
-    # @return [Array<Formatter>] formatters
+    # @return [Array<Formatter>] formatters applied on complete
     attr_reader :formatters
+    # @return [Array<Formatter>] formatters applied prior
+    attr_reader :pre_formatters
 
     # Create new instance
     #
@@ -22,9 +24,31 @@ module Jackal
     def initialize(*_)
       super
       if(service_config[:formatters])
-        @formatters = service_config[:formatters].map do |klass_name|
+        setup_formatters
+      end
+    end
+
+    # Initialize any required formatters
+    #
+    # @return [TrueClass, FalseClass]
+    def setup_formatters
+      f_config = service_config[:formatters]
+      case f_config
+      when Hash
+        @formatters = f_config.fetch(:pre, []).map do |klass_name|
           constantize(klass_name).new(self)
         end
+        @pre_formatters = f_config.fetch(:post, []).map do |klass_name|
+          constantize(klass_name).new(self)
+        end
+      when Array
+        @formatters = f_config.map do |klass_name|
+          constantize(klass_name).new(self)
+        end
+        @pre_formatters = []
+      else
+        error "Formatters configuration error. Unable to process type `#{f_config.class}`."
+        false
       end
     end
 
@@ -137,7 +161,11 @@ module Jackal
     # @return [Smash]
     def apply_formatters!(payload)
       formatters.each do |formatter|
-        formatter.format(payload)
+        begin
+          formatter.format(payload)
+        rescue => e
+          error "Formatter error encountered (<#{formatter}>): #{e.class} - #{e}"
+        end
       end
     end
 

data/lib/jackal/utils/payload.rb

@@ -26,7 +26,17 @@ module Jackal
       # @return [Smash]
       def unpack(message)
         msg = message[:message].to_smash
-        msg.fetch(:payload, msg)
+        result = msg.fetch(:payload, msg)
+        if(respond_to?(:pre_formatters) && (pre_formatters && !pre_formatters.empty?))
+          pre_formatters.each do |formatter|
+            begin
+              formatter.format(result)
+            rescue => e
+              error "Formatter error encountered (<#{formatter}>): #{e.class} - #{e}"
+            end
+          end
+        end
+        result
       end
 
     end

data/lib/jackal/utils/spec/helpers.rb

@@ -1,7 +1,7 @@
 require 'multi_json'
 require 'carnivore/spec_helper'
 
-Celluloid.logger.level = 0 if ENV['DEBUG']
+Celluloid.logger.level = ENV['DEBUG'] ? 0 : 4
 
 # Default source setup higher than base carivore default
 unless(ENV['CARNIVORE_SOURCE_SETUP'])
@@ -51,10 +51,15 @@ end
 # Configure using custom configuration JSON within config
 # directory of current test
 #
-# @param config [String, Symbol] name of configuration file without json extension
+# @param config [String, Symbol] name of configuration file
 # @return [Thread] thread with running source
 def run_setup(config)
-  path = File.join(Dir.pwd, 'test/specs/config', "#{config}.json")
+  config_dir = File.join(Dir.pwd, 'test', 'specs', 'config')
+  path = Dir.glob(File.join(config_dir, "#{config}*")).first
+
+  msg = "No file matching #{config} found in #{config_dir}"
+  raise msg unless path
+
   Thread.abort_on_exception = true
   runner = Thread.new do
     Jackal::Loader.run!(:config => path)

data/lib/jackal/version.rb

@@ -1,4 +1,4 @@
 module Jackal
   # Current library version
-  VERSION = Gem::Version.new('0.3.0')
+  VERSION = Gem::Version.new('0.3.2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore