serf 0.11.0 → 0.12.0

data/spec/serf/loader_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+require 'serf/loader'
+
+describe Serf::Loader do
+  let(:root_library_path) {
+    File.join(File.dirname(__FILE__), '../..')
+  }
+
+  context '.serfup' do
+    let(:random_message) {
+      FactoryGirl.create :random_message
+    }
+    subject {
+      Serf::Loader.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
+
+end

data/spec/serf/middleware/error_handler_spec.rb

@@ -22,7 +22,7 @@ describe Serf::Middleware::ErrorHandler do
 
       it 'has an error parcel kind' do
         parcel = subject.call({})
-        parcel[:headers][:kind].should == 'serf/events/caught_error'
+        expect(parcel[:headers][:kind]).to eq('serf/events/caught_error')
       end
     end
 
@@ -38,7 +38,7 @@ describe Serf::Middleware::ErrorHandler do
 
       it 'returns a good response parcel' do
         parcel = subject.call({})
-        parcel.should == response_parcel
+        expect(parcel).to eq(response_parcel)
       end
 
     end

data/spec/serf/middleware/parcel_freezer_spec.rb

@@ -9,10 +9,10 @@ describe Serf::Middleware::ParcelFreezer do
     it 'freezes the parcel' do
       parcel = {}
       app = described_class.new proc { |parcel|
-        parcel.frozen?.should be_true
+        expect(parcel.frozen?).to be_true
       }
       app.call parcel
-      parcel.frozen?.should be_true
+      expect(parcel.frozen?).to be_true
     end
 
   end

data/spec/serf/middleware/parcel_masher_spec.rb

@@ -8,19 +8,19 @@ describe Serf::Middleware::ParcelMasher do
 
   describe '#call' do
 
-    it 'should Hashie::Mash the parcel' do
+    it 'makes Hashie::Mash of the parcel' do
       parcel = nil
       app = described_class.new proc { |parcel|
-        parcel.should be_a_kind_of(Hashie::Mash)
+        expect(parcel).to be_a_kind_of(Hashie::Mash)
       }
       app.call parcel
     end
 
-    it 'should autocreate headers and message' do
+    it 'autocreate headers and message' do
       parcel = nil
       app = described_class.new proc { |parcel|
-        parcel.headers.should be_a_kind_of(Hashie::Mash)
-        parcel.message.should be_a_kind_of(Hashie::Mash)
+        expect(parcel.headers).to be_a_kind_of(Hashie::Mash)
+        expect(parcel.message).to be_a_kind_of(Hashie::Mash)
       }
       app.call parcel
     end

data/spec/serf/middleware/policy_checker_spec.rb

@@ -9,7 +9,7 @@ describe Serf::Middleware::PolicyChecker do
 
     context 'when policy raises error' do
 
-      it 'should not call app' do
+      it 'does not call app' do
         uncalled_mock = double 'uncalled mock'
         app = described_class.new(
           uncalled_mock,
@@ -27,7 +27,7 @@ describe Serf::Middleware::PolicyChecker do
 
     context 'when all policies pass' do
 
-      it 'should call the app' do
+      it 'calls the app' do
         parcel = double 'parcel'
         parcel.should_receive :some_success
         app = described_class.new(
@@ -43,7 +43,7 @@ describe Serf::Middleware::PolicyChecker do
 
     end
 
-    it 'should iterate the policy chain' do
+    it 'iterates the policy chain' do
       count = 10
       policy_chain = (1..count).map { |i|
         policy = double 'policy'

data/spec/serf/middleware/request_timer_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+require 'serf/middleware/request_timer'
+
+describe Serf::Middleware::RequestTimer do
+
+  describe '#call' do
+    let(:empty_parcel) {
+      FactoryGirl.create :empty_parcel
+    }
+    let(:elapsed_time) {
+      rand(1000000)
+    }
+
+    it 'annotates the response parcel with the elapsed call time' do
+      # Mock Timer Ojbect
+      mock_timer_obj = double 'TimerObj'
+      mock_timer_obj.
+        should_receive(:mark).
+        and_return(elapsed_time)
+
+      # Mock Timer Class
+      mock_timer_class = double 'TimerClass'
+      mock_timer_class.
+        should_receive(:start).
+        and_return(mock_timer_obj)
+
+      # Mock App
+      mock_app = double 'MyApp'
+      mock_app.
+        should_receive(:call).
+        with({}).
+        and_return(empty_parcel)
+
+      # Execute the Test
+      request_timer = described_class.new mock_app, :timer => mock_timer_class
+      response_parcel = request_timer.call({})
+      expect(response_parcel.headers.elapsed_time).to eq(elapsed_time)
+    end
+
+  end
+
+end

data/spec/serf/middleware/uuid_tagger_spec.rb

@@ -6,15 +6,15 @@ describe Serf::Middleware::UuidTagger do
 
   describe '#call' do
 
-    it 'should add uuid the parcel header' do
+    it 'adds uuid the parcel header' do
       parcel = {}
       app = described_class.new proc { |parcel|
-        parcel[:headers][:uuid].should_not be_nil
+        expect(parcel[:headers][:uuid]).to_not be_nil
       }
       app.call parcel
     end
 
-    it 'should not change the existing uuid' do
+    it 'does not change the existing uuid' do
       uuid = '0d3eccaabcc46c3bcbe2a53c4505e352'
       parcel = {
         headers: {
@@ -22,7 +22,7 @@ describe Serf::Middleware::UuidTagger do
         }
       }
       app = described_class.new proc { |parcel|
-        parcel[:headers][:uuid].should == uuid
+        expect(parcel[:headers][:uuid]).to eq(uuid)
       }
       app.call parcel
     end

data/spec/serf/parcel_builder_spec.rb

@@ -16,29 +16,29 @@ describe Serf::ParcelBuilder do
 
     it 'returns a Hashie' do
       parcel = subject.build
-      parcel.should be_a_kind_of(Hashie::Mash)
+      expect(parcel).to be_a_kind_of(Hashie::Mash)
     end
 
     it 'sets default parcel headers' do
       parcel = subject.build
-      parcel[:headers].should == {}
+      expect(parcel[:headers]).to eq({})
     end
 
     it 'sets default parcel message' do
       parcel = subject.build
-      parcel[:headers].should == {}
+      expect(parcel[:headers]).to eq({})
     end
 
     it 'sets given headers and message' do
       parcel = subject.build random_headers, random_message
-      parcel[:headers].should == random_headers
-      parcel[:message].should == random_message
+      expect(parcel[:headers]).to eq(random_headers)
+      expect(parcel[:message]).to eq(random_message)
     end
 
     it 'will coerce headers and message into Hashie::Mash' do
       parcel = subject.build nil, nil
-      parcel[:headers].should be_a_kind_of(Hashie::Mash)
-      parcel[:message].should be_a_kind_of(Hashie::Mash)
+      expect(parcel[:headers]).to be_a_kind_of(Hashie::Mash)
+      expect(parcel[:message]).to be_a_kind_of(Hashie::Mash)
     end
 
   end

data/spec/serf/serfer_spec.rb

@@ -26,12 +26,12 @@ describe Serf::Serfer do
       mock_app.
         should_receive(:call).
         with(request_message).
-        and_return(response_message)
+        and_return([nil, response_message])
       serfer = described_class.new mock_app
       parcel = serfer.call(
         headers: nil,
         message: request_message)
-      parcel.message.should == response_message
+      expect(parcel.message).to eq(response_message)
     end
 
     it 'sets the kind header in response' do
@@ -39,12 +39,12 @@ describe Serf::Serfer do
       mock_app.
         should_receive(:call).
         with(request_message).
-        and_return([response_message, 'KIND'])
+        and_return(['KIND', response_message])
       serfer = described_class.new mock_app
       parcel = serfer.call(
         headers: nil,
         message: request_message)
-      parcel.headers.kind.should == 'KIND'
+      expect(parcel.headers.kind).to eq('KIND')
     end
 
     it 'generate uuids' do

data/spec/serf/util/error_handling_spec.rb

@@ -9,7 +9,7 @@ describe Serf::Util::ErrorHandling do
       result, error = subject.with_error_handling do
         raise 'Some Error Message'
       end
-      result.should be_nil
+      expect(result).to be_nil
       JsonSchemaTester.new.validate_for!(
         'serf/events/caught_error',
         error)
@@ -26,8 +26,8 @@ describe Serf::Util::ErrorHandling do
       result, error = subject.with_error_handling do
         response_parcel
       end
-      result.should == response_parcel
-      error.should be_nil
+      expect(result).to eq(response_parcel)
+      expect(error).to be_nil
     end
 
   end

data/spec/serf/util/null_object_spec.rb

@@ -10,17 +10,17 @@ describe Serf::Util::NullObject do
   }
 
   it 'returns itself on any fuzzy method call' do
-    subject.send(random_method_name).should == subject
+    expect(subject.send(random_method_name)).to eq(subject)
   end
 
   it 'returns itself on a missing method' do
-    subject.my_missing_method.should == subject
+    expect(subject.my_missing_method).to eq(subject)
   end
 
   it 'returns itself on a missing method with params' do
-    subject.my_missing_method(1,2,3,4) {
+    expect(subject.my_missing_method(1,2,3,4) {
       nil
-    }.should == subject
+    }).to eq(subject)
   end
 
 end

data/spec/serf/util/protected_call_spec.rb

@@ -9,8 +9,8 @@ describe Serf::Util::ProtectedCall do
       result, error = subject.pcall do
         raise 'Some Error Message'
       end
-      result.should be_nil
-      error.should be_a_kind_of(RuntimeError)
+      expect(result).to be_nil
+      expect(error).to be_a_kind_of(RuntimeError)
     end
 
   end
@@ -24,8 +24,8 @@ describe Serf::Util::ProtectedCall do
       result, error = subject.pcall do
         response_parcel
       end
-      result.should == response_parcel
-      error.should be_nil
+      expect(result).to eq(response_parcel)
+      expect(error).to be_nil
     end
 
   end

data/spec/serf/util/uuidable_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 require 'serf/util/uuidable'
 
 ##
-# NOTE: Not really great tests here... I really should mock out
+# NOTE: Not really great tests here... I need to mock out
 #   the uuid_tool to really get at the meat of the work.
 #
 describe Serf::Util::Uuidable do
 
   its(:create_coded_uuid) {
-    should_not be_nil
-    subject.size.should == 22
+    expect(subject).to_not be_nil
+    expect(subject.size).to eq(22)
   }
 
   describe '#parse_coded_uuid' do
@@ -25,30 +25,30 @@ describe Serf::Util::Uuidable do
 
     it 'works with no parent' do
       uuids = subject.create_uuids
-      uuids[:uuid].should_not be_nil
-      uuids[:parent_uuid].should be_nil
-      uuids[:origin_uuid].should be_nil
+      expect(uuids[:uuid]).to_not be_nil
+      expect(uuids[:parent_uuid]).to be_nil
+      expect(uuids[:origin_uuid]).to be_nil
     end
 
     it 'copies origin from parent' do
       uuids = subject.create_uuids origin_uuid: 'MY_UUID'
-      uuids[:uuid].should_not be_nil
-      uuids[:parent_uuid].should be_nil
-      uuids[:origin_uuid].should == 'MY_UUID'
+      expect(uuids[:uuid]).to_not be_nil
+      expect(uuids[:parent_uuid]).to be_nil
+      expect(uuids[:origin_uuid]).to eq('MY_UUID')
     end
 
     it 'sets origin from parent[:parent_uuid] if origin is nonexistent ' do
       uuids = subject.create_uuids parent_uuid: 'MY_UUID'
-      uuids[:uuid].should_not be_nil
-      uuids[:parent_uuid].should be_nil
-      uuids[:origin_uuid].should == 'MY_UUID'
+      expect(uuids[:uuid]).to_not be_nil
+      expect(uuids[:parent_uuid]).to be_nil
+      expect(uuids[:origin_uuid]).to eq('MY_UUID')
     end
 
     it 'sets origin, parent from parent[:uuid] on missing origin and parent' do
       uuids = subject.create_uuids uuid: 'MY_UUID'
-      uuids[:uuid].should_not be_nil
-      uuids[:parent_uuid].should == 'MY_UUID'
-      uuids[:origin_uuid].should == 'MY_UUID'
+      expect(uuids[:uuid]).to_not be_nil
+      expect(uuids[:parent_uuid]).to eq('MY_UUID')
+      expect(uuids[:origin_uuid]).to eq('MY_UUID')
     end
 
   end

data/spec/support/factories.rb

@@ -5,6 +5,13 @@ require 'securerandom'
 FactoryGirl.define do
   sequence(:random_string) { SecureRandom.hex }
 
+  factory :empty_parcel, class: Hashie::Mash do
+    headers {{
+    }}
+    message {{
+    }}
+  end
+
   factory :random_parcel, class: Hashie::Mash do
     headers {{
       uuid: generate(:random_string),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serf
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: optser
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -76,19 +92,24 @@ files:
 - NOTICE.txt
 - README.md
 - Rakefile
+- example/components/logger.serf
+- example/serfs/create_widget.serf
 - lib/serf.rb
 - lib/serf/builder.rb
 - lib/serf/errors/policy_failure.rb
+- lib/serf/loader.rb
+- lib/serf/loader/loader.rb
+- lib/serf/loader/registry.rb
 - lib/serf/middleware/error_handler.rb
 - lib/serf/middleware/parcel_freezer.rb
 - lib/serf/middleware/parcel_masher.rb
 - lib/serf/middleware/policy_checker.rb
+- lib/serf/middleware/request_timer.rb
 - lib/serf/middleware/uuid_tagger.rb
 - lib/serf/parcel_builder.rb
 - lib/serf/serfer.rb
 - lib/serf/util/error_handling.rb
 - lib/serf/util/null_object.rb
-- lib/serf/util/options_extraction.rb
 - lib/serf/util/protected_call.rb
 - lib/serf/util/uuidable.rb
 - lib/serf/version.rb
@@ -96,16 +117,19 @@ files:
 - serf.gemspec
 - spec/serf/builder_spec.rb
 - spec/serf/errors/policy_failure_spec.rb
+- spec/serf/loader/loader_spec.rb
+- spec/serf/loader/registry_spec.rb
+- spec/serf/loader_spec.rb
 - spec/serf/middleware/error_handler_spec.rb
 - spec/serf/middleware/parcel_freezer_spec.rb
 - spec/serf/middleware/parcel_masher_spec.rb
 - spec/serf/middleware/policy_checker_spec.rb
+- spec/serf/middleware/request_timer_spec.rb
 - spec/serf/middleware/uuid_tagger_spec.rb
 - spec/serf/parcel_builder_spec.rb
 - spec/serf/serfer_spec.rb
 - spec/serf/util/error_handling_spec.rb
 - spec/serf/util/null_object_spec.rb
-- spec/serf/util/options_extraction_spec.rb
 - spec/serf/util/protected_call_spec.rb
 - spec/serf/util/uuidable_spec.rb
 - spec/serf_spec.rb
@@ -114,7 +138,6 @@ files:
 - spec/support/factories.rb
 - spec/support/failing_policy.rb
 - spec/support/json_schema_tester.rb
-- spec/support/options_extraction_wrapper.rb
 - spec/support/passing_policy.rb
 - spec/support/protected_call_wrapper.rb
 homepage: http://github.com/byu/serf
@@ -132,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3096022116459469640
+      hash: 3194185596279459247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3096022116459469640
+      hash: 3194185596279459247
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -151,16 +174,19 @@ summary: Interactors with policy protection
 test_files:
 - spec/serf/builder_spec.rb
 - spec/serf/errors/policy_failure_spec.rb
+- spec/serf/loader/loader_spec.rb
+- spec/serf/loader/registry_spec.rb
+- spec/serf/loader_spec.rb
 - spec/serf/middleware/error_handler_spec.rb
 - spec/serf/middleware/parcel_freezer_spec.rb
 - spec/serf/middleware/parcel_masher_spec.rb
 - spec/serf/middleware/policy_checker_spec.rb
+- spec/serf/middleware/request_timer_spec.rb
 - spec/serf/middleware/uuid_tagger_spec.rb
 - spec/serf/parcel_builder_spec.rb
 - spec/serf/serfer_spec.rb
 - spec/serf/util/error_handling_spec.rb
 - spec/serf/util/null_object_spec.rb
-- spec/serf/util/options_extraction_spec.rb
 - spec/serf/util/protected_call_spec.rb
 - spec/serf/util/uuidable_spec.rb
 - spec/serf_spec.rb
@@ -169,7 +195,6 @@ test_files:
 - spec/support/factories.rb
 - spec/support/failing_policy.rb
 - spec/support/json_schema_tester.rb
-- spec/support/options_extraction_wrapper.rb
 - spec/support/passing_policy.rb
 - spec/support/protected_call_wrapper.rb
 has_rdoc: