strum 0.0.56 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce5316836aff5a84ce5be1cb3af9445b5ebc80ba3c739626483929bb9ff7538d
-  data.tar.gz: ed3b056c7ab24e67efd4cae7e0ac5ddd31f981099c6911b9e11b659bd42af315
+  metadata.gz: e42ae1ed242ca62b4424ebeb549eaccbd54f3b66348fb31bc7d65f457efdf1a0
+  data.tar.gz: a86f1a2c6d32b9c211b68702514411da590801ecbc6637b40a5a88f9d47f6699
 SHA512:
-  metadata.gz: 622ed6bc448d6f0124b09d159ae9801478a8ef526cbb56ec4f948647f38ea7fc54df863722e5512e0e2b2391db07239dd7ef93d282f994ecf8e7cc3acfe28dc9
-  data.tar.gz: db63d55f2a5ec36480e02f5dacf922f252f1a504a64af59c68fda4f500460436cc325702642a983c29e375d72a859c2b3aad1879edbf82257e2adf72a5a16586
+  metadata.gz: dfa1308d4b365e7ab7a0d945dadcc0289908e8e17760d2cde18741a3206ebd618d4d300250f92158825906a0c472866474084c24151da7e12baad9b670b3448f
+  data.tar.gz: 64482d3661a03579d1944723969d74e7b2f4c582e0e3386eb05391ab6796c6740e5acf8c95452c156fe2d05c5cdf8ac604a84261623166a5697a4b8c2e591bec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strum (0.0.56)
+    strum (0.1.0)
       dry-inflector (~> 0.2.0)
       dry-struct (~> 1.2)
       json-schema (~> 2.8.1)
@@ -16,7 +16,7 @@ GEM
     ast (2.4.0)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    dry-configurable (0.11.3)
+    dry-configurable (0.11.5)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
       dry-equalizer (~> 0.2)
@@ -36,7 +36,7 @@ GEM
       dry-equalizer (~> 0.3)
       dry-types (~> 1.3)
       ice_nine (~> 0.11)
-    dry-types (1.3.1)
+    dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
@@ -51,7 +51,7 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     parallel (1.19.1)
-    parser (2.7.0.3)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     public_suffix (4.0.3)
     rainbow (3.0.0)
@@ -64,7 +64,7 @@ GEM
       rspec-mocks (~> 3.9.0)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -79,7 +79,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    sequel (5.29.0)
+    sequel (5.30.0)
     sequel-annotate (1.4.0)
       sequel (>= 4)
     thor (0.20.3)

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "strum"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/lib/strum.rb

@@ -2,10 +2,10 @@
 
 require "strum/version"
 require "strum/service"
-require "strum/chain"
 require "strum/pipe"
 require "strum/json"
 require "strum/deep_keys_to_sym"
+require "strum/json_schema"
 
 module Strum
   class Error < StandardError; end

data/lib/strum/json_schema.rb

