serf 0.11.0 → 0.12.0

data/lib/serf/middleware/error_handler.rb

@@ -1,4 +1,5 @@
 require 'hashie'
+require 'optser'
 
 require 'serf/parcel_builder'
 require 'serf/util/error_handling'
@@ -13,7 +14,6 @@ module Middleware
   #
   class ErrorHandler
     include Serf::Util::ErrorHandling
-    include Serf::Util::OptionsExtraction
 
     attr_reader :app
     attr_reader :parcel_builder
@@ -23,12 +23,12 @@ module Middleware
     # @param app the app
     #
     def initialize(app, *args)
-      extract_options! args
+      opts = Optser.extract_options! args
       @app = app
 
       # Tunable knobs
-      @parcel_builder = opts(:parcel_builder) { Serf::ParcelBuilder.new }
-      @uuidable = opts(:uuidable) { Serf::Util::Uuidable.new }
+      @parcel_builder = opts.get(:parcel_builder) { Serf::ParcelBuilder.new }
+      @uuidable = opts.get(:uuidable) { Serf::Util::Uuidable.new }
     end
 
     def call(parcel)

data/lib/serf/middleware/parcel_freezer.rb

@@ -1,6 +1,5 @@
 require 'ice_nine'
-
-require 'serf/util/options_extraction'
+require 'optser'
 
 module Serf
 module Middleware
@@ -9,8 +8,6 @@ module Middleware
   # Middleware to add uuids to the headers of the parcel hash.
   #
   class ParcelFreezer
-    include Serf::Util::OptionsExtraction
-
     attr_reader :app
     attr_reader :freezer
 
@@ -18,9 +15,9 @@ module Middleware
     # @param app the app
     #
     def initialize(app, *args)
-      extract_options! args
+      opts = Optser.extract_options! args
       @app = app
-      @freezer = opts :freezer, IceNine
+      @freezer = opts.get :freezer, IceNine
     end
 
     ##

data/lib/serf/middleware/parcel_masher.rb

@@ -1,6 +1,5 @@
 require 'hashie'
-
-require 'serf/util/options_extraction'
+require 'optser'
 
 module Serf
 module Middleware
@@ -9,8 +8,6 @@ module Middleware
   # Middleware to add uuids to the headers of the parcel hash.
   #
   class ParcelMasher
-    include Serf::Util::OptionsExtraction
-
     attr_reader :app
     attr_reader :masher_class
 
@@ -18,9 +15,9 @@ module Middleware
     # @param app the app
     #
     def initialize(app, *args)
-      extract_options! args
+      opts = Optser.extract_options! args
       @app = app
-      @masher_class = opts :masher_class, Hashie::Mash
+      @masher_class = opts.get :masher_class, Hashie::Mash
     end
 
     ##

data/lib/serf/middleware/policy_checker.rb

@@ -1,18 +1,16 @@
-require 'serf/util/options_extraction'
+require 'optser'
 
 module Serf
 module Middleware
 
   class PolicyChecker
-    include Serf::Util::OptionsExtraction
-
     attr_reader :app
     attr_reader :policy_chain
 
     def initialize(app, *args)
-      extract_options! args
+      opts = Optser.extract_options! args
       @app = app
-      @policy_chain = opts :policy_chain, []
+      @policy_chain = opts.get :policy_chain, []
     end
 
     ##

data/lib/serf/middleware/request_timer.rb

@@ -0,0 +1,47 @@
+require 'optser'
+
+module Serf
+module Middleware
+
+  class RequestTimer
+    attr_reader :app
+    attr_reader :timer
+
+    def initialize(app, *args)
+      opts = Optser.extract_options! args
+      @app = app
+      @timer = opts.get :timer, Serf::Middleware::RequestTimer::Timer
+    end
+
+    def call(parcel)
+      t = timer.start
+      response_parcel = app.call parcel
+      response_parcel.headers[:elapsed_time] = t.mark
+      return response_parcel
+    end
+
+    class Timer
+      attr_reader :start_time
+
+      class << self
+        alias_method :start, :new
+      end
+
+      def initialize
+        @start_time = now
+      end
+
+      def mark
+        (now - @start_time).to_i
+      end
+
+      def now
+        Time.now.to_f * 1_000_000
+      end
+
+    end
+
+  end
+
+end
+end

data/lib/serf/middleware/uuid_tagger.rb

@@ -1,6 +1,6 @@
 require 'hashie'
+require 'optser'
 
-require 'serf/util/options_extraction'
 require 'serf/util/uuidable'
 
 module Serf
