strum 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f31df72127e2e0b1641f04a6653c6dd73c9104a0755a1b3b69536a9da88478a
-  data.tar.gz: 61e6b4f3e9751b1399feaa24c036d0f1296cf71fc0e6009043bf4b70fbb329c2
+  metadata.gz: 461d85a4cb7a32b26a404517717ee5b677ff41488f37be951023a2b25a517086
+  data.tar.gz: 699a002f15c6f4aab8d2fabe5d99846f622a269cf655577cda138cde0e49f418
 SHA512:
-  metadata.gz: 6f728e080d5ac456c2d45abbaf7e615526c03097a911676e7cc1ac5198b5998a26d7cff4bf8ab1ced7b422ff385a4ca58bca8950ac87f02dd81d2caba079ba16
-  data.tar.gz: d7cd68e74b374f946a85e4425de7cf112c83c6b56c93a1da0801e6541fced786eb1990e82342a0c555a10b126e5a0729a2263c452eb5cba454f6e24908217f10
+  metadata.gz: 169582be09f5b176d0cc27fb77d18fb77c315a68d7b9c71ce7d02448b7848a2f3449040ffe613bc3199272d8b65b559d1f19a2987201be5514974fe2888b214b
+  data.tar.gz: b9f33038c7f6cd2cdc1ea297d3860b67c19115f0212bad1947c81f6eb3f0e06bf5c64e21f731fd0a9a6723b17c8e3090e1b86c544dd82045bb98a0433041e8bb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strum (0.1.0)
+    strum (0.1.2)
       dry-inflector (~> 0.2.0)
       dry-struct (~> 1.2)
       json-schema (~> 2.8.1)
@@ -53,7 +53,7 @@ GEM
     parallel (1.19.1)
     parser (2.7.0.5)
       ast (~> 2.4.0)
-    public_suffix (4.0.3)
+    public_suffix (4.0.4)
     rainbow (3.0.0)
     rake (10.5.0)
     reline (0.1.3)

data/lib/strum/json_schema.rb

@@ -1,102 +1,10 @@
-require "strum/service"
-require "json-schema"
+# frozen_string_literal: true
+
+require "strum/json_schema/validate"
+require "strum/json_schema/cast"
 
 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/json_schema/cast.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require "strum/service"
+
+module Strum
+  module JsonSchema
+    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, path = [])
+          item = custom_dig(input_data, path)
+
+          return item if item.is_a?(NoValue)
+
+          case schema[:type]
+          when Array
+            schema[:type].reduce(nil) do |type, x|
+              new_schema = schema.clone
+              new_schema[:type] = x
+              type || casted(input_data, new_schema, path)
+            end
+          when "object"
+            if item.is_a?(Hash) && schema[:properties].is_a?(Hash)
+              item.map { |key, val| (prop = schema[:properties][key]) ? [key, casted(input_data, prop, path + [key])] : [key, val]}.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 << casted(input_data, 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
+
+        def custom_dig(obj, path)
+          path.reduce(obj) { |item, x| item.fetch(x) { |_it| return NoValue.new } }
+        end
+    end
+  end
+end

data/lib/strum/json_schema/validate.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+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(*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 = 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
+  end
+end

data/lib/strum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Serhiy Nazarov
@@ -203,6 +203,8 @@ files:
 - lib/strum/json.rb
 - lib/strum/json_deserializer.rb
 - lib/strum/json_schema.rb
+- lib/strum/json_schema/cast.rb
+- lib/strum/json_schema/validate.rb
 - lib/strum/json_serializer.rb
 - lib/strum/object_to_hash.rb
 - lib/strum/pipe.rb