camille 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6d8ec2d346e2ff02811be47d900bee304a82f5a96e213cbf5e1c9f96f3fe61
-  data.tar.gz: 1a67d813067334b228caa09c9cc10411fa4a3b56eab57610b415c129616a4533
+  metadata.gz: 3d0df267ba626a69935cbe5da75d90c08bf319b048fd210712953bc2a0e83b45
+  data.tar.gz: f93164ee26857fb30eb3a1c4c77dd8341e7aa6a52b6476134658c4061f030c58
 SHA512:
-  metadata.gz: 0d977978049f5c5589731135c24c360145c3145d3ded0be2d158ea67546eece82d8af7c07674e1895d03a3071418adc9b1a6a597e5246b22b96d0c7abb2123d3
-  data.tar.gz: b4fd67e56fdd11db3c00d1e1ddee3a775c8e3d87ba2423cbe652729ed3dfb3460591d658a89bd1192385c45f0507fbeae5172a03acac65fcb3ad0880fe3b1aa7
+  metadata.gz: 84e73bdb5f359904024658a6ce47e9585851eeb60fb28a093323ec169fa8dc6903b358255380b9b9daafc8f24490628fecd173c6ab97f46f6190bddfe29eaf72
+  data.tar.gz: 40e888902aea15a1964e6fddb09476d896c12645717f750869b76c08708529bce2d6baa8eb96dc0adffae2e65a85a70883855788d546d41c9661033378ec2132

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.4.3
+
+### Fixed
+
+* Fixed the error that values not getting transformed in array/tuple/union types
+* Fixed optional fields getting `nil` due to transformation
+
 ## 0.4.2
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.4.2)
+    camille (0.4.3)
       rails (>= 6.1, < 8)
 
 GEM

data/README.md

@@ -237,7 +237,7 @@ Camille will print the following error:
 ```
 object:
   array:
-    [2]: Expected number, got "3".
+    array[2]: Expected number, got "3".
 ```
 
 ### Reloading

data/lib/camille/types/array.rb

@@ -7,22 +7,26 @@ module Camille
         @content = Camille::Type.instance content
       end
 
-      def check value
+      def transform_and_check value
         if value.is_a? ::Array
-          errors = value.map.with_index{|e, i| ["array[#{i}]", @content.check(e)]}.select{|x| x[1]}
-          unless errors.empty?
-            Camille::TypeError.new(**errors.to_h)
+          transform_and_check_results = value.map.with_index do |element, index|
+            [index, @content.transform_and_check(element)]
+          end
+          errors = transform_and_check_results.map do |index, (error, transformed)|
+            ["array[#{index}]", error]
+          end.select{|x| x[1]}
+
+          if errors.empty?
+            transformed = transform_and_check_results.map{|_, (_, transformed)| transformed}
+            [nil, transformed]
+          else
+            [Camille::TypeError.new(**errors.to_h), nil]
           end
         else
-          Camille::TypeError.new("Expected array, got #{value.inspect}.")
+          [Camille::TypeError.new("Expected array, got #{value.inspect}."), nil]
         end
       end
 
-      def transform_and_check value
-        transformed = value.map{|x| @content.transform x}
-        [check(transformed), transformed]
-      end
-
       def literal
         "#{@content.literal}[]"
       end

data/lib/camille/types/object.rb

@@ -4,28 +4,20 @@ module Camille
       attr_reader :fields
 
       def initialize fields
+        @optional_keys = []
         @fields = normalize_fields fields
       end
 
-      def check value
-        if value.is_a? Hash
-          errors = @fields.map do |key, type|
-            [key.to_s, type.check(value[key])]
-          end.select{|x| x[1]}
-
-          unless errors.empty?
-            Camille::TypeError.new(**errors.to_h)
-          end
-        else
-          Camille::TypeError.new("Expected hash, got #{value.inspect}.")
-        end
-      end
-
       def transform_and_check value
         if value.is_a? Hash
           transform_and_check_results = @fields.map do |key, type|
-            [key, type.transform_and_check(value[key])]
-          end
+            error, transformed = type.transform_and_check(value[key])
+            if @optional_keys.include?(key) && !error && transformed.nil?
+              nil
+            else
+              [key, type.transform_and_check(value[key])]
+            end
+          end.compact
 
           errors = transform_and_check_results.map do |key, (error, transformed)|
             [key.to_s, error]
@@ -37,10 +29,10 @@ module Camille
             end.to_h
             [nil, transformed]
           else
