camille 0.5.14 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c6dd8d04bd084f86bdfb6dc20b8e7272f3bea5f041c39ff5c48f07c1d8184b
-  data.tar.gz: 7feb388c52715c48fc602bcc58274a9e667c6ac59290d8c3c7b52ff928def0d1
+  metadata.gz: c64a49ba269a9488e2990dce715d59e21ec603bb09453bc07b48f1b29cf80183
+  data.tar.gz: 482a7672c68154b5ab94c68318b2672f02f76793ad08372570a1b5ec4049e7b8
 SHA512:
-  metadata.gz: 6d2e64d5caa85962f42f04d19b9bec5b7573166616b415f899a69e1752698f10d85961ac270c6397f78377d635904dad884fa62135c58c9c8060e0e5a57a4d0a
-  data.tar.gz: c6920ed8114a4807c837e8deeb813653ccb20efc44fe246cae3139d09068f16497d3ff378d97282207a6f21df7837fdf668a9ccf44d1c918cb9e4d144caec55b
+  metadata.gz: d6ba48e7bc89d06d8ad92eb375cac5d02d783fc35c5732215f068630b57918a5b0bfaccc89b76d49983b384fbac31e2bbbe208d14526ea37489864e2cb2cee67
+  data.tar.gz: cb52ae9bdfc4445c098040b576d1e6910da8b699a615bfea339ed2bf24b0b180408d67a53b03a1c6259aadf3bda9f407d25c5fc17a12fbd22fb42c0aa0b20637

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 0.5.16
+
+### Fixed
+
+* Record keys will no longer be case converted
+
+## 0.5.15
+
+### Added
+
+* Added key conversion cache
+
+### Changed
+
+* When generating TS, endpoints are now sorted by name
+
 ## 0.5.14
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.5.13)
+    camille (0.5.15)
       rails (>= 6.1, < 8)
 
 GEM
@@ -90,20 +90,20 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.17.0)
-    net-imap (0.4.7)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.6.1)
+    nio4r (2.7.3)
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     racc (1.6.2)

data/benchmarks/returning_multiple_values.rb

@@ -0,0 +1,94 @@
+require "benchmark/ips"
+
+def array_object
+  [1, 2, 3]
+end
+
+def hash_object
+  {
+    a: 1,
+    b: 2,
+    c: 3
+  }
+end
+
+class PlainObject
+  attr_reader :a, :b, :c
+
+  def initialize a, b, c
+    @a = a
+    @b = b
+    @c = c
+  end
+end
+
+def plain_object
+  PlainObject.new(1, 2, 3)
+end
+
+StructObject = Struct.new(:a, :b, :c)
+
+def struct_object
+  StructObject.new(1, 2, 3)
+end
+
+DataObject = Data.define(:a, :b, :c)
+
+def data_object
+  DataObject.new(1, 2, 3)
+end
+
+Benchmark.ips do |x|
+  x.report("parallel assignment") do
+    a, b, c = array_object
+  end
+
+  x.report("array access") do
+    arr = array_object
+    a = arr[0]
+    b = arr[1]
+    c = arr[2]
+  end
+
+  x.report("hash access") do
+    hsh = hash_object
+    a = hsh[:a]
+    b = hsh[:b]
+    c = hsh[:c]
+  end
+
+  x.report("hash destructuring") do
+    hash_object => {a:, b:, c:}
+  end
+
+  x.report("plain object") do
+    obj = plain_object
+    a = obj.a
+    b = obj.b
+    c = obj.c
+  end
+
+  x.report("struct object") do
+    obj = struct_object
+    a = obj.a
+    b = obj.b
+    c = obj.c
+  end
+
+  x.report("struct object destructuring") do
+    struct_object => {a:, b:, c:}
+  end
+
+  x.report("data object") do
+    obj = data_object
+    a = obj.a
+    b = obj.b
+    c = obj.c
+  end
+
+  x.report("data object destructuring") do
+    data_object => {a:, b:, c:}
+  end
+
+  x.compare!
+end

