camille 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efa884b2cb790a85ad8ae7f2e5462fd2a94d507aad4437c3063af81b333dd2c4
-  data.tar.gz: e1a1c1a68397a31521704a2fff6044a3f78997418acf5cd4fd5994c9eb5748c3
+  metadata.gz: 5779c76d0ca3c695e1e15d0870d94be5739449f7ad1b9422ab9944d139f3a6d1
+  data.tar.gz: 855906b19324060e4fb8578451e1fd77f692918f6722a81b9f3fbdc5cbf48fd3
 SHA512:
-  metadata.gz: 2c8c279a7e420762d3586a191b08f4e916fe2827d30a7d76702d4dcd92e466efe0cca29b46a8688f198eb6c49193c2698ef7fe87f7fc85e292489e8bf39a27b0
-  data.tar.gz: c4ba05522f14dc3c80f9dabfddacfe562f32475d278b49ddb49104bb76f8cb72d8032547e0cc25d5f8655c87d6ae0ddecb4e5db7cab4058d27b40236b4fba06a
+  metadata.gz: e555aebf740ecd06dcf96928a3aeafe414430a7d439a83679da90d2e60e23a97cd28bc583a473ddab76c60275e31668b76f9220ca2278c21ecceb8f2f11743fa
+  data.tar.gz: 00bf823aa9f394c1198cd492f42cd716b8bd59c08fe7e704df64aa92cdb927198ad87761f867de9b59153cba96490190292296755ef1642bd9c759820b00ecc0

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    camille (0.1.0)
-      listen (~> 3.3)
+    camille (0.3.0)
       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/generators/install_generator.rb

@@ -0,0 +1,23 @@
+
+module Camille
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      desc 'install camille'
+
+      def copy_configuration_file
+        copy_file "configuration.rb", "config/camille/configuration.rb"
+      end
+
+      def copy_type_example
+        copy_file "type_example.rb", "config/camille/types/example.rb"
+      end
+
+      def copy_schema_example
+        copy_file "schema_example.rb", "config/camille/schemas/examples.rb"
+      end
+
+    end
+  end
+end

data/lib/camille/generators/schema_generator.rb

@@ -0,0 +1,14 @@
+
+module Camille
+  module Generators
+    class SchemaGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+
+      desc 'generate camille schema'
+
+      def generate_type_file
+        template 'schema_template.erb', "config/camille/schemas/#{@name}.rb"
+      end
+    end
+  end
+end

data/lib/camille/generators/templates/configuration.rb

@@ -0,0 +1,6 @@
+Camille.configure do |config|
+  # Contents to be placed at the beginning of the output TypeScript file.
+  config.ts_header = <<~EOF
+    import request from './request'
+  EOF
+end

data/lib/camille/generators/templates/schema_example.rb

@@ -0,0 +1,35 @@
+using Camille::CoreExt
+
+class Camille::Schemas::Examples < Camille::Schema
+  include Camille::Types
+
+  get :find do
+    params(
+      id: Number
+    )
+
+    response(
+      example?: Example
+    )
+  end
+
+  get :list do
+    response(
+      examples: Example[]
+    )
+  end
+
+  post :update do
+    params(
+      id: Number,
+      example: Example
+    )
+
+    response(
+      success: Boolean,
+      errors: {
+        message: String
+      }[]
+    )
+  end
+end

data/lib/camille/generators/templates/schema_template.erb

@@ -0,0 +1,14 @@
+using Camille::CoreExt
+
+class Camille::Schemas::<%= class_name %> < Camille::Schema
+  include Camille::Types
+
+  # get :data do
+  #   params(
+  #     id: Number
+  #   )
+  #   response(
+  #     name: String
+  #   )
+  # end
+end

data/lib/camille/generators/templates/type_example.rb

@@ -0,0 +1,10 @@
+using Camille::CoreExt
+
+class Camille::Types::Example < Camille::Type
+  include Camille::Types
+
+  alias_of(
+    id: Number,
+    name: String,
+  )
+end

data/lib/camille/generators/templates/type_template.erb

@@ -0,0 +1,9 @@
+using Camille::CoreExt
+
+class Camille::Types::<%= class_name %> < Camille::Type
+  include Camille::Types
+
+  alias_of(
+    # id: Number
+  )
+end

data/lib/camille/generators/type_generator.rb

@@ -0,0 +1,14 @@
+
+module Camille
+  module Generators
+    class TypeGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path("templates", __dir__)
+
+      desc 'generate camille type'
+
+      def generate_type_file
+        template 'type_template.erb', "config/camille/types/#{@name}.rb"
+      end
+    end
+  end
+end

data/lib/camille/loader.rb

@@ -10,8 +10,25 @@ module Camille
         synchronize do
           loader = Zeitwerk::Loader.new
           loader.enable_reloading if !app.config.cache_classes
-          loader.push_dir "#{app.root}/config/camille/types", namespace: Camille::Types
-          loader.push_dir "#{app.root}/config/camille/schemas", namespace: Camille::Schemas
+
+          types_dir = "#{app.root}/config/camille/types"
+          schemas_dir = "#{app.root}/config/camille/schemas"
+
+          if Dir.exist? types_dir
+            loader.push_dir types_dir, namespace: Camille::Types
+          else
+            unless inside_generator?
+              puts "[Camille Warning] Expected folder `config/camille/types`. Run `rails g camille:install` to fix it."
+            end
+          end
+
+          if Dir.exist? schemas_dir
+            loader.push_dir schemas_dir, namespace: Camille::Schemas
+          else
+            unless inside_generator?
+              puts "[Camille Warning] Expected folder `config/camille/schemas`. Run `rails g camille:install` to fix it."
+            end
+          end
 
           loader.setup
           @zeitwerk_loader = loader
