camille 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ebcd5a9f0f1efd10108a596a8e4e442eb5afd3975728cd2ec51319563ae504e
-  data.tar.gz: '0889d8c954ef2983e27f7b9d97d396db0edb46251b6b55febc1f1427e9c3391f'
+  metadata.gz: 991a6d473c51e10dce629da09a1b430ff316b448521bf8631b8994b358cdc809
+  data.tar.gz: 34398f5bf1e5e2d2793de422d43dfd9c57b4f1eed9933cb3e99db91778e15ef9
 SHA512:
-  metadata.gz: 5247e53a9b76e8117247ef8d5e7c83d27cb57b3c8bf4971a5ee978e168e1e1e1c58a1348522ec7d2a4ab530d958d044c7c670a464e5cd5c02fadf046284e97c4
-  data.tar.gz: b64ab07566a56d4e407ec887af105493b4af9dd99c0fa4c1e32de32fce6e54d9e78ca375ba59377f8cecd0002f27bfc6822de2635612345ff67ea67efa305466
+  metadata.gz: 772f197217bc1ffdd29b432b3c615c34f13f286e694d33abec58a468722d3217c1d8ffcd893aadab57b3f2be4b57fbe693c08e7976d72f9c7aeee33bea67e837
+  data.tar.gz: 679738f907ba017a94dc6e73b29ff82500765c207fb48a5da42c037e0ec9dbfb6155e4d26abc465b205271fbb1928ef29d677f1510c40f9a62dbb829e9e26d73

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 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.3)
+    camille (0.5.6)
       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/types/object.rb

@@ -1,6 +1,7 @@
 module Camille
   module Types
     class Object < Camille::BasicType
+      class ArgumentError < ::ArgumentError; end
       attr_reader :fields
 
       def initialize fields
@@ -43,6 +44,7 @@ module Camille
       private
         def normalize_fields fields
           fields.map do |key, value|
+            check_case_conversion_safe key
             type = Camille::Type.instance(value)
             if key.end_with?('?')
               new_key = remove_question_mark(key)
@@ -57,6 +59,13 @@ module Camille
         def remove_question_mark sym
           sym.to_s.gsub(/\?$/, '').to_sym
         end
+
+        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.")
+          end
+        end
     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.4"
+  VERSION = "0.5.6"
 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.4
+  version: 0.5.6
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-12 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