data/lib/camille/configuration.rb

@@ -2,21 +2,30 @@
 module Camille
   class Configuration
     class << self
-      def ts_header= string
-        @ts_header = string
-      end
+      attr_reader :response_key_converter, :params_key_converter
+      attr_accessor :ts_header, :ts_location
+
+      def load_default_configurations
+        self.response_key_converter = lambda do |string|
+          string.camelize(:lower)
+        end
 
-      def ts_header
-        @ts_header
+        self.params_key_converter = lambda do |string|
+          string.underscore
+        end
       end
 
-      def ts_location= string
-        @ts_location = string
+      def response_key_converter= lambda
+        @response_key_converter = lambda
+        Camille::Type.define_method :convert_response_key, &lambda
       end
 
-      def ts_location
-        @ts_location
+      def params_key_converter= lambda
+        @params_key_converter = lambda
+        Camille::Type.define_method :convert_params_key, &lambda
       end
+
+      Camille::Configuration.load_default_configurations
     end
   end
 end

data/lib/camille/controller.rb

@@ -25,9 +25,6 @@ module Camille
               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
           else
@@ -45,7 +42,7 @@ module Camille
       Camille::Loader.check_and_raise_exception
       if endpoint = camille_endpoint
         begin
-          params.deep_transform_keys!{|key| key.to_s.underscore}
+          params.deep_transform_keys!{|key| Camille::Configuration.params_key_converter.call(key.to_s)}
           result = super
           # When there's no `render` call, Rails will return status 204
           if response.status == 204

data/lib/camille/endpoint.rb

@@ -16,9 +16,9 @@ module Camille
         raise UnknownResponseError.new("Endpoint lacking a `response` definition.")
       end
       if @params_type
-        "#{ActiveSupport::Inflector.camelize @name, false}(params: #{@params_type.literal}): Promise<#{@response_type.literal}>"
+        "#{Camille::Configuration.response_key_converter.call(@name.to_s)}(params: #{@params_type.literal}): Promise<#{@response_type.literal}>"
       else
-        "#{ActiveSupport::Inflector.camelize @name, false}(): Promise<#{@response_type.literal}>"
+        "#{Camille::Configuration.response_key_converter.call(@name.to_s)}(): Promise<#{@response_type.literal}>"
       end
     end
 

data/lib/camille/key_converter.rb

@@ -0,0 +1,19 @@
+module Camille
+  class KeyConverter
+    class << self
+      RESPONSE_KEY_CACHE = {}
+
+      def convert_response_key key
+        if in_cache = RESPONSE_KEY_CACHE[key]
+          in_cache
+        else
+          RESPONSE_KEY_CACHE[key] = Camille::Configuration.response_key_converter.call(key.to_s)
+        end
+      end
+
+      def convert_params_key key
+        Camille::Configuration.params_key_converter.call(key)
+      end
+    end
+  end
+end

data/lib/camille/object_hash.rb

@@ -0,0 +1,7 @@
+module Camille
+  class ObjectHash < Hash
+    def as_json options = nil
+      transform_keys{|k, _| Camille::KeyConverter.convert_response_key(k)}.as_json
+    end
+  end
+end

data/lib/camille/pick_and_omit.rb

@@ -30,7 +30,7 @@ module Camille
 
     private
       def keys_in_literal
-        @keys.map{|k| "\"#{k.to_s.camelize(:lower)}\""}.join(' | ')
+        @keys.map{|k| "\"#{Camille::Configuration.response_key_converter.call(k.to_s)}\""}.join(' | ')
       end
 
   end

data/lib/camille/schema.rb

