camille 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a587c953d4d716329e30ee94c7dfd2b67fcbb9d95b6aee5acc3a74ba7d8e2883
-  data.tar.gz: 28cf879c56d17ac119c2913c14d2ce09548c226b8f9120aa5fd5ccc3ab8334d0
+  metadata.gz: 3ff47e3a7fdcb5ef28cca7bc5ce3989900c82d7eb0d94af77a00e0b0c4ac9b3d
+  data.tar.gz: 7885520d31b5b0a4f339cc24e5993ea1d8e1d637029a018b5dcb144060e72965
 SHA512:
-  metadata.gz: 64ca501f703b329e9c4a8872a237480a4a751ffdbb82cadfc7ca67a31fcaffffd6c18c26d5eff045f69600c6bf2e6f82c9607b47ce83dbb9333a5b6d67f40692
-  data.tar.gz: 5d8951b905ad94aecc0b10756c9ff16bb25f9b6ee791c57694ad7bfdfd2f0c27cebe6e980b975f3a0cb17b3afa25a750d0808cfad221729e7d1c50caeba20e8e
+  metadata.gz: 5c990d3326e3271092647bd2ccdbc9ddf213e0f6200c872f0d398c4fb5306670c7e9993e4e48c82dab84a97ea4a8b3200ad100475c4a9243758e94ea211df681
+  data.tar.gz: c21e9542119b194dac81e446574c582fcf16a98a7fbeaeeba33e083518b3070b826a4db20596ff22fb5b18f1b8e64161056e10f71309a3309ab3213c8da9ba4d

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.5.7
+
+### Added
+
+* Camille::Controller::MissingRenderError will now be raised if `render json:` is missing in action body
+* ActionController::MissingExactTemplate is re-raised as Camille::Controller::MissingRenderError
+
+## 0.5.6
+
+### Added
+
+* Added record type
+
+## 0.5.5
+
+### Added
+
+* Added case conversion check for object keys.
+
 ## 0.5.4
 
 ### Added

data/Gemfile.lock

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

data/README.md

@@ -163,9 +163,11 @@ params(
   boolean_literal: false,
   # a custom type we defined above
   product: Product,
-  # Pick and Omit accepts a type and an array of symbols
+  # Pick and Omit accept a type and an array of symbols
   pick: Pick[{a: 1, b: 2}, [:a, :b]],
-  omit: Omit[Product, [:id]]
+  omit: Omit[Product, [:id]],
+  # Record accepts a key type and a value type
+  record: Record[Number, String]
 )
 ```
 

data/lib/camille/controller.rb

@@ -2,6 +2,7 @@ module Camille
   module Controller
     class TypeError < ::StandardError; end
     class ArgumentError < ::ArgumentError; end
+    class MissingRenderError < ::StandardError; end
 
     def camille_schema
       @camille_schema ||= Camille::Loader.controller_name_to_schema_map[self.class.name]
@@ -24,6 +25,7 @@ module Camille
             if transformed.is_a? Hash
               transformed.deep_transform_keys!{|k| k.to_s.camelize(:lower)}
             end
+            @camille_rendered = true
             super(json: transformed)
           end
         else
@@ -37,12 +39,25 @@ module Camille
     def process_action(*)
       Camille::Loader.check_and_raise_exception
       if endpoint = camille_endpoint
-        params.deep_transform_keys!{|key| key.to_s.underscore}
-        super
+        begin
+          params.deep_transform_keys!{|key| key.to_s.underscore}
+          result = super
+          unless @camille_rendered
+            raise_missing_render_error
+          end
+          result
+        rescue ActionController::MissingExactTemplate
+          raise_missing_render_error
+        end
       else
         super
       end
     end
 
+    private
+      def raise_missing_render_error
+        raise MissingRenderError.new("Expected `render json:` call in controller action body.")
+      end
+
   end
 end

data/lib/camille/types/record.rb

@@ -0,0 +1,58 @@
+module Camille
+  module Types
+    class Record < Camille::BasicType
+      attr_reader :left, :right
+      attr_reader :key, :value
+
+      def initialize key, value
+        @key = Camille::Type.instance key
+        @value = Camille::Type.instance value
+      end
+
+      def transform_and_check value
+        if value.is_a? ::Hash
+
+          transform_and_check_results = value.map.with_index do |(k, v), index|
+            [index, transform_and_check_pair(k, v)]
+          end
+
+          errors = transform_and_check_results.map do |index, (error, transformed)|
+            ["record[#{index}]", error]
+          end.select{|x| x[1]}
+
+          if errors.empty?
+            transformed = transform_and_check_results.map{|_, (_, transformed)| transformed}.to_h
+            [nil, transformed]
+          else
+            [Camille::TypeError.new(**errors.to_h), nil]
+          end
+        else
+          [Camille::TypeError.new("Expected hash, got #{value.inspect}."), nil]
+        end
+      end
+
+      def self.[] key, value
+        self.new key, value
+      end
+
+      def literal
+        "Record<#{@key.literal}, #{@value.literal}>"
+      end
+
+      private
+        def transform_and_check_pair key, value
+          key_error, key_transformed = @key.transform_and_check key
+          value_error, value_transformed = @value.transform_and_check value
+
+          if key_error.nil? && value_error.nil?
+            [nil, [key_transformed, value_transformed]]
+          else
+            errors = [['record.key', key_error], ['record.value', value_error]].select{|x| x[1]}.to_h
+
+            error = Camille::TypeError.new(**errors)
+            [error, nil]
+          end
+        end
+    end
+  end
+end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -21,6 +21,7 @@ require_relative "camille/types/boolean_literal"
 require_relative "camille/pick_and_omit"
 require_relative "camille/types/pick"
 require_relative "camille/types/omit"
+require_relative "camille/types/record"
 require_relative "camille/type"
 require_relative "camille/type_error"
 require_relative "camille/type_error_printer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-13 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,7 @@ files:
 - lib/camille/types/object.rb
 - lib/camille/types/omit.rb
 - lib/camille/types/pick.rb
+- lib/camille/types/record.rb
 - lib/camille/types/string.rb
 - lib/camille/types/string_literal.rb
 - lib/camille/types/tuple.rb