@@ -19,21 +36,9 @@ module Camille
 
           eager_load
           construct_controller_name_to_schema_map
-          Camille::CodeGenerator.generate_ts_file
         end
       end
 
-      def eager_load
-        @eager_loading = true
-        load @configuration_location
-        @zeitwerk_loader.eager_load
-        @eager_loading = false
-      end
-
-      def eager_loading?
-        @eager_loading
-      end
-
       def reload_types_and_schemas
         synchronize do
           Camille::Loader.loaded_types.clear
@@ -41,14 +46,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)
@@ -74,48 +75,32 @@ module Camille
         end
       end
 
-      def construct_controller_name_to_schema_map
-        synchronize do
-          controller_name_to_schema_map.clear
-          loaded_schemas.each do |schema|
-            controller_class_name = "#{schema.klass_name}Controller"
-            controller_name_to_schema_map[controller_class_name] = schema
+      private
+        def eager_load
+          if File.exist?(@configuration_location)
+            load @configuration_location
+          else
+            unless inside_generator?
+              puts "[Camille Warning] Expected file `config/camille/configuration.rb`. Run `rails g camille:install` to fix it."
+            end
           end
+          @zeitwerk_loader.eager_load
         end
-      end
 
-      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
+        def construct_controller_name_to_schema_map
+          synchronize do
+            controller_name_to_schema_map.clear
+            loaded_schemas.each do |schema|
+              controller_class_name = "#{schema.klass_name}Controller"
+              controller_name_to_schema_map[controller_class_name] = schema
+            end
           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
+        def inside_generator?
+          # https://stackoverflow.com/a/53963584
+          !(Rails.const_defined?(:Server) || Rails.const_defined?(:Console))
         end
-      end
 
     end
 

data/lib/camille/main_controller.rb

@@ -0,0 +1,9 @@
+require 'action_controller'
+
+module Camille
+  class MainController < ActionController::Base
+    def endpoints_ts
+      render plain: Camille::CodeGenerator.generate_ts
+    end
+  end
+end

data/lib/camille/railtie.rb

@@ -8,16 +8,28 @@ module Camille
       ActionController::Base.include(Camille::ControllerExtension)
 
       Camille::Loader.setup_zeitwerk_loader(app)
-      Camille::Loader.setup_listen(app)
 
       app.routes.prepend do
+        if Rails.env.development?
+          get '/camille/endpoints.ts' => 'camille/main#endpoints_ts'
+        end
+
         Camille::Loader.register_routes(self)
       end
 
+      dir = "#{Rails.root}/config/camille"
+
+      update_checker = ActiveSupport::FileUpdateChecker.new([], {dir => ['rb']}) do
+        Camille::Loader.reload_types_and_schemas
+      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/schema.rb

@@ -2,20 +2,10 @@ module Camille
   class Schema
     class AlreadyDefinedError < ::ArgumentError; end
 
-    include Camille::Types
-
     def self.endpoints
       @endpoints ||= {}
     end
 
-    def self.const_missing name
-      if Camille::Loader.eager_loading?
-        Camille::Types.const_get(name)
-      else
-        super
-      end
-    end
-
     def self.path
       "/#{ActiveSupport::Inflector.underscore klass_name}"
     end

data/lib/camille/type.rb

@@ -2,7 +2,6 @@ module Camille
   # This class represents all custom types defined by the user.
   class Type < BasicType
     class NotImplementedError < ::NotImplementedError; end
-    include Camille::Types
 
     attr_reader :underlying
 
@@ -30,14 +29,6 @@ module Camille
       self.class.klass_name.gsub(/::/, '_')
     end
 
-    def self.const_missing name
-      if Camille::Loader.eager_loading?
-        Camille::Types.const_get(name)
-      else
-        super
-      end
-    end
-
     def self.inherited klass
       Camille::Loader.loaded_types << klass
     end

data/lib/camille/version.rb

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

data/lib/camille.rb

@@ -28,6 +28,12 @@ require_relative "camille/controller_extension"
 require_relative "camille/loader"
 require_relative "camille/configuration"
 require_relative "camille/code_generator"
+require_relative "camille/main_controller"
+
+require "rails/generators"
+require_relative "camille/generators/install_generator"
+require_relative "camille/generators/type_generator"
+require_relative "camille/generators/schema_generator"
 
 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.3.0
 platform: ruby
 authors:
 - 辻彩
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-16 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
@@ -65,8 +51,17 @@ files:
 - lib/camille/controller_extension.rb
 - lib/camille/core_ext.rb
 - lib/camille/endpoint.rb
+- lib/camille/generators/install_generator.rb
+- lib/camille/generators/schema_generator.rb
+- lib/camille/generators/templates/configuration.rb
+- lib/camille/generators/templates/schema_example.rb
+- lib/camille/generators/templates/schema_template.erb
+- lib/camille/generators/templates/type_example.rb
+- lib/camille/generators/templates/type_template.erb
+- lib/camille/generators/type_generator.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