camille 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7812549c03ae51c6ea3883e982770259b1757ce13b9014e63f21bf87a6522e02
-  data.tar.gz: b562c295c761474368defa4aaa5ba544a5c82d54ad013eafcd1fee5305a68b82
+  metadata.gz: 99c0d1cc96b49d7fe7e6262f5a81f07feeb476bb0c1d3902259cdaf3d346497e
+  data.tar.gz: 1f9973ab623eb9d1322f116ba21eb1708bd5b32d8f3957798bfc87493bbaea1d
 SHA512:
-  metadata.gz: 924f63558e9540098f5073ed9b806b3e73169324ad5dea5da1967f275922396f81e21db4968ba3298baa3443d65ae09561c8612a87da15dfa1549ea1404cfafb
-  data.tar.gz: 60fe1b8a0baf1df20417518f74e977431f7f9df30b1d5a6087bdef96a78b40d6782f2677f9bbdcac44e674cd676456b50c719ec0e194b069edaa8960afc7e7c5
+  metadata.gz: 50fb0dd0da2ca88ab75652af3bd8481ef37185dbfaddd5913cbfa4a9a24d0887cfe4fe1d7b42f98287bbcbce0fbbf108434343a1d149102f1471df16451a3556
+  data.tar.gz: f7d61181b15fa95ceff6e43f68148c3ca4bc03dbfbae89820250ce23028a78213fc255252b790e61890ff30a632c73442c1696c64372f1f56f9ecbf28d74928d

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.6.3
+
+### Added
+
+* Allow accessing Rails models from type files.
+
+## 0.6.2
+
+### Added
+
+* Added `Camille::Rendered` to store type-checked JSON string. Using this can skip type-check and JSON rendering.
+* Added `Camille::Checked#render` to generate `Camille::Rendered`.
+
+### Changed
+
+* Use `JSON.dump` instead of ActiveSupport `.to_json`.
+
 ## 0.6.1
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.6.0)
+    camille (0.6.2)
       rails (>= 6.1, < 8.1)
 
 GEM
@@ -109,14 +109,14 @@ GEM
     marcel (1.0.4)
     mini_mime (1.1.5)
     minitest (5.25.4)
-    net-imap (0.5.1)
+    net-imap (0.5.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
     nokogiri (1.17.2-x86_64-linux)
@@ -190,11 +190,12 @@ GEM
     securerandom (0.4.0)
     stringio (3.1.2)
     thor (1.3.2)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     useragent (0.16.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.7.1)

data/lib/camille/basic_type.rb

@@ -5,6 +5,20 @@ module Camille
   class BasicType
     class InvalidTypeError < ::ArgumentError; end
 
+    module CheckRendered
+      def check value
+        if value.instance_of? Camille::Rendered
+          if @fingerprint == value.fingerprint
+            Camille::Checked.new(@fingerprint, value)
+          else
+            Camille::TypeError.new("Expected `Rendered` object with fingerprint #{@fingerprint}. Got fingerprint #{value.fingerprint}.")
+          end
+        else
+          super
+        end
+      end
+    end
+
     attr_reader :fingerprint
 
     def initialize
@@ -23,6 +37,10 @@ module Camille
       Camille::Types::Array.new(self)
     end
 
+    def check value
+      raise NotImplementedError
+    end
+
     def transform value
       value
     end
@@ -43,6 +61,10 @@ module Camille
       instance_method(:initialize).arity == 0
     end
 
+    def self.inherited klass
+      klass.prepend CheckRendered
+    end
+
     def self.instance value
       case
       when value.is_a?(::Hash)

data/lib/camille/checked.rb

@@ -14,5 +14,13 @@ module Camille
     def type_error?
       false
     end
+
+    def render
+      if @value.instance_of? Camille::Rendered
+        @value
+      else
+        Camille::Rendered.new(@fingerprint, JSON.dump(@value))
+      end
+    end
   end
 end

data/lib/camille/controller.rb

@@ -25,7 +25,8 @@ module Camille
               Camille::TypeErrorPrinter.new(result).print(string_io)
               raise TypeError.new("\nType check failed for response.\n#{string_io.string}")
             else
-              super(json: result.value)
+              rendered = result.render.json
+              super(json: rendered)
             end
           else
             raise ArgumentError.new("Expected key :json for `render` call.")

data/lib/camille/loader.rb

@@ -33,7 +33,11 @@ module Camille
           loader.setup
           @zeitwerk_loader = loader
           @configuration_location = "#{app.root}/config/camille/configuration.rb"
+        end
+      end
 
+      def initial_load
+        synchronize do
           eager_load
           construct_controller_name_to_schema_map
         end

data/lib/camille/object_hash.rb

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

data/lib/camille/railtie.rb

@@ -17,6 +17,9 @@ module Camille
         Camille::Loader.register_routes(self)
       end
 
+    end
+
+    config.after_initialize do |app|
       dir = "#{Rails.root}/config/camille"
 
       update_checker = ActiveSupport::FileUpdateChecker.new([], {dir => ['rb']}) do
@@ -27,9 +30,10 @@ module Camille
 
       app.reloader.to_run do
         require_unload_lock!
-        update_checker.execute_if_updated
+        update_checker.execute
       end
 
+      Camille::Loader.initial_load
     end
 
   end

data/lib/camille/rendered.rb

@@ -0,0 +1,14 @@
+module Camille
+  class Rendered
+    attr_reader :fingerprint, :json
+
+    def initialize fingerprint, json
+      @fingerprint = fingerprint
+      @json = json
+    end
+
+    def to_json options = nil
+      @json
+    end
+  end
+end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -4,6 +4,7 @@ require "active_support"
 
 require_relative "camille/version"
 require_relative "camille/object_hash"
+require_relative "camille/rendered"
 require_relative "camille/checked"
 require_relative "camille/basic_type"
 require_relative "camille/types"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - merely
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2025-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,6 +75,7 @@ files:
 - lib/camille/object_hash.rb
 - lib/camille/pick_and_omit.rb
 - lib/camille/railtie.rb
+- lib/camille/rendered.rb
 - lib/camille/schema.rb
 - lib/camille/schemas.rb
 - lib/camille/syntax.rb