camille 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efa884b2cb790a85ad8ae7f2e5462fd2a94d507aad4437c3063af81b333dd2c4
-  data.tar.gz: e1a1c1a68397a31521704a2fff6044a3f78997418acf5cd4fd5994c9eb5748c3
+  metadata.gz: f5911a8f4d1519a2a373ebee118bce4f110d64f5eaeafece5c8c8e46580b5c20
+  data.tar.gz: b59a4600bd145350d1217219b0074ffb6e80d8cdc97318995b6ba2b0bffe7450
 SHA512:
-  metadata.gz: 2c8c279a7e420762d3586a191b08f4e916fe2827d30a7d76702d4dcd92e466efe0cca29b46a8688f198eb6c49193c2698ef7fe87f7fc85e292489e8bf39a27b0
-  data.tar.gz: c4ba05522f14dc3c80f9dabfddacfe562f32475d278b49ddb49104bb76f8cb72d8032547e0cc25d5f8655c87d6ae0ddecb4e5db7cab4058d27b40236b4fba06a
+  metadata.gz: 3088068a948ca92e1a6bc90690c5f27d5e2c788c3f76e2ba40b5ebf62b7c3fdffac809411941a3f05a77ace636ce16bf7742c12c1ae5700c4b45d7bfb9fdddfb
+  data.tar.gz: c6f0a0b72216805bf591bc4289172e69382f702ccc14d161a3b63267dc83816a47045e9d61884029349543aac5ecf5aeb43bbc82f0c95ef23ff7df569037b8b6

data/Gemfile.lock

@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     camille (0.1.0)
-      listen (~> 3.3)
       rails (>= 6.1, < 8)
 
 GEM
@@ -79,14 +78,10 @@ GEM
     date (3.3.3)
     diff-lcs (1.5.0)
     erubi (1.12.0)
-    ffi (1.15.5)
     globalid (1.1.0)
       activesupport (>= 5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    listen (3.8.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -142,9 +137,6 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rake (13.0.6)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)

data/lib/camille/code_generator.rb

@@ -4,6 +4,7 @@ module Camille
   module CodeGenerator
     def self.generate_ts
       io = StringIO.new
+      io.puts "// This file is automatically generated."
       io.puts Camille::Configuration.ts_header
       io.puts
       Camille::Types.literal_lines.each do |line|
@@ -17,10 +18,5 @@ module Camille
       io.string
     end
 
-    def self.generate_ts_file
-      if Camille::Configuration.ts_location
-        File.open(Camille::Configuration.ts_location, 'w'){|f| f.write generate_ts}
-      end
-    end
   end
 end

data/lib/camille/controller_extension.rb

@@ -34,9 +34,6 @@ module Camille
     end
 
     def process_action(*)
-      if exception = Camille::Loader.exception
-        raise exception
-      end
       if endpoint = camille_endpoint
         params.deep_transform_keys!{|key| key.to_s.underscore}
         super

data/lib/camille/loader.rb

@@ -19,7 +19,6 @@ module Camille
 
           eager_load
           construct_controller_name_to_schema_map
-          Camille::CodeGenerator.generate_ts_file
         end
       end
 
@@ -41,14 +40,10 @@ module Camille
           @zeitwerk_loader.reload
           eager_load
           construct_controller_name_to_schema_map
-          Camille::CodeGenerator.generate_ts_file
         end
       end
 
       def register_routes router_context
-        if exception = Camille::Loader.exception
-          raise exception
-        end
         Camille::Loader.loaded_schemas.each do |schema|
           schema.endpoints.each do |name, endpoint|
             router_context.public_send(endpoint.verb, endpoint.path, controller: schema.path.gsub(/^\//, ''), action: endpoint.name, as: false)
@@ -86,34 +81,8 @@ module Camille
 
       def reload
         synchronize do
-          begin
-            @exception = nil
-            reload_types_and_schemas
-            Rails.application.reload_routes!
-
-            # just for spec
-            @last_reload = Time.now
-          rescue Exception => e
-            Rails.logger.error e
-            @exception = e
-          end
-        end
-      end
-
-      def exception
-        synchronize do
-          @exception
-        end
-      end
-
-      def setup_listen app
-        if !app.config.cache_classes
-          require 'listen'
-          listener = Listen.to("#{app.root}/config/camille") do |changed|
-            #puts "Change detected. Camille reloading..."
-            Camille::Loader.reload
-          end
-          listener.start
+          reload_types_and_schemas
+          Rails.application.reload_routes!
         end
       end
 

data/lib/camille/main_controller.rb

@@ -0,0 +1,13 @@
+require 'action_controller'
+
+module Camille
+  class MainController < ActionController::Base
+    def endpoints_ts
+      if Rails.env.development?
+        render plain: Camille::CodeGenerator.generate_ts
+      else
+        head 404
+      end
+    end
+  end
+end

data/lib/camille/railtie.rb

@@ -8,16 +8,25 @@ module Camille
       ActionController::Base.include(Camille::ControllerExtension)
 
       Camille::Loader.setup_zeitwerk_loader(app)
-      Camille::Loader.setup_listen(app)
 
       app.routes.prepend do
+        get '/camille/endpoints.ts' => 'camille/main#endpoints_ts'
         Camille::Loader.register_routes(self)
       end
 
+      dir = "#{Rails.root}/config/camille"
+
+      update_checker = ActiveSupport::FileUpdateChecker.new([], {dir => ['rb']}) do
+        Camille::Loader.reload
+      end
+
+      app.reloaders << update_checker
+
       app.reloader.to_run do
         require_unload_lock!
-        Camille::Loader.reload
+        update_checker.execute_if_updated
       end
+
     end
 
   end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -28,6 +28,7 @@ require_relative "camille/controller_extension"
 require_relative "camille/loader"
 require_relative "camille/configuration"
 require_relative "camille/code_generator"
+require_relative "camille/main_controller"
 
 module Camille
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camille
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
 description: ''
 email:
 - cichol@live.cn
@@ -67,6 +53,7 @@ files:
 - lib/camille/endpoint.rb
 - lib/camille/line.rb
 - lib/camille/loader.rb
+- lib/camille/main_controller.rb
 - lib/camille/railtie.rb
 - lib/camille/schema.rb
 - lib/camille/schemas.rb