@@ -10,8 +10,6 @@ module Middleware
   # Middleware to add uuids to the headers of the parcel hash.
   #
   class UuidTagger
-    include Serf::Util::OptionsExtraction
-
     attr_reader :app
     attr_reader :uuidable
 
@@ -19,9 +17,9 @@ module Middleware
     # @param app the app
     #
     def initialize(app, *args)
-      extract_options! args
+      opts = Optser.extract_options! args
       @app = app
-      @uuidable = opts(:uuidable) { Serf::Util::Uuidable.new }
+      @uuidable = opts.get(:uuidable) { Serf::Util::Uuidable.new }
     end
 
     def call(parcel)

data/lib/serf/parcel_builder.rb

@@ -1,6 +1,5 @@
 require 'hashie'
-
-require 'serf/util/options_extraction'
+require 'optser'
 
 module Serf
 
@@ -8,14 +7,12 @@ module Serf
   # Builds Parcels as Hashie::Mash objects with headers and messages.
   #
   class ParcelBuilder
-    include Serf::Util::OptionsExtraction
-
     attr_reader :mash_class
 
     def initialize(*args)
-      extract_options! args
+      opts = Optser.extract_options! args
 
-      @mash_class = opts :mash_class, Hashie::Mash
+      @mash_class = opts.get :mash_class, Hashie::Mash
     end
 
     def build(headers=nil, message=nil)

data/lib/serf/serfer.rb

@@ -1,7 +1,7 @@
 require 'hashie'
+require 'optser'
 
 require 'serf/parcel_builder'
-require 'serf/util/options_extraction'
 require 'serf/util/uuidable'
 
 module Serf
@@ -10,21 +10,19 @@ module Serf
   # Class to drive the Interactor execution.
   #
   class Serfer
-    include Serf::Util::OptionsExtraction
-
     attr_reader :interactor
     attr_reader :parcel_builder
     attr_reader :uuidable
 
     def initialize(interactor, *args)
-      extract_options! args
+      opts = Optser.extract_options! args
 
       # How to and when to handle requests
       @interactor = interactor
 
       # Tunable knobs
-      @parcel_builder = opts(:parcel_builder) { Serf::ParcelBuilder.new }
-      @uuidable = opts(:uuidable) { Serf::Util::Uuidable.new }
+      @parcel_builder = opts.get(:parcel_builder) { Serf::ParcelBuilder.new }
+      @uuidable = opts.get(:uuidable) { Serf::Util::Uuidable.new }
     end
 
     ##
@@ -35,7 +33,7 @@ module Serf
       message = parcel[:message]
 
       # 1. Execute interactor
-      response_message, response_kind = interactor.call message
+      response_kind, response_message = interactor.call message
 
       # 2. Create the response headers
       response_headers = uuidable.create_uuids headers

data/lib/serf/util/uuidable.rb

@@ -1,9 +1,8 @@
 require 'base64'
 require 'hashie'
+require 'optser'
 require 'uuidtools'
 
-require 'serf/util/options_extraction'
-
 module Serf
 module Util
 
@@ -14,13 +13,11 @@ module Util
   #   base64 encoded UUIDs without trailing '='.
   #
   class Uuidable
-    include Serf::Util::OptionsExtraction
-
     attr_reader :uuid_tool
 
     def initialize(*args)
-      extract_options! args
-      @uuid_tool = opts :uuid_tool, UUIDTools::UUID
+      opts = Optser.extract_options! args
+      @uuid_tool = opts.get :uuid_tool, UUIDTools::UUID
     end
 
     ##

data/lib/serf/version.rb

@@ -2,7 +2,7 @@ module Serf
 
   module Version
     MAJOR = 0
-    MINOR = 11
+    MINOR = 12
     PATCH = 0
     BUILD = nil
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join '.'

data/serf.gemspec

@@ -24,5 +24,6 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency('hashie', ['>= 1.2.0'])
   gem.add_runtime_dependency('ice_nine', ['>= 0.4.0'])
+  gem.add_runtime_dependency('optser', ['>= 0.1.0'])
   gem.add_runtime_dependency('uuidtools', ['>= 2.1.3'])
 end

data/spec/serf/builder_spec.rb

