camille 0.5.7 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff47e3a7fdcb5ef28cca7bc5ce3989900c82d7eb0d94af77a00e0b0c4ac9b3d
-  data.tar.gz: 7885520d31b5b0a4f339cc24e5993ea1d8e1d637029a018b5dcb144060e72965
+  metadata.gz: fd8f26b87f7ddf2f3c951a19a24610abfe1bfac4f4da041568883cc371090895
+  data.tar.gz: bbecf051c37ec9da1eae0920a6ec42c09d159feef1f2be734beaef2871af7410
 SHA512:
-  metadata.gz: 5c990d3326e3271092647bd2ccdbc9ddf213e0f6200c872f0d398c4fb5306670c7e9993e4e48c82dab84a97ea4a8b3200ad100475c4a9243758e94ea211df681
-  data.tar.gz: c21e9542119b194dac81e446574c582fcf16a98a7fbeaeeba33e083518b3070b826a4db20596ff22fb5b18f1b8e64161056e10f71309a3309ab3213c8da9ba4d
+  metadata.gz: 53bb5fd170e71b21687dadba5ab1ce6c5a81bcb1a4ede09e280103cd81693fb8e9f41a3a15af630b2d48b62f150f29c1f222d8308fff2636135c5653d9ca3da3
+  data.tar.gz: 47c9621bfdeb542e625f2115eb96b7d1d14fdecfd5f6cefe62bd6f92be2703d7e3e7518e96df26af3c692fb5887ac08ebe26db38eaeae8a8cfb059eeb07de839

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.5.9
+
+### Added
+
+* Added intersection type
+* Added #print to Camille::TypeError
+
+### Changed
+
+* Typecheck will no longer remove fields from a hash if those fields are not presented in type schema
+
+### Fixed
+
+* Fixed the wrong literal generated by an array of unions
+
+## 0.5.8
+
+### Added
+
+* `render` call with a status code other than 200 will skip the typecheck
+
+### Fixed
+
+* `head 401` will no longer raise Camille::Controller::MissingRenderError
+
 ## 0.5.7
 
 ### Added

data/Gemfile.lock

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

data/README.md

@@ -153,6 +153,8 @@ params(
   }[]
   # a union type is two types connected by '|'
   union: Number | String,
+  # an intersection type is two types connected by '&'
+  intersection: { id: Number } & { name: String },
   # a tuple type is several types put inside '[]'
   tuple: [Number, String, Boolean],
   # a field followed by '?' is optional, the same as in TypeScript

data/lib/camille/basic_type.rb

@@ -7,6 +7,10 @@ module Camille
       Camille::Types::Union.new(self, other)
     end
 
+    def & other
+      Camille::Types::Intersection.new(self, other)
+    end
+
     def []
       Camille::Types::Array.new(self)
     end
@@ -24,6 +28,10 @@ module Camille
       Camille::Type.instance(self) | other
     end
 
+    def self.& other
+      Camille::Type.instance(self) & other
+    end
+
     def self.[]
       Camille::Type.instance(self)[]
     end

data/lib/camille/controller.rb

@@ -15,21 +15,25 @@ module Camille
     def render *args
       if endpoint = camille_endpoint
         render_options = args.last
-        if value = render_options[:json]
-          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 transformed.is_a? Hash
-              transformed.deep_transform_keys!{|k| k.to_s.camelize(:lower)}
+        intended_status = render_options[:status] || 200
+        if intended_status == 200 || intended_status == :ok
+          if value = render_options[:json]
+            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 transformed.is_a? Hash
+                transformed.deep_transform_keys!{|k| k.to_s.camelize(:lower)}
+              end
+              super(json: transformed)
             end
-            @camille_rendered = true
-            super(json: transformed)
+          else
+            raise ArgumentError.new("Expected key :json for `render` call.")
           end
         else
-          raise ArgumentError.new("Expected key :json for `render` call.")
+          super
         end
       else
         super
@@ -42,7 +46,8 @@ module Camille
         begin
           params.deep_transform_keys!{|key| key.to_s.underscore}
           result = super
-          unless @camille_rendered
+          # When there's no `render` call, Rails will return status 204
+          if response.status == 204
             raise_missing_render_error
           end
           result

data/lib/camille/type_error.rb

@@ -17,5 +17,9 @@ module Camille
     def basic?
       !!@message
     end
+
+    def print io = STDOUT
+      Camille::TypeErrorPrinter.new(self).print io
+    end
   end
 end

data/lib/camille/types/intersection.rb

@@ -0,0 +1,39 @@
+module Camille
+  module Types
+    class Intersection < Camille::BasicType
+      class ArgumentError < ::ArgumentError; end
+
+      attr_reader :left, :right
+
+      def initialize left, right
+        @left = Camille::Type.instance left
+        @right = Camille::Type.instance right
+      end
+
+      def transform_and_check value
+        left_error, left_transformed = @left.transform_and_check value
+        if left_error
+          error = Camille::TypeError.new(
+            'intersection.left' => left_error
+          )
+          [error, nil]
+        else
+          right_error, right_transformed = @right.transform_and_check left_transformed
+          if right_error
+            error = Camille::TypeError.new(
+              'intersection.right' => right_error
+            )
+            [error, nil]
+          else
+            [nil, right_transformed]
+          end
+        end
+      end
+
+      def literal
+        "(#{@left.literal} & #{@right.literal})"
+      end
+
+    end
+  end
+end

data/lib/camille/types/object.rb

@@ -11,12 +11,17 @@ module Camille
 
       def transform_and_check value
         if value.is_a? Hash
-          transform_and_check_results = @fields.map do |key, type|
-            error, transformed = type.transform_and_check(value[key])
-            if @optional_keys.include?(key) && !error && transformed.nil?
-              nil
+          keys = (@fields.keys + value.keys).uniq
+          transform_and_check_results = keys.map do |key|
+            if type = @fields[key]
+              error, transformed = type.transform_and_check(value[key])
+              if @optional_keys.include?(key) && !error && transformed.nil?
+                nil
+              else
+                [key, [error, transformed]]
+              end
             else
-              [key, type.transform_and_check(value[key])]
+              [key, [nil, value[key]]]
             end
           end.compact
 
@@ -63,7 +68,7 @@ module Camille
         def check_case_conversion_safe sym
           str = sym.to_s
           if str != str.camelize.underscore
-            raise ArgumentError.new("Only keys satisfying `key.to_s == key.to_s.caamelize.underscore` can be used.")
+            raise ArgumentError.new("Only keys satisfying `key.to_s == key.to_s.camelize.underscore` can be used.")
           end
         end
     end

data/lib/camille/types/union.rb

@@ -27,7 +27,7 @@ module Camille
       end
 
       def literal
-        "#{@left.literal} | #{@right.literal}"
+        "(#{@left.literal} | #{@right.literal})"
       end
     end
   end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -13,6 +13,7 @@ require_relative "camille/types/object"
 require_relative "camille/types/null"
 require_relative "camille/types/undefined"
 require_relative "camille/types/union"
+require_relative "camille/types/intersection"
 require_relative "camille/types/tuple"
 require_relative "camille/types/any"
 require_relative "camille/types/number_literal"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.9
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,6 +78,7 @@ files:
 - lib/camille/types/array.rb
 - lib/camille/types/boolean.rb
 - lib/camille/types/boolean_literal.rb
+- lib/camille/types/intersection.rb
 - lib/camille/types/null.rb
 - lib/camille/types/number.rb
 - lib/camille/types/number_literal.rb