-            Camille::TypeError.new(**errors.to_h)
+            [Camille::TypeError.new(**errors.to_h), nil]
           end
         else
-          Camille::TypeError.new("Expected hash, got #{value.inspect}.")
+          [Camille::TypeError.new("Expected hash, got #{value.inspect}."), nil]
         end
       end
 
@@ -54,6 +46,7 @@ module Camille
             type = Camille::Type.instance(value)
             if key.end_with?('?')
               new_key = remove_question_mark(key)
+              @optional_keys << new_key
               [new_key, type | Camille::Types::Undefined.new]
             else
               [key, type]

data/lib/camille/types/omit.rb

@@ -1,10 +1,6 @@
 module Camille
   module Types
     class Omit < PickAndOmit
-      def check value
-        processed_object.check(value)
-      end
-
       def transform_and_check value
         processed_object.transform_and_check(value)
       end

data/lib/camille/types/pick.rb

@@ -1,10 +1,6 @@
 module Camille
   module Types
     class Pick < PickAndOmit
-      def check value
-        processed_object.check(value)
-      end
-
       def transform_and_check value
         processed_object.transform_and_check(value)
       end

data/lib/camille/types/tuple.rb

@@ -7,17 +7,24 @@ module Camille
         @elements = elements.map{|e| Camille::Type.instance e}
       end
 
-      def check value
+      def transform_and_check value
         if value.is_a? ::Array
-          errors = @elements.map.with_index do |type, index|
-            ["tuple[#{index}]", type.check(value[index])]
+          transform_and_check_results = @elements.map.with_index do |type, index|
+            [index, type.transform_and_check(value[index])]
+          end
+
+          errors = transform_and_check_results.map do |index, (error, transformed)|
+            ["tuple[#{index}]", error]
           end.select{|x| x[1]}
 
-          unless errors.empty?
-            Camille::TypeError.new(**errors.to_h)
+          if errors.empty?
+            transformed = transform_and_check_results.map{|index, (error, transformed)| transformed}
+            [nil, transformed]
+          else
+            [Camille::TypeError.new(**errors.to_h), nil]
           end
         else
-          Camille::TypeError.new("Expected array, got #{value.inspect}.")
+          [Camille::TypeError.new("Expected array, got #{value.inspect}."), nil]
         end
       end
 

data/lib/camille/types/union.rb

@@ -8,29 +8,14 @@ module Camille
         @right = Camille::Type.instance right
       end
 
-      def check value
-        left_result = @left.check value
-        if left_result
-          right_result = @right.check value
-          if right_result
-            Camille::TypeError.new(
-              'union.left' => left_result,
-              'union.right' => right_result
-            )
-          end
-        end
-      end
-
       def transform_and_check value
-        left_transformed = @left.transform value
-        left_result = @left.check left_transformed
-        if left_result
-          right_transformed = @right.transform value
-          right_result = @right.check right_transformed
-          if right_result
+        left_error, left_transformed = @left.transform_and_check value
+        if left_error
+          right_error, right_transformed = @right.transform_and_check value
+          if right_error
             error = Camille::TypeError.new(
-              'union.left' => left_result,
-              'union.right' => right_result
+              'union.left' => right_error,
+              'union.right' => right_error
             )
             [error, nil]
           else

data/lib/camille/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Camille
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - 辻彩
@@ -52,7 +52,6 @@ files:
 - lib/camille/code_generator.rb
 - lib/camille/configuration.rb
 - lib/camille/controller_extension.rb
-- lib/camille/custom_types/date.rb
 - lib/camille/endpoint.rb
 - lib/camille/generators/install_generator.rb
 - lib/camille/generators/schema_generator.rb

data/lib/camille/custom_types/date.rb

@@ -1,31 +0,0 @@
-require 'date'
-
-# This type is only for testing, to simulate the usage of transform.
-module Camille
-  module CustomTypes
-    class Date < Camille::Type
-      include Camille::Types
-
-      alias_of(
-        type: 'Date',
-        value: Number
-      )
-
-      def transform value
-        case value
-        when ::Date
-          timestamp = value.to_time.to_i
-        when ::Time
-          timestamp = value.to_i
-        end
-        {
-          type: 'Date',
-          value: timestamp.to_i * 1000
-        }
-      end
-
-    end
-  end
-end
-
-Camille::Loader.loaded_types.delete(Camille::CustomTypes::Date)