@@ -0,0 +1,102 @@
+require "strum/service"
+require "json-schema"
+
+module Strum
+  module JsonSchema
+    class Validate
+      include Strum::Service
+
+      def call
+        array_errors = JSON::Validator.fully_validate(args[:schema], input, errors_as_objects: true)
+        array_errors.each { |error| add_error(*self.parse_json_schema_error(error)) }
+        output(input)
+      end
+
+      def audit
+        add_error(:schema, :not_found) if !args[:schema].is_a?(Hash)
+      end
+
+      protected
+
+      def parse_json_schema_error(error)
+        id = error[:fragment].sub(/#/, "input")
+        keys = id.split("/")
+        last_key_idx = keys.rindex { |key| key !~ /[0-9]+/ }
+        last_key = keys.map { |key| key =~ /[0-9]+/ ? "[#{key}]" : ".#{key}" }.join[1..-1]
+        value = error[:message][0, error[:message].index(/ in schema/)].sub(error[:fragment], last_key)
+        [last_key.to_sym, value]
+      end
+    end
+
+    class Cast
+      include Strum::Service
+
+      def call
+        output(casted(input, args[:schema]))
+      end
+
+      def audit
+        add_error(:schema, :not_found) if !args[:schema].is_a?(Hash)
+      end
+
+      protected
+
+      def casted(input_data, schema)
+        @input_data = input_data
+
+        def rec_casted(schema, path = [])
+          item = self.custom_dig(@input_data, path)
+
+          if item.is_a?(NoValue)
+            return item
+          end
+
+          case schema[:type]
+          when Array
+            schema[:type].reduce(nil) do |type, x|
+              new_schema = schema.clone
+              new_schema[:type] = x
+              type ||= rec_casted(new_schema, path)
+            end
+          when "object"
+            if item.is_a?(Hash) && schema[:properties].is_a?(Hash)
+              schema[:properties].map { |key, val| [key, rec_casted(val, path + [key])] }.filter { |pair| !pair[1].is_a?(NoValue) }.to_h
+            end
+          when "array"
+            if item.is_a?(Array) && schema[:items].is_a?(Hash)
+              (0..(item.length - 1)).reduce([]) { |res, idx| res << rec_casted(schema[:items], path + [idx]) }
+            end
+          when "string"
+            item.to_s
+          when "integer"
+            if item.is_a?(Numeric)
+              item
+            elsif item.is_a?(String) || item.is_a?(Symbol)
+              item.to_s.to_i
+            end
+          when "boolean"
+            item.to_s.downcase == "true"
+          when "jsonb"
+            if (Module.constants.include?(:Sequel)) && (Sequel.methods.include?(:pg_jsonb_wrap))
+              Sequel.pg_jsonb_wrap(item)
+            else
+              add_error(:schema, "jsonb type is not supported")
+            end
+          when nil, ""
+            item
+          else
+            add_error(:schema, :invalid_type)
+          end
+        end
+
+        rec_casted(schema)
+      end
+
+      def custom_dig(obj, path)
+        path.reduce(obj) { |item, x| item.fetch(x) { |it| return NoValue.new } }
+      end
+    end
+
+    class NoValue; end
+  end
+end

data/lib/strum/pipe.rb

@@ -4,13 +4,13 @@ module Strum
   class Pipe
     include Strum::Service
 
-    def self.call(*units, input: {}, unit_input: {}, &block)
+    def self.call(*units, args: {}, input: {}, unit_input: {}, &block)
       pipe_payload = if input.is_a?(Hash) && unit_input.is_a?(Hash)
                        unit_input.merge(input)
                      else
                        input
                     end
-      new(pipe_payload).execute(*units, input, unit_input, &block)
+      new(pipe_payload, args).execute(*units, input, unit_input, &block)
     end
 
     def execute(*units, pipe_inputs, pipe_unit_inputs, &block)
@@ -24,6 +24,15 @@ module Strum
         raise Strum::Error, "Unit options must be a Hash" unless service_params.is_a?(Hash)
 
         service_options = service_params[:input] || {}
+        result_place = service_params[:to]
+        unit_args = case service_params[:args]
+                    when Hash
+                      service_params[:args]
+                    when Symbol, String
+                      { service_params[:args] => service_params[:args] }
+                    else
+                      {}
+                    end
         clean_output = service_params[:clean_output] || false
         unit_payload = if !clean_output && service_options.is_a?(Hash) && pipe_unit_inputs.is_a?(Hash) && output_value.is_a?(Hash)
                          pipe_unit_inputs.merge(service_options).merge(output_value)
@@ -31,21 +40,21 @@ module Strum
                          output_value
                        end
 
-        service.public_send(:call, unit_payload) do |m|
-          service_handlers[:on].each do |k, _handler|
-            m.on(k) { |r| hook(k, r) }
+        service.public_send(:call, unit_payload, args.merge(unit_args)) do |m|
+          service_handlers[:on].each do |key, _handler|
+            m.on(key) { |r| hook(k, r) }
           end
 
-          service_handlers[:success].each do |k, _handler|
-            if k
-              m.success(k) do |result|
-                output(k, result)
+          service_handlers[:success].each do |key, _handler|
+            if key
+              m.success(key) do |result|
+                output(key, result)
                 continue = false
               end
             else
               m.success do |result|
-                if result.nil?
-                  # do nothing if service hasn't result
+                if result_place
+                  inputs[result_place] = result
                 elsif !clean_output && result.is_a?(Hash) && output_value.is_a?(Hash)
                   output(output_value.merge(result))
                 else

data/lib/strum/service.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "json-schema"
 
 module Strum
   # Module
@@ -14,19 +13,18 @@ module Strum
 
     # Internal: Interactor class methods.
     module ClassMethods
-      def call(_input = nil, &block)
-        new(_input).execute(&block)
+      def call(_input, **args, &block)
+        new(_input, args).execute(&block)
       end
     end
 
     # Instance methods
-    def initialize(_input)
+    def initialize(_input, **args)
       self.strum_errors = {}
       self.service_handlers = { on: {}, success: {}, failure: {} }
       self.outputs = {}
-      self._input = _input
-      self._input.freeze
-      self.input = self._input.dup
+      self.inputs = args.merge(default: _input)
+      self._inputs = inputs.dup.freeze
     end
 
     def execute
@@ -72,7 +70,7 @@ module Strum
 
     protected
 
-      attr_accessor :_input, :input, :strum_errors, :outputs, :service_handlers
+      attr_accessor :inputs, :_inputs, :strum_errors, :outputs, :service_handlers
 
       def call
         raise Failure, "call method must be implemented"
@@ -80,6 +78,22 @@ module Strum
 
       def audit; end
 
+      def input
+        inputs[:default]
+      end
+
+      def input=(value)
+        inputs[:default] = value
+      end
+
+      def _input
+        _inputs[:default]
+      end
+
+      def args
+        inputs.slice(*inputs.keys - [:default])
+      end
+
       def output_value(key = :default)
         @outputs[key]
       end
@@ -122,7 +136,7 @@ module Strum
 
       def sliced(*keys)
         if input.is_a?(Hash)
-          @input = input.slice(*keys)
+          self.input = input.slice(*keys)
         else
           add_error(:input, :must_be_hash)
         end
@@ -130,7 +144,7 @@ module Strum
 
       def sliced_list(*keys)
         if input.is_a?(Array)
-          @input = input.map do |item|
+          self.input = input.map do |item|
             if item.is_a?(Hash)
               item = item.slice(*keys)
             else
@@ -142,19 +156,6 @@ module Strum
         end
       end
 
-      def validated(schema:, list: false)
-        array_errors = JSON::Validator.fully_validate(schema, @input, errors_as_objects: true, list: list)
-        array_errors.each{|error| add_error(*self.parse_json_schema_error(error))}
-      end
-
-      def parse_json_schema_error(error)
-        pos_match = error[:fragment].match(/([0-9]+)[\/]?/)
-        pos = pos_match.is_a?(Array) ? pos_match[1] : "_"
-        key = error[:fragment].sub(/#\//, "").sub(/([0-9]+)[\/]?/, "")
-        value = "Item ##{pos}. " + error[:message][0, error[:message].index(/ in schema/)].sub(/#\//, "").sub(/([0-9]+)[\/]?/, "")
-        [key.to_sym, value]
-      end
-
       def array!
         self.input = [*input]
       end

data/lib/strum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strum
-  VERSION = "0.0.56"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.1.0
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -181,6 +181,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/console
 - bin/strum
 - lib/strum.rb
 - lib/strum/Rakefile
@@ -201,6 +202,7 @@ files:
 - lib/strum/deep_keys_to_sym.rb
 - lib/strum/json.rb
 - lib/strum/json_deserializer.rb
+- lib/strum/json_schema.rb
 - lib/strum/json_serializer.rb
 - lib/strum/object_to_hash.rb
 - lib/strum/pipe.rb