@@ -17,7 +17,7 @@ module Camille
     def self.literal_lines
       [
         Camille::Line.new('{'),
-        *endpoints.map do |k, e|
+        *endpoints.sort_by{|k, e| k}.map do |k, e|
           Camille::Line.new("#{e.function},")
         end.map(&:do_indent),
         Camille::Line.new('}')

data/lib/camille/schemas.rb

@@ -31,13 +31,13 @@ module Camille
         tree.map do |key, value|
           if value.is_a? ::Hash
             [
-              Camille::Line.new("#{ActiveSupport::Inflector.camelize(key, false)}: {"),
+              Camille::Line.new("#{Camille::Configuration.response_key_converter.call(key.to_s)}: {"),
               tree_literal_lines(value).map(&:do_indent),
               Camille::Line.new('},')
             ]
           else
             value.literal_lines.tap do |lines|
-              lines.first.prepend("#{ActiveSupport::Inflector.camelize(key, false)}: ")
+              lines.first.prepend("#{Camille::Configuration.response_key_converter.call(key.to_s)}: ")
               lines.last.append(',')
             end
           end

data/lib/camille/types/object.rb

@@ -32,7 +32,7 @@ module Camille
             transformed = transform_and_check_results.map do |key, (error, transformed)|
               [key, transformed]
             end.to_h
-            [nil, transformed]
+            [nil, Camille::ObjectHash[transformed]]
           else
             [Camille::TypeError.new(**errors.to_h), nil]
           end
@@ -48,7 +48,7 @@ module Camille
       private
         def normalize_fields fields
           fields.map do |key, value|
-            check_case_conversion_safe key
+            check_key_conversion_safe key
             type = Camille::Type.instance(value)
             if key.end_with?('?')
               new_key = remove_question_mark(key)
@@ -65,13 +65,13 @@ module Camille
         end
 
         def literal_key key
-          "#{ActiveSupport::Inflector.camelize key.to_s, false}#{@optional_keys.include?(key) ? '?' : ''}"
+          "#{Camille::Configuration.response_key_converter.call(key.to_s)}#{@optional_keys.include?(key) ? '?' : ''}"
         end
 
-        def check_case_conversion_safe sym
+        def check_key_conversion_safe sym
           str = sym.to_s
-          if str != str.camelize.underscore
-            raise ArgumentError.new("Only keys satisfying `key.to_s == key.to_s.camelize.underscore` can be used.")
+          if str != Camille::Configuration.params_key_converter.call(Camille::Configuration.response_key_converter.call(str))
+            raise ArgumentError.new("Only keys satisfying `key == key.to_s.camelize.underscore` can be used.")
           end
         end
     end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -3,6 +3,7 @@
 require "active_support"
 
 require_relative "camille/version"
+require_relative "camille/object_hash"
 require_relative "camille/basic_type"
 require_relative "camille/types"
 require_relative "camille/types/number"
@@ -37,6 +38,7 @@ require_relative "camille/loader"
 require_relative "camille/configuration"
 require_relative "camille/code_generator"
 require_relative "camille/main_controller"
+require_relative "camille/key_converter"
 
 require "rails/generators"
 require_relative "camille/generators/install_generator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.16
 platform: ruby
 authors:
 - Alyssa
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- benchmarks/returning_multiple_values.rb
 - bin/console
 - bin/setup
 - gemfiles/rails-6.1
@@ -62,9 +63,11 @@ files:
 - lib/camille/generators/templates/schema_template.erb
 - lib/camille/generators/templates/type_template.erb
 - lib/camille/generators/type_generator.rb
+- lib/camille/key_converter.rb
 - lib/camille/line.rb
 - lib/camille/loader.rb
 - lib/camille/main_controller.rb
+- lib/camille/object_hash.rb
 - lib/camille/pick_and_omit.rb
 - lib/camille/railtie.rb
 - lib/camille/schema.rb
@@ -98,7 +101,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/onyxblade/camille
   source_code_uri: https://github.com/onyxblade/camille
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Typed API schema for Rails with TypeScript codegen
 test_files: []