camille 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0df267ba626a69935cbe5da75d90c08bf319b048fd210712953bc2a0e83b45
-  data.tar.gz: f93164ee26857fb30eb3a1c4c77dd8341e7aa6a52b6476134658c4061f030c58
+  metadata.gz: 54ba62877d8151101a93641018cc5516967bac05b2c437accc5861bd50f640da
+  data.tar.gz: 7097f8975cce507a806ba77f022b79e797f6d607734d573fa3607de79ee03162
 SHA512:
-  metadata.gz: 84e73bdb5f359904024658a6ce47e9585851eeb60fb28a093323ec169fa8dc6903b358255380b9b9daafc8f24490628fecd173c6ab97f46f6190bddfe29eaf72
-  data.tar.gz: 40e888902aea15a1964e6fddb09476d896c12645717f750869b76c08708529bce2d6baa8eb96dc0adffae2e65a85a70883855788d546d41c9661033378ec2132
+  metadata.gz: c17a00216823baa351ec0cb78f7e959c8c3ab17fd0533ba7f7265660024c08ac17f9086083519220589c9bd56480642b45b146b3b0aa1e4ac069c321d3b9f670
+  data.tar.gz: f95bce0848370d9934673cd9fb367d43d0851718e3d37871f8e8f0005efb1263cb9c0cd03c9040fbfc928d15b4e996273b75ed9cf5481ad2f6abf5cd546bda3a

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.5.1
+
+### Fixed
+
+* Fixed the wrong error returned for `union.left`
+
+## 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/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.4.3)
+    camille (0.5.1)
       rails (>= 6.1, < 8)
 
 GEM
@@ -103,7 +103,7 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     racc (1.6.2)

data/README.md

@@ -29,6 +29,10 @@ Therefore, if the front-end requests the API by calling `data`, we have guarante
 
 By using these request functions, we also don't need to know about HTTP verbs and paths. It's impossible to have unrecognized routes, since Camille will make sure that each function handled by the correct Rails action.
 
+## Tutorial
+
+There's a step by step tutorial for setting up and showcasing Camille: https://github.com/onyxblade/camille-tutorial.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -158,9 +162,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/types/union.rb

@@ -14,7 +14,7 @@ module Camille
           right_error, right_transformed = @right.transform_and_check value
           if right_error
             error = Camille::TypeError.new(
-              'union.left' => right_error,
+              'union.left' => left_error,
               'union.right' => right_error
             )
             [error, nil]

data/lib/camille/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-18 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails