atacama 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19cf3faed089b84664b48c4763716aff698a7704
-  data.tar.gz: ca47f3998ce6c1969af3f1bd9a14aa31c08c1a2b
+  metadata.gz: 57d7c04c5890cdf6985a82af71ac69e32739a3eb
+  data.tar.gz: 891d78acb5338faf7785095d141428805e7bc292
 SHA512:
-  metadata.gz: 497071ad81e594c2718bfdfea42ca40575c420119a82750050a0b1242c0dcb50a7ff5171c7e9a38b5c9b3fe8dfa252c1e3ccf31d01cb155b79e7a51394b33dd9
-  data.tar.gz: 88e82961f4539b4553369b9b53dfbec83e8e1c5999fc3a75444982b71576fcb9c4d3c02c9288ec9961581a6a6fb0a1628784925e6fb3c534818a7db706c6df8b
+  metadata.gz: 43c1eeb7e3f30baf02bd20439e13524d5ee945a85cb6445ec6458d4578341d64a8e0def14361e3c13794a25616b0784822360c19da0fef5c046cec2425059735
+  data.tar.gz: d656e76622ecff876f02f9b826dc112fe38adea3f5ae444945f4bbde08a60381a9cfa53b8f4e5b5434b19c865eb3d48090ea19d0a989c060f655f01f11dd8b2e

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    atacama (0.1.0)
+    atacama (0.1.1)
       dry-types (~> 0.13.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.0)
+    concurrent-ruby (1.0.5)
     dry-configurable (0.7.0)
       concurrent-ruby (~> 1.0)
     dry-container (0.6.0)

data/Rakefile

@@ -9,6 +9,6 @@ end
 
 task default: :test
 
-task :bash do
-  exec 'docker run -v `pwd`:/app:cached -it spatialnetworks/alpine bash -l -c "gem install rerun && bundle && bash"'
+task :watch do
+  exec 'docker run -v `pwd`:/app:cached -it spatialnetworks/alpine bash -l -c "gem install rerun && bundle && /usr/local/bundle/bin/rerun -x rake"'
 end

data/lib/atacama/contract.rb

@@ -9,14 +9,16 @@ module Atacama
   module Types
     include Dry::Types.module
     Boolean = Types::True | Types::False
-    ContextOrHash = Strict::Hash | Instance(Context)
   end
 
   # This class enables a DSL for creating a contract for the initializer
   class Contract
     RESERVED_KEYS = %i[call initialize context].freeze
 
+    Types = Atacama::Types
+
     NameInterface = Types::Strict::Symbol.constrained(excluded_from: RESERVED_KEYS)
+    ContextInterface = Types::Strict::Hash | Types.Instance(Context)
 
     class << self
       def options
@@ -26,9 +28,7 @@ module Atacama
       # Define an initializer value.
       # @param [Symbol] name of the argument
       def option(name, **kwargs)
-        # Validate it's a symbol and not reserved
-        name = NameInterface[name]
-
+        NameInterface[name] # Validate type
         options[name] = Parameter.new(name: name, **kwargs)
 
         define_method(name) { @context[name] }
@@ -43,8 +43,7 @@ module Atacama
     attr_reader :context
 
     def initialize(context: {}, **)
-      # Validate the type
-      Types::ContextOrHash[context]
+      ContextInterface[context] # Validate the type
       @context = context.is_a?(Context) ? context : Context.new(context)
       Validator.call(options: self.class.options, context: @context)
     end

data/lib/atacama/transaction/definition.rb

@@ -7,10 +7,6 @@ module Atacama
     option :with, type: Types::Any.optional
     option :yielding, type: Types::Any.optional
 
-    def yielding?
-      !!yielding
-    end
-
     def proc_invocation?
       with.is_a? Proc
     end

data/lib/atacama/transaction.rb

@@ -51,6 +51,7 @@ module Atacama
     def execute(steps)
       steps.each do |step|
         evaluate(step).tap do |result|
+          raise HaltExecution.new(result) if result.is_a? Values::Return
           context.merge!(result.value) if result.is_a? Values::Option
         end
       end

data/lib/atacama/values.rb

@@ -16,7 +16,7 @@ module Atacama
       end
 
       def Return(value)
-        raise HaltExecution.new(Values::Return.call(value: value))
+        Values::Return.call(value: value)
       end
       # rubocop:enable Naming/MethodName
     end

data/lib/atacama/version.rb

@@ -1,3 +1,3 @@
 module Atacama
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

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