kirei 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f72e562a33b62988fd08b474ad821c50c35e7439a2fe6eb0e5909b7310099ddc
-  data.tar.gz: c1550bab74543280e4314b1847c8cc2ac80c575e2175efdb2c57bddeb0cd7f95
+  metadata.gz: 0e16807cffd59ce38ba7cb3e8a0474e26fff5c4d6598ee63ac745382d0c4d30f
+  data.tar.gz: 180c00ecc9ad0668cffcf3f1448779acbe2e5fb35c8f7632159358d8637734c3
 SHA512:
-  metadata.gz: ff42246d1757114996bf8094d80b47ebe2945e1df8551837389cad6c8dc7b96138ac398131d3b6ad07c7c0360b7758a77a06c3557716f22a07e6e4f99085a8bb
-  data.tar.gz: c7ff2ebedf28620e1ec16774b3ff07eb4007fdc76c59c925aa9f3161c452075123e8e4ae17e2786c1a3016f81df0e0c93528813fb879a950a9cec41952351619
+  metadata.gz: 780e826760bd7ff48e1decf31446c7f9d5b3fc9504c5b3674af04b746cda67f1bba61fe27658fdec5993e1c2c0bba3030a45557f32d8cc0465342a85da1fd6db
+  data.tar.gz: 7e32df47ece711cc97471801bad3085e2f1008abca7f0be1af8acf402c8569199018284bbeb6ece672a6745cd06957f30e29802218372ef1816c64e431813b36

data/README.md

@@ -21,7 +21,7 @@ TL;DR:
 
 This gem follows SemVer, however only after a stable release 1.0.0 is made.
 
-A changelog is maintained in the [CHANGELOG.md](CHANGELOG.md) file and/or the GitHub Releases page.
+A changelog is maintained via the [GitHub Releases page](https://github.com/swiknaba/kirei/releases).
 
 ## Installation
 

data/kirei.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
     "sorbet/rbi/shims/**/*.rbi",
     "LICENSE",
     "README.md",
-    "CHANGELOG.md",
   ]
 
   spec.bindir = "bin"

data/lib/cli/commands/new_app/files/app.rb

@@ -29,8 +29,8 @@ module Cli
               Dir[File.join(__dir__, "config/initializers", "*.rb")].each { require(_1) }
 
               # Fourth: load all application code
-              loader = Zeitwerk::Loader.new
-              loader.tag = File.basename(__FILE__, ".rb")
+              APP_LOADER = Zeitwerk::Loader.new
+              APP_LOADER.tag = File.basename(__FILE__, ".rb")
               [
                 "/app",
                 "/app/models",
@@ -38,9 +38,9 @@ module Cli
               ].each do |root_namespace|
                 # a root namespace skips the auto-infered module for this folder
                 # so we don't have to write e.g. `Models::` or `Services::`
-                loader.push_dir("\#{File.dirname(__FILE__)}\#{root_namespace}")
+                APP_LOADER.push_dir("\#{File.dirname(__FILE__)}\#{root_namespace}")
               end
-              loader.setup
+              APP_LOADER.setup
 
               # Fifth: load configs
               Dir[File.join(__dir__, "config", "**", "*.rb")].each do |cnf|
@@ -52,7 +52,7 @@ module Cli
                 config.app_name = "#{snake_case_app_name}"
               end
 
-              loader.eager_load
+              APP_LOADER.eager_load
             RUBY
           end
         end

data/lib/cli/commands/new_app/files/db_rake.rb

@@ -173,24 +173,23 @@ module Cli
                     next if !model_file_name.nil? && model_file == model_file_name
 
                     model_path = File.expand_path(model_file, app_root_dir)
-                    loader = Zeitwerk::Registry.loaders.find { |l| l.tag == "app" }
 
                     full_path = File.expand_path(model_file, app_root_dir)
-                    klass_constant_name = loader.inflector.camelize(File.basename(model_file, ".rb"), full_path)
+                    klass_constant_name = APP_LOADER.inflector.camelize(File.basename(model_file, ".rb"), full_path)
 
                     #
                     # root namespaces in Zeitwerk are flattend, e.g. if "app/models" is a root namespace
                     # then a file "app/models/airport.rb" is loaded as "::Airport".
                     # if it weren't a root namespace, it would be "::Models::Airport".
                     #
