lev 1.0.1 → 2.0.1

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    lev (1.0.1)
+    lev (2.0.1)
       actionpack (>= 3.0)
       active_attr
       activemodel (>= 3.0)
       activerecord (>= 3.0)
+      hashie
       transaction_isolation
       transaction_retry
 
@@ -48,6 +49,7 @@ GEM
     debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
+    hashie (2.0.5)
     i18n (0.6.5)
     minitest (4.7.5)
     multi_json (1.8.0)

data/lev.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "transaction_isolation"
   spec.add_runtime_dependency "transaction_retry"
   spec.add_runtime_dependency "active_attr"
+  spec.add_runtime_dependency "hashie"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/lev.rb

@@ -2,12 +2,15 @@ require "action_view"
 require "transaction_isolation"
 require "transaction_retry"
 require "active_attr"
+require "hashie"
 
 require "lev/version"
+require "lev/object"
 require "lev/utilities"
 require "lev/exceptions"
 require "lev/better_active_model_errors"
 require "lev/term_mapper"
+require "lev/outputs"
 require "lev/routine"
 require "lev/handler"
 require "lev/handle_with"

data/lib/lev/handler.rb

@@ -13,7 +13,7 @@ module Lev
   # doing something with it.  See Lev::Routine for more information.
   #
   # All handlers must:
-  #   2) include this module ("include Lev::Handler")
+  #   2) call "lev_handler"
   #   3) implement the 'handle' method which takes no arguments and does the 
   #      work the handler is charged with
   #   4) implement the 'authorized?' method which returns true iff the 
@@ -32,7 +32,7 @@ module Lev
   #      the Handler class would look like:
   #
   #      class MyHandler
-  #        include Lev::Handler
+  #        lev_handler
   #
   #        paramify :search do
   #          attribute :search_type, type: String
@@ -88,7 +88,7 @@ module Lev
   # Example:
   # 
   #   class MyHandler
-  #     include Lev::Handler
+  #     lev_handler
   #   protected
   #     def authorized?
   #       # return true iff exec is allowed to be called, e.g. might

data/lib/lev/object.rb

@@ -0,0 +1,25 @@
+class Object
+
+  def self.lev_routine(options={})
+    class_eval do
+      include Lev::Routine unless options[:skip_routine_include]
+
+      # Routine configuration
+      options[:transaction] ||= Lev::TransactionIsolation.mysql_default.symbol
+      @transaction_isolation = Lev::TransactionIsolation.new(options[:transaction])
+    end
+  end
+
+  def self.lev_handler(options={})
+    class_eval do
+      include Lev::Handler
+    end
+    
+    # Do routine configuration
+    options[:skip_routine_include] = true
+    lev_routine(options)
+
+    # Do handler configuration (none currently)
+  end
+
+end

data/lib/lev/outputs.rb

@@ -0,0 +1,39 @@
+module Lev
+ class Outputs < Hashie::Mash
+
+    def initialize(source_hash = nil, default = nil, &blk)
+      @array_created = {}
+      super(source_hash, default, &blk)
+    end
+
+    def add(name, value)
+      if self[name].nil?
+        self[name] = value
+      elsif @array_created[name]
+        self[name].push value
+      else
+        @array_created[name] = true
+        self[name] = [self[name], value]
+      end
+    end
+
+    def each
+      self.each_key do |key|
+        key = key.to_sym
+        if @array_created[key]
+          self[key].each { |value| yield key, value }
+        else
+          yield key, self[key]
+        end
+      end
+    end
+
+    def transfer_to(other_outputs, &name_mapping_block)
+      self.each do |name, value|
+        new_name = block_given? ? name_mapping_block.call(name) : name
+        other_outputs.add(new_name, value)
+      end
+    end
+
+  end
+end

data/lib/lev/routine.rb

@@ -18,7 +18,7 @@ module Lev
   #
   # A class becomes a routine by adding:
   #
-  #   include Lev::Routine
+  #   lev_routine
   #
   # in its definition.
   #
@@ -36,9 +36,19 @@ module Lev
   # routines aren't typically instantiated with state).
   # 
   # A routine is automatically run within a transaction.  The isolation level
-  # of the routine can be set by overriding the "default_transaction_isolation"
-  # class method and having it return an instance of Lev::TransactionIsolation.
-  # This is also how routines can be set to not be run in a transaction.
+  # of the routine can be set by passing a :transaction option to the lev_routine
+  # call (or to the lev_handler call, if appropriate).  The value must be one of
+  #
+  #   :no_transaction
+  #   :read_uncommitted
+  #   :read_committed
+  #   :repeatable_read
+  #   :serializable
+  #
+  # e.g.
+  #
+  #   class MyRoutine
+  #     lev_routine transaction: :no_transaction
   #
   # As mentioned above, routines can call other routines.  While this is of
   # course possible just by calling the other routine's call method directly,
@@ -91,7 +101,7 @@ module Lev
   # context.  E.g., in the following class:
   #
   #   class Routine1
-  #     include Lev::Routine
+  #     lev_routine
   #     uses_routine Routine2,
   #                  translations: { 
   #                    inputs: { map: {bar: :foo} }
@@ -176,14 +186,9 @@ module Lev
       attr_reader :errors
 
       def initialize
-        @outputs = {}
+        @outputs = Outputs.new
         @errors = Errors.new
       end
