camille 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0df267ba626a69935cbe5da75d90c08bf319b048fd210712953bc2a0e83b45
-  data.tar.gz: f93164ee26857fb30eb3a1c4c77dd8341e7aa6a52b6476134658c4061f030c58
+  metadata.gz: acda60cf2aee3c70aadf0aa040f5b79832aa8fe44c8d92f8e305715a0edf7e36
+  data.tar.gz: 9c1b5c69c2638336c8341a2f9182d097f8276b8df21506365e69846aa71596f7
 SHA512:
-  metadata.gz: 84e73bdb5f359904024658a6ce47e9585851eeb60fb28a093323ec169fa8dc6903b358255380b9b9daafc8f24490628fecd173c6ab97f46f6190bddfe29eaf72
-  data.tar.gz: 40e888902aea15a1964e6fddb09476d896c12645717f750869b76c08708529bce2d6baa8eb96dc0adffae2e65a85a70883855788d546d41c9661033378ec2132
+  metadata.gz: 4772765b95039fc3309e4eddd9a406cd0c1c94e9fca0c31e8dc283677ee9cc42620ba3acefbcc946818a44e1e78945eba798109e51bcf0ceccf6c858eff336a9
+  data.tar.gz: b90680ff5e4646237c856c26bc6c54bbccb3c2c38d69a670d95c81b7232d466ab95d27ffdd362829da985e204d648b9d81b7cfb83f51e989019324321fad4c9f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.0
+
+### Changed
+
+* Pick and Omit now use a new syntax, so it can handle snake to camel case conversion correctly
+
 ## 0.4.3
 
 ### Fixed

data/README.md

@@ -158,9 +158,9 @@ params(
   string_literal: 'hello',
   # a custom type we defined above
   product: Product,
-  # Pick and Omit use [] to enclose parameters instead of <>
-  pick: Pick[{a: 1, b: 2}, 'a' | 'b'],
-  omit: Omit[Product, 'id']
+  # Pick and Omit accepts a type and an array of symbols
+  pick: Pick[{a: 1, b: 2}, [:a, :b]],
+  omit: Omit[Product, [:id]]
 )
 ```
 

data/lib/camille/pick_and_omit.rb

@@ -14,24 +14,14 @@ module Camille
         raise ArgumentError.new("Currently onle an object type or an alias of object type is supported in #{klass_name}. Got #{type.inspect}.")
       end
 
-      @keys = Camille::Type.instance(keys)
-      case
-      when @keys.is_a?(Camille::Types::StringLiteral)
-        @keys_array = [@keys.value].map(&:to_sym)
-      when @keys.is_a?(Camille::Types::Union)
-        unfolded = unfold_union(@keys).flatten
-        if unfolded.all?{|x| x.is_a?(Camille::Types::StringLiteral)}
-          @keys_array = unfolded.map(&:value).map(&:to_sym)
-        else
-          raise ArgumentError.new("The second argument of #{klass_name} has to be a string literal or an union of string literals. Got #{keys.inspect}.")
-        end
-      else
-        raise ArgumentError.new("The second argument of #{klass_name} has to be a string literal or an union of string literals. Got #{keys.inspect}.")
+      unless keys.is_a?(::Array) && !keys.empty? && keys.all?{|x| x.is_a? Symbol}
+        raise ArgumentError.new("The second argument of #{klass_name} has to be an array of symbols. Got #{keys.inspect}.")
       end
+      @keys = keys
     end
 
     def literal
-      "#{klass_name}<#{@type.literal}, #{@keys.literal}>"
+      "#{klass_name}<#{@type.literal}, #{keys_in_literal}>"
     end
 
     def self.[] type, keys
@@ -39,12 +29,8 @@ module Camille
     end
 
     private
-      def unfold_union type
-        if type.is_a?(Camille::Types::Union)
-          [unfold_union(type.left), unfold_union(type.right)]
-        else
-          [type]
-        end
+      def keys_in_literal
+        @keys.map{|k| "\"#{k.to_s.camelize(:lower)}\""}.join(' | ')
       end
 
   end

data/lib/camille/types/omit.rb

@@ -11,7 +11,7 @@ module Camille
         end
 
         def processed_object
-          fields = @target_object.fields.reject{|k, _| @keys_array.include?(k)}
+          fields = @target_object.fields.reject{|k, _| @keys.include?(k)}
           Camille::Types::Object.new(fields)
         end
 

data/lib/camille/types/pick.rb

@@ -11,7 +11,7 @@ module Camille
         end
 
         def processed_object
-          fields = @target_object.fields.select{|k, _| @keys_array.include?(k)}
+          fields = @target_object.fields.select{|k, _| @keys.include?(k)}
           Camille::Types::Object.new(fields)
         end
 

data/lib/camille/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-18 00:00:00.000000000 Z
+date: 2023-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Typed API schema for Rails with TypeScript codegen