atacama 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1dd85acd949dc1261176c76b76e38add8ab8772
-  data.tar.gz: 3d0006d2e584122ca3534748f620e0a335acad5b
+  metadata.gz: 504860bd1cc4b868e1299d7e43ea02a29efdf385
+  data.tar.gz: 56b29c7f192e6513fb1b039397ea55fe3cd54d7c
 SHA512:
-  metadata.gz: f3938b99da71d5b9994c8993b01b42847c9e09dff9523b7d9650a7abe977d91aff71a60169378d9207ad65e1a8eb1cd51c0846b33bda4d4724396d61815115b2
-  data.tar.gz: 1bd1146d793105404d1ea9e5f27b7c310c695ac378babb683d1cae83dace8af5a0ad1b017fc743c0ba1fd4f3e3d2011c40f1bb9d0684d3f24d29fe2c4c146782
+  metadata.gz: 38ae0a44fda886f8ce080f0e6734863094c7d34ed5d3a54497741602328012b5f6949f0c1852c043009e0909216428fd0212fb8f4747250e8afdea33215b7fbc
+  data.tar.gz: 2116d76499411e0bcb3183ebd83338f37e05f48548bbbfc8545eb092df6746e9329e0f4334b6437f1d85839cd1f7c62632e4fa2a30b3da709363c0adc11a3834

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    atacama (0.1.3)
+    atacama (0.1.4)
       dry-types (~> 0.13.2)
 
 GEM

data/lib/atacama/contract.rb

@@ -9,6 +9,23 @@ module Atacama
   module Types
     include Dry::Types.module
     Boolean = Types::True | Types::False
+
+    def self.Option(**map)
+      Instance(Values::Option).constructor do |options|
+        map.each do |key, type|
+          type[options.value[key]]
+        end
+
+        options
+      end
+    end
+
+    def self.Return(type)
+      Instance(Values::Return).constructor do |options|
+        type[options.value]
+        options
+      end
+    end
   end
 
   # This class enables a DSL for creating a contract for the initializer
@@ -26,13 +43,26 @@ module Atacama
       end
 
       def injected
-        @injected || {}
+        # Silences the VM warning about accessing uninitalized ivar
+        defined?(@injected) ? @injected : {}
       end
 
       def options
         @options ||= {}
       end
 
+      def returns(type)
+        @returns = type
+      end
+
+      def return_type
+        defined?(@returns) && @returns
+      end
+
+      def validate_return(value)
+        return_type && return_type[value]
+      end
+
       # Define an initializer value.
       # @param [Symbol] name of the argument
       def option(name, **kwargs)
@@ -43,12 +73,14 @@ module Atacama
       end
 
       def call(context = {})
-        new(context: context).call
+        new(context: context).call.tap do |result|
+          validate_return(result)
+        end
       end
 
       def inject(injected)
-        Class.new(self) do
-          self.injected = injected
+        clone.tap do |clone|
+          clone.injected = injected
         end
       end
     end
@@ -65,6 +97,16 @@ module Atacama
       Validator.call(options: self.class.options, context: @context)
     end
 
+    # Pretty pretty printing.
+    def inspect
+      "#<#{self.class}:0x%x %s>" % [
+        object_id,
+        self.class.options.keys.map do |option|
+          "#{option}: #{context.send(option).inspect}"
+        end.join(' ')
+      ]
+    end
+
     def call
       self
     end

data/lib/atacama/transaction.rb

@@ -15,6 +15,19 @@ module Atacama
     end
 
     class << self
+      attr_reader :return_option
+
+      def returns_option(key, type)
+        @return_option = key
+
+        returns(
+          Types.Instance(Result).constructor do |options|
+            type[options.value]
+            options
+          end
+        )
+      end
+
       # @returns [Array<Atacama::Transaction::Definition>]
       def steps
         @steps ||= []
@@ -32,26 +45,21 @@ module Atacama
     def initialize(context: {}, steps: {})
       super(context: context)
       @overrides = steps
+      @return_value = nil
     end
 
     def call
-      value = begin
-        execute(self.class.steps)
-      rescue HaltExecution => exception
-        exception.value
-      end
-
-      raise MissingReturn, "Return value from #{self.class} missing, received: #{value.inspect}" unless value.is_a? Values::Return
-
-      Result.call(value: value.value, transaction: context)
+      execute(self.class.steps)
+      Result.call(value: return_value, transaction: context)
     end
 
     private
 
     def execute(steps)
       steps.each do |step|
+        break if @return_value
         evaluate(step).tap do |result|
-          raise HaltExecution.new(result) if result.is_a? Values::Return
+          @return_value = result.value if result.is_a? Values::Return
           context.merge!(result.value) if result.is_a? Values::Option
         end
       end
@@ -90,9 +98,15 @@ module Atacama
     end
 
     def evaluate_instance(step)
-      step.with.new(context: context).call do
-        execute(step.yielding.steps)
-      end
+      step.with.new(context: context) \
+          .call { execute(step.yielding.steps) }
+          .tap { |result| step.with.validate_return(result) }
+    end
+
+    def return_value
+      @return_value ||
+        (self.class.return_option && context[self.class.return_option]) ||
+        nil
     end
   end
 end

data/lib/atacama/version.rb

@@ -1,3 +1,3 @@
 module Atacama
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atacama
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tyler Johnston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types