atacama 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504860bd1cc4b868e1299d7e43ea02a29efdf385
-  data.tar.gz: 56b29c7f192e6513fb1b039397ea55fe3cd54d7c
+  metadata.gz: 962e473a80996947e194283a65b1a31ca998d448
+  data.tar.gz: 7df566c68e5e900c7f05fca2743c6c945d410e16
 SHA512:
-  metadata.gz: 38ae0a44fda886f8ce080f0e6734863094c7d34ed5d3a54497741602328012b5f6949f0c1852c043009e0909216428fd0212fb8f4747250e8afdea33215b7fbc
-  data.tar.gz: 2116d76499411e0bcb3183ebd83338f37e05f48548bbbfc8545eb092df6746e9329e0f4334b6437f1d85839cd1f7c62632e4fa2a30b3da709363c0adc11a3834
+  metadata.gz: b13dfd1450db5916e15e44baac9d38b1e64659cfefc8098d2a92628b6b2f10e89eae2303027ebc048898dfa8f39232691d2a741cc8835fe8d3c5dbdf7d08ca34
+  data.tar.gz: a8d26a7ca84b95564092d282839024411bf2cd97d9943288c22f02f67c7000cf8d379a828fef81f08e62a99337a60294c97516b55df29993c8db0b35a132ea65

data/Gemfile.lock

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

data/README.md

@@ -30,6 +30,7 @@ The basic object is `Contract`. It enforces type contracts by utilizing `dry-typ
 ```
 class UserFetcher < Atacama::Contract
   option :id, Types::Strict::Number.gt(0)
+  returns Types.Instance(User)
 
   def call
     User.find(id)
@@ -45,6 +46,7 @@ of changes to execute.
 ```
 class UserFetcher < Atacama::Step
   option :id, type: Types::Strict::Number.gt(0)
+  returns Types.Option(model: Types.Instance(User))
 
   def call
     Option(model: User.find(id))
@@ -60,9 +62,11 @@ class Duration < Atacama::Step
 end
 
 class UpdateUser < Atacama::Transformer
-  option :model, type: Types::Instance(User)
+  option :model, type: Types.Instance(User)
   option :attributes, type: Types::Strict::Hash
 
+  returns_option :model, Types.Instance(User)
+
   step :duration, with: Duration do
     step :find, with: UserFetcher
     step :save

data/lib/atacama/contract.rb

@@ -1,33 +1,11 @@
 # frozen_string_literal: true
 
+require 'atacama/types'
 require 'atacama/contract/parameter'
 require 'atacama/contract/validator'
 require 'atacama/contract/context'
 
 module Atacama
-  # The type namespace to interact with DRY::Types
-  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
   class Contract
     RESERVED_KEYS = %i[call initialize context].freeze

data/lib/atacama/types.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Atacama
+  # The type namespace to interact with DRY::Types
+  module Types
+    include Dry::Types.module
+    Boolean = Types::True | Types::False
+
+    def self.Option(**map)
+      Instance(Values::Option).constructor do |options|
+        if options.is_a? Values::Option
+          map.each { |key, type| type[options.value[key]] }
+        end
+
+        options
+      end
+    end
+
+    def self.Return(type)
+      Instance(Values::Return).constructor do |options|
+        type[options.value] if options.is_a? Values::Return
+        options
+      end
+    end
+  end
+end

data/lib/atacama/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atacama
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tyler Johnston
@@ -91,6 +91,7 @@ files:
 - lib/atacama/transaction.rb
 - lib/atacama/transaction/definition.rb
 - lib/atacama/transaction/halt_execution.rb
+- lib/atacama/types.rb
 - lib/atacama/values.rb
 - lib/atacama/version.rb
 homepage: https://github.com/fulcrumapp/atacama