-                    root_dir_namespaces = loader.dirs.filter_map { |dir| dir == app_dir ? nil : Pathname.new(dir).relative_path_from(Pathname.new(app_dir)).to_s }
+                    root_dir_namespaces = APP_LOADER.dirs.filter_map { |dir| dir == app_dir ? nil : Pathname.new(dir).relative_path_from(Pathname.new(app_dir)).to_s }
                     relative_path = Pathname.new(full_path).relative_path_from(Pathname.new(app_dir)).to_s
                     root_dir_of_model = root_dir_namespaces.find { |root_dir| relative_path.start_with?(root_dir) }
                     relative_path.sub!("\#{root_dir_of_model}/", "") unless root_dir_of_model.nil? || root_dir_of_model.empty?
 
                     namespace_parts = relative_path.split("/")
                     namespace_parts.pop
-                    namespace_parts.map! { |part| loader.inflector.camelize(part, full_path) }
+                    namespace_parts.map! { |part| APP_LOADER.inflector.camelize(part, full_path) }
 
                     constant_name = "\#{namespace_parts.join('::')}::\#{klass_constant_name}"
 
@@ -231,6 +230,7 @@ module Cli
                   name, info = column
                   type = "\#{info[:db_type]}(\#{info[:max_length]})" if info[:max_length]
                   type ||= info[:db_type]
+                  type = "\#{type}, " if type.size >= 20 \# e.g. "timestamp without time zone" exceeds 20 characters
                   null = info[:allow_null] ? 'null' : 'not null'
                   primary_key = info[:primary_key] ? ', primary key' : ''
                   lines << "#  \#{name.to_s.ljust(20)}:\#{type.to_s.ljust(20)}\#{null}\#{primary_key}"

data/lib/kirei/controller.rb

@@ -41,32 +41,9 @@ module Kirei
       @after_hooks.add(block) if block
     end
 
-    sig { returns(String) }
-    def req_host
-      env.fetch("HTTP_HOST")
-    end
-
-    sig { returns(String) }
-    def req_domain
-      T.must(req_host.split(":").first).split(".").last(2).join(".")
-    end
-
-    sig { returns(T.nilable(String)) }
-    def req_subdomain
-      parts = T.must(req_host.split(":").first).split(".")
-      return if parts.size <= 2
-
-      T.must(parts[0..-3]).join(".")
-    end
-
-    sig { returns(Integer) }
-    def req_port
-      env.fetch("SERVER_PORT")&.to_i
-    end
-
-    sig { returns(T::Boolean) }
-    def req_ssl?
-      env.fetch("HTTPS", env.fetch("rack.url_scheme", "http")) == "https"
+    sig { returns(Routing::Request) }
+    def request
+      @request ||= T.let(Routing::Request.new(env: env), T.nilable(Routing::Request))
     end
 
     sig { returns(T::Hash[String, T.untyped]) }

data/lib/kirei/routing/request.rb

@@ -0,0 +1,40 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Kirei
+  module Routing
+    class Request < T::Struct
+      extend T::Sig
+
+      const :env, T::Hash[String, T.untyped]
+
+      sig { returns(String) }
+      def host
+        env.fetch("HTTP_HOST")
+      end
+
+      sig { returns(String) }
+      def domain
+        T.must(host.split(":").first).split(".").last(2).join(".")
+      end
+
+      sig { returns(T.nilable(String)) }
+      def subdomain
+        parts = T.must(host.split(":").first).split(".")
+        return if parts.size <= 2
+
+        T.must(parts[0..-3]).join(".")
+      end
+
+      sig { returns(Integer) }
+      def port
+        env.fetch("SERVER_PORT")&.to_i
+      end
+
+      sig { returns(T::Boolean) }
+      def ssl?
+        env.fetch("HTTPS", env.fetch("rack.url_scheme", "http")) == "https"
+      end
+    end
+  end
+end

data/lib/kirei/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Kirei
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kirei
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Ludwig Reinmiedl
@@ -163,7 +163,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".irbrc"
-- CHANGELOG.md
 - README.md
 - bin/kirei
 - kirei.gemspec
@@ -198,6 +197,7 @@ files:
 - lib/kirei/routing/nilable_hooks_type.rb
 - lib/kirei/routing/rack_env_type.rb
 - lib/kirei/routing/rack_response_type.rb
+- lib/kirei/routing/request.rb
 - lib/kirei/routing/route.rb
 - lib/kirei/routing/router.rb
 - lib/kirei/routing/verb.rb

data/CHANGELOG.md

@@ -1,16 +0,0 @@
-# Changelog
-
-## [Unreleased]
-
-## [0.1.0] - 2023-09-02
-
-- Initial release
-- added base model
-- added database connection
-- WIP: basic cli to scaffold a new project
-
-## [0.2.0] - 2023-09-02
-
-- added routing
-- added base controller
-- added database tasks (create, drop, migrate, rollback, generate migration)