-
-      def add_output(name, value)
-        outputs[name] = [outputs[name], value].flatten.compact
-        outputs[name] = outputs[name].first if outputs[name].size == 1
-      end
     end
 
     def self.included(base)
@@ -213,11 +218,7 @@ module Lev
       end
 
       def transaction_isolation
-        @transaction_isolation ||= default_transaction_isolation
-      end
-
-      def default_transaction_isolation
-        TransactionIsolation.mysql_default
+        @transaction_isolation ||= TransactionIsolation.mysql_default
       end
 
       def nested_routines
@@ -323,8 +324,8 @@ module Lev
       options[:errors_are_fatal] = true if !options.has_key?(:errors_are_fatal)
       transfer_errors_from(run_result.errors, input_mapper, options[:errors_are_fatal])
 
-      run_result.outputs.each do |name, value|
-        self.result.add_output(output_mapper.map(name), value)
+      run_result.outputs.transfer_to(outputs) do |name|
+        output_mapper.map(name)
       end
 
       run_result
@@ -380,7 +381,7 @@ module Lev
     def runner=(runner)
       @runner = runner
 
-      if topmost_runner.class.transaction_isolation.weaker_than(self.class.default_transaction_isolation)
+      if topmost_runner.class.transaction_isolation.weaker_than(self.class.transaction_isolation)
         raise IsolationMismatch, 
               "The routine being run has a stronger isolation requirement than " + 
               "the isolation being used by the routine(s) running it; call the " +

data/lib/lev/version.rb

@@ -1,3 +1,3 @@
 module Lev
-  VERSION = "1.0.1"
+  VERSION = "2.0.1"
 end

data/spec/outputs_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Lev::Outputs do
+
+  let(:outputs) { Lev::Outputs.new }
+
+  it "should return a non-array when given just one non-array" do
+    outputs.add(:x, 4)
+    expect(outputs[:x]).to eq 4
+  end
+
+  it "should return an array when given just one array" do
+    outputs.add(:x, [1,2])
+    expect(outputs[:x]).to eq [1,2]
+  end
+
+  it "should work when given a non-array and an array" do
+    outputs.add(:x, 4)
+    outputs.add(:x, [1,2])
+    expect(outputs[:x]).to eq [4, [1,2]]
+  end
+
+  it "should work when given two or three non-arrays" do
+    outputs.add(:x, 1)
+    outputs.add(:x, 2)
+    expect(outputs.x).to eq [1,2]
+    outputs.add(:x, 3)
+    expect(outputs.x).to eq [1,2,3]
+  end
+
+  it "should work when given a mix" do
+    outputs.add(:x, [3,4])
+    outputs.add(:x, "hi")
+    outputs.add(:x, {a: 2})
+    expect(outputs.x).to eq [[3,4], "hi", {a: 2}]
+  end
+
+  it "should transfer well" do
+    outputs.add(:x, 4)
+    outputs.add(:x, 5)
+
+    other_outputs = Lev::Outputs.new
+
+    outputs.each do |name, value|
+      other_outputs.add(name, value)
+    end
+
+    other_outputs.add(:x, 6)
+
+    expect(other_outputs.x).to eq [4,5,6]
+  end
+
+  it "should work via transfer_to with name mapping" do
+    outputs.add(:x, 4)
+    outputs.add(:x, 5)
+
+    other_outputs = Lev::Outputs.new
+
+    outputs.transfer_to(other_outputs) do |name|
+      :y
+    end
+
+    other_outputs.add(:y, 6)    
+    expect(other_outputs.y).to eq [4,5,6]
+  end
+
+  it "should work via transfer_to without name mapping" do
+    outputs.add(:x, 4)
+    outputs.add(:x, 5)
+
+    other_outputs = Lev::Outputs.new
+
+    outputs.transfer_to(other_outputs)
+
+    other_outputs.add(:y, 6)    
+    expect(other_outputs.x).to eq [4,5]
+    expect(other_outputs.y).to eq 6
+  end
+
+end

data/spec/support/create_sprocket.rb

@@ -1,6 +1,6 @@
 class CreateSprocket
 
-  include Lev::Routine
+  lev_routine
 
 protected
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lev
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +216,8 @@ files:
 - lib/lev/handle_with.rb
 - lib/lev/handler.rb
 - lib/lev/handler_helper.rb
+- lib/lev/object.rb
+- lib/lev/outputs.rb
 - lib/lev/routine.rb
 - lib/lev/term_mapper.rb
 - lib/lev/transaction_isolation.rb
@@ -207,6 +225,7 @@ files:
 - lib/lev/version.rb
 - spec/create_sprocket_spec.rb
 - spec/deep_merge_spec.rb
+- spec/outputs_spec.rb
 - spec/routine_spec.rb
 - spec/spec_helper.rb
 - spec/sprocket_spec.rb
@@ -227,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1251683534568030962
+      hash: 55854544372342664
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -236,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1251683534568030962
+      hash: 55854544372342664
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -246,6 +265,7 @@ summary: Ride the rails but don't touch them.
 test_files:
 - spec/create_sprocket_spec.rb
 - spec/deep_merge_spec.rb
+- spec/outputs_spec.rb
 - spec/routine_spec.rb
 - spec/spec_helper.rb
 - spec/sprocket_spec.rb