@@ -11,7 +11,7 @@ describe Serf::Builder do
   }
   let(:app) {
     lambda { |parcel|
-      return parcel, response_kind
+      return response_kind, parcel
     }
   }
   subject {
@@ -21,7 +21,7 @@ describe Serf::Builder do
   describe '#to_app' do
 
     it 'builds a callable app' do
-      subject.to_app.should respond_to(:call)
+      expect(subject.to_app).to respond_to(:call)
     end
 
   end
@@ -32,9 +32,8 @@ describe Serf::Builder do
 
       it 'runs the app' do
         response = subject.to_app.call request_parcel
-        puts response.to_hash
-        response.message.should == request_parcel.message
-        response.headers.kind.should == response_kind
+        expect(response.message).to eq(request_parcel.message)
+        expect(response.headers.kind).to eq(response_kind)
       end
 
     end

data/spec/serf/errors/policy_failure_spec.rb

@@ -5,7 +5,7 @@ require 'serf/errors/policy_failure'
 describe Serf::Errors::PolicyFailure do
 
   it {
-    should be_a_kind_of(RuntimeError)
+    expect(subject).to be_a_kind_of(RuntimeError)
   }
 
 end

data/spec/serf/loader/loader_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+require 'serf/loader/loader'
+
+describe Serf::Loader::Loader do
+  let(:root_library_path) {
+    File.join(File.dirname(__FILE__), '../../..')
+  }
+
+  context '#serfup Serf Map' do
+    let(:random_message) {
+      FactoryGirl.create :random_message
+    }
+    subject {
+      Serf::Loader::Loader.new.serfup(
+        globs: [
+          'example/**/*.serf'
+        ],
+        serfs: [
+          'subsystem/requests/create_widget'
+        ],
+        base_path: root_library_path,
+        env: {
+          success_message: random_message
+        })
+    }
+
+    it 'loads the Serfs into a frozen Serf Map' do
+      expect(subject.frozen?).to be_true
+    end
+
+    it 'loads our only serf into the map' do
+      expect(subject.size).to eq(1)
+    end
+
+    it 'gives us a proper callable serf' do
+      serf = subject['subsystem/requests/create_widget']
+      expect(subject).to_not be_nil
+
+      results = serf.call({})
+      expect(results).to_not be_nil
+      expect(results.headers.kind).to_not eq('serf/events/caught_error')
+    end
+
+    it 'returns nil on not found parcel kind' do
+      expect(subject[nil]).to be_nil
+    end
+
+    it 'passes in a good environment' do
+      serf = subject['subsystem/requests/create_widget']
+      results = serf.call({})
+      expect(results.headers.kind).to eq('subsystem/events/mywidget_created')
+      expect(results.message.success_message).to eq(random_message)
+    end
+  end
+
+  context '#serfup Serf Map with missing Serf' do
+    let(:serfup_config) {
+      Hashie::Mash.new(
+        globs: [],
+        serfs: [
+          'subsystem/requests/create_widget'
+        ])
+    }
+
+    it 'raises an error' do
+      expect {
+        Serf::Loader::Loader.new.serfup serfup_config
+      }.to raise_error('Missing Serf: subsystem/requests/create_widget')
+    end
+  end
+
+end

data/spec/serf/loader/registry_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+require 'serf/loader/registry'
+
+describe Serf::Loader::Registry do
+  let(:random_message) {
+    FactoryGirl.create :random_message
+  }
+
+  context '#add' do
+    it 'registers a named block, but does not call it' do
+      uncalled_mock = double 'Uncalled Mock'
+      expect(subject.blocks.size).to eq(0)
+      expect(subject.values.size).to eq(0)
+      subject.add 'component_name' do
+        uncalled_mock
+      end
+      expect(subject.blocks.size).to eq(1)
+      expect(subject.values.size).to eq(0)
+    end
+  end
+
+  context '#[]' do
+    it 'evaluates a block on lookup' do
+      expect(subject.blocks.size).to eq(0)
+      expect(subject.values.size).to eq(0)
+      subject.add 'component_name' do
+        random_message
+      end
+      expect(subject['component_name']).to eq(random_message)
+      expect(subject.blocks.size).to eq(0)
+      expect(subject.values.size).to eq(1)
+    end
+
+    it 'returns memoized block value' do
+      call_once = double 'Callable'
+      call_once.should_receive(:call).once.and_return(random_message)
+
+      # Make the add to the registry
+      expect(subject.blocks.size).to eq(0)
+      expect(subject.values.size).to eq(0)
+      subject.add 'component_name' do
+        call_once.call
+      end
+
+      # First call
+      expect(subject['component_name']).to eq(random_message)
+      expect(subject.blocks.size).to eq(0)
+      expect(subject.values.size).to eq(1)
+
+      # This should be memoized
+      expect(subject['component_name']).to eq(random_message)
+      expect(subject.blocks.size).to eq(0)
+      expect(subject.values.size).to eq(1)
+    end
+
+    it 'returns nil on not found' do
+      expect(subject[random_message]).to be_nil
+    end
+  end
+
+end