camille 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2370ceb41fe8fdd701b99671f1d4d82678fc103218e96a10a52e60b9b2d1ad1f
-  data.tar.gz: ef8fe63ad679a1744fdef8c58971148d3642be0be2c5e23ff53b510dfef2b449
+  metadata.gz: 1c6d8ec2d346e2ff02811be47d900bee304a82f5a96e213cbf5e1c9f96f3fe61
+  data.tar.gz: 1a67d813067334b228caa09c9cc10411fa4a3b56eab57610b415c129616a4533
 SHA512:
-  metadata.gz: 6b8068692bd238a82cded511bad5e15d3f0993640a487b335cfd7d1592fe3c8cb45f88924753a1b580ae7448a59d58e423c29332842fa9be09472585bc810ea7
-  data.tar.gz: 71bc242a3a3fc9224c0d2e7d3598d9e4be378ff7b2a028e02b55833927cfb516d6309c44bbc7b2296b0b9b780ffe07458435e40a89a1953d6044a465621e7ef9
+  metadata.gz: 0d977978049f5c5589731135c24c360145c3145d3ded0be2d158ea67546eece82d8af7c07674e1895d03a3071418adc9b1a6a597e5246b22b96d0c7abb2123d3
+  data.tar.gz: b4fd67e56fdd11db3c00d1e1ddee3a775c8e3d87ba2423cbe652729ed3dfb3460591d658a89bd1192385c45f0507fbeae5172a03acac65fcb3ad0880fe3b1aa7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.4.2
+
+### Added
+
+* Supported `transform` for custom types
+* Added default DateTime and Decimal type to install generator
+
 ## 0.4.1
 
 ### Added

data/Gemfile.lock

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

data/lib/camille/basic_type.rb

@@ -11,6 +11,15 @@ module Camille
       Camille::Types::Array.new(self)
     end
 
+    def transform_and_check value
+      transformed = transform value
+      [check(value), transformed]
+    end
+
+    def transform value
+      value
+    end
+
     def self.| other
       Camille::Type.instance(self) | other
     end

data/lib/camille/controller_extension.rb

@@ -15,16 +15,16 @@ module Camille
       if endpoint = camille_endpoint
         render_options = args.last
         if value = render_options[:json]
-          error = endpoint.response_type.check(value)
+          error, transformed = endpoint.response_type.transform_and_check(value)
           if error
             string_io = StringIO.new
             Camille::TypeErrorPrinter.new(error).print(string_io)
             raise TypeError.new("\nType check failed for response.\n#{string_io.string}")
           else
-            if value.is_a? Hash
-              value.deep_transform_keys!{|k| k.to_s.camelize(:lower)}
+            if transformed.is_a? Hash
+              transformed.deep_transform_keys!{|k| k.to_s.camelize(:lower)}
             end
-            super(json: value)
+            super(json: transformed)
           end
         else
           raise ArgumentError.new("Expected key :json for `render` call.")

data/lib/camille/custom_types/date.rb

@@ -0,0 +1,31 @@
+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)

data/lib/camille/generators/install_generator.rb

@@ -10,8 +10,9 @@ module Camille
         copy_file "configuration.rb", "config/camille/configuration.rb"
       end
 
-      def create_types_folder
-        copy_file ".keep", "config/camille/types/.keep"
+      def create_date_time_and_decimal
+        copy_file "date_time.rb", "config/camille/types/date_time.rb"
+        copy_file "decimal.rb", "config/camille/types/decimal.rb"
       end
 
       def create_schemas_folder

data/lib/camille/generators/templates/date_time.rb

@@ -0,0 +1,12 @@
+using Camille::Syntax
+
+class Camille::Types::DateTime < Camille::Type
+  include Camille::Types
+
+  alias_of(String)
+
+  # transforms a DateTime into a String of ISO 8601 format
+  def transform value
+    value.as_json
+  end
+end

data/lib/camille/generators/templates/decimal.rb

@@ -0,0 +1,16 @@
+using Camille::Syntax
+
+class Camille::Types::Decimal < Camille::Type
+  include Camille::Types
+
+  alias_of(Number)
+
+  # transforms a BigDecimal into a Float so it fits in Number type
+  def transform value
+    if value.is_a? BigDecimal
+      value.to_f
+    else
+      value
+    end
+  end
+end

data/lib/camille/type.rb

@@ -21,6 +21,11 @@ module Camille
       @underlying.check value
     end
 
+    def transform_and_check value
+      transformed = transform value
+      @underlying.transform_and_check transformed
+    end
+
     def self.klass_name
       name.gsub(/^Camille::Types::/, '')
     end

data/lib/camille/types/array.rb

@@ -18,6 +18,11 @@ module Camille
         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

@@ -21,6 +21,29 @@ module Camille
         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
+
+          errors = transform_and_check_results.map do |key, (error, transformed)|
+            [key.to_s, error]
+          end.select{|x| x[1]}
+
+          if errors.empty?
+            transformed = transform_and_check_results.map do |key, (error, transformed)|
+              [key, transformed]
+            end.to_h
+            [nil, transformed]
+          else
+            Camille::TypeError.new(**errors.to_h)
+          end
+        else
+          Camille::TypeError.new("Expected hash, got #{value.inspect}.")
+        end
+      end
+
       def literal
         "{#{@fields.map{|k,v| "#{ActiveSupport::Inflector.camelize k.to_s, false}: #{v.literal}"}.join(', ')}}"
       end

data/lib/camille/types/omit.rb

@@ -5,6 +5,10 @@ module Camille
         processed_object.check(value)
       end
 
+      def transform_and_check value
+        processed_object.transform_and_check(value)
+      end
+
       private
         def klass_name
           'Omit'

data/lib/camille/types/pick.rb

@@ -5,6 +5,10 @@ module Camille
         processed_object.check(value)
       end
 
+      def transform_and_check value
+        processed_object.transform_and_check(value)
+      end
+
       private
         def klass_name
           'Pick'

data/lib/camille/types/union.rb

@@ -21,6 +21,26 @@ module Camille
         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
+            error = Camille::TypeError.new(
+              'union.left' => left_result,
+              'union.right' => right_result
+            )
+            [error, nil]
+          else
+            [nil, right_transformed]
+          end
+        else
+          [nil, left_transformed]
+        end
+      end
+
       def literal
         "#{@left.literal} | #{@right.literal}"
       end

data/lib/camille/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,11 +52,14 @@ 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
 - lib/camille/generators/templates/.keep
 - lib/camille/generators/templates/configuration.rb
+- lib/camille/generators/templates/date_time.rb
+- lib/camille/generators/templates/decimal.rb
 - lib/camille/generators/templates/schema_template.erb
 - lib/camille/generators/templates/type_template.erb
 - lib/camille/generators/type_generator.rb