business_flow 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d31c1153f385fb6581857f81324b432890ad95
-  data.tar.gz: 73c6b7c4e893e13815fac24b440a792057f37844
+  metadata.gz: 20dd5eb0ff89e49ebf99e3a47ec7383e8db07320
+  data.tar.gz: 23f9387a1ba8bea2d3d8d9afee4384bf002e0876
 SHA512:
-  metadata.gz: 0619c1dc22b3e755b0cb65a385e0fc2388d242692ce41a9b9ac15b2672ce5ab276967ed4d4f609bbf88cd944f76793e0d0809bca88a1b41f79dfa1c959c969a4
-  data.tar.gz: a73dd14cced41702e1f092761b55ee4af23920498dd2762b7d660b518447c8c3d9940346621ac9c2498277a05c3a445c202cdee5f248d0d88b239fdffd705a7e
+  metadata.gz: 23423eeb84a68119631859eaef316e9d18532c1c65d58ff3ee2cfb480026ff01e076d8f393a98395870df67252b4f998819d74322275ad5eb3abfa46afae3fd8
+  data.tar.gz: da02de0322b75a90946504689243862f4595e2a0adb7bff77919af7c309dd69723acebd5a0717d53729a123ad254f6087b47a526f140fe96bdb46f16b2b454e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    business_flow (0.5.1)
+    business_flow (0.5.2)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
 

data/lib/business_flow.rb

@@ -2,6 +2,7 @@ require 'active_model'
 require 'active_support/core_ext'
 require 'business_flow/version'
 require 'business_flow/not_nil_validator'
+require 'business_flow/flow_failed_exception'
 require 'business_flow/callable'
 require 'business_flow/step'
 require 'business_flow/default_step_executor'

data/lib/business_flow/cacheable.rb

@@ -6,7 +6,8 @@ module BusinessFlow
     end
 
     def cache_key
-      "#{self.class.name}/#{self.class.cache_key.call(self, nil)}"
+      klass = self.class
+      "#{klass.name}/#{klass.cache_key.call(self, nil)}"
     end
 
     # DSL Methods
@@ -35,22 +36,32 @@ module BusinessFlow
         end
       end
 
-      # TODO: Make this some kind of private helper
-      def cache_options
+      def call(*args)
+        flow = new(*args)
+        PrivateHelpers.execute(self, flow)
+      rescue FlowFailedException
+        flow
+      end
+    end
+
+    # Avoid polluting the namespace of whoever includes us
+    module PrivateHelpers
+      def self.execute(klass, flow)
+        klass.cache_store.fetch(flow.cache_key, cache_options(klass)) do
+          flow.call
+          raise FlowFailedException, flow if flow.errors.any?
+          flow
+        end
+      end
+
+      def self.cache_options(klass)
         # compact is not available in Ruby <2.4 or ActiveSupport < 4, so
         # we can't use it here.
         options = {}
-        ttl = cache_ttl
+        ttl = klass.cache_ttl
         options[:expires_in] = ttl if ttl
         options
       end
-
-      def call(*args)
-        ret = new(*args)
-        cache_store.fetch(ret.cache_key, cache_options) do
-          ret.tap(&:call)
-        end
-      end
     end
   end
 end

data/lib/business_flow/dsl.rb

@@ -60,6 +60,12 @@ module BusinessFlow
         new(parameter_object).tap(&:call)
       end
 
+      def call!(*args)
+        ret = call(*args)
+        raise FlowFailedException, ret if ret.errors.any?
+        ret
+      end
+
       def step_queue
         @step_queue ||= []
       end

data/lib/business_flow/flow_failed_exception.rb

@@ -0,0 +1,11 @@
+module BusinessFlow
+  # Exception raised by DSL when flow execution fails
+  class FlowFailedException < RuntimeError
+    attr_reader :flow
+
+    def initialize(flow)
+      super("Failed execution of #{flow.class.name}")
+      @flow = flow
+    end
+  end
+end

data/lib/business_flow/version.rb

@@ -1,3 +1,3 @@
 module BusinessFlow
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -174,6 +174,7 @@ files:
 - lib/business_flow/callable.rb
 - lib/business_flow/default_step_executor.rb
 - lib/business_flow/dsl.rb
+- lib/business_flow/flow_failed_exception.rb
 - lib/business_flow/not_nil_validator.rb
 - lib/business_flow/step.rb
 - lib/business_flow/version.rb