kirei 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3eb5dc8a6ee187383e7b287491e9454a5c4aebdc77be57bd072b95d293c227
-  data.tar.gz: 63320aa40f86c0be7efbfe3c64f5d4dbb0a56124abc304f7f9b1eac356390504
+  metadata.gz: 150c91695e10d4bc3fefecf38dfaa5511512aea79c265fdbdb39b3fe2ec9ebba
+  data.tar.gz: 38d983a823588c9c12a4db38cc7f2885e02a7bd7e602eba0f0f04c0581d399b2
 SHA512:
-  metadata.gz: 8c637488aed457873e0f4f929446356fc2cce3a381f3c19dfb13ca0bed53bb3b3a77b0e749637fd47b23aad50690b77973f41b39c8ccbeda9457361a9a407f9d
-  data.tar.gz: 5eed46d30bf6558b76cd8735928db3e8be1563a67d7a0bc36139b0a650dc40f6b39d03a5f85b35ff54bf5aecddc2b4a1926a810e2d6be119217d09f4e1189f58
+  metadata.gz: 072cf7863e6f97b5886ffd4cf0e28d65fda67f23a3beebf967bc2bff7e2776923ac6c07ef42708d69440c91cf4978fff63941e8a5ea6d9c377be9e036613e6ab
+  data.tar.gz: d776d2a47e7d44d0b78b1c7142ae708a04c843472912e46fa0ba93be08b5877349aaa3e243d34092f7560463fecb06ed4b45a994e0661780c95dacd98422a5f2

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

@@ -168,12 +168,13 @@ module Cli
 
                   models_dir = #{app_name}.root
 
-                  Dir.glob("app/models/*.rb").each do |model_file|
+                  Dir.glob("app/models/**/*.rb").each do |model_file|
                     next if !model_file_name.nil? && model_file == model_file_name
 
                     model_path = File.expand_path(model_file, models_dir)
-                    model_name = Zeitwerk::Inflector.new.camelize(File.basename(model_file, ".rb"), model_path)
-                    model_klass = Object.const_get(model_name)
+                    modules = model_file.gsub("app/models/", "").gsub(".rb", "").split("/").map { |mod| Zeitwerk::Inflector.new.camelize(mod, model_path) }
+                    const_name = modules.join("::")
+                    model_klass = Object.const_get(const_name)
                     table_name = model_klass.table_name
                     schema = db.schema(table_name)
 
@@ -184,8 +185,10 @@ module Cli
                     # Remove existing schema info comments if present
                     updated_contents = file_contents.sub(/# == Schema Info\\n(.*?)(\\n#\\n)?\\n(?=\\s*class)/m, "")
 
-                    # Insert the new schema comments before the class definition
-                    modified_contents = updated_contents.sub(/(\A|\\n)(class \#{model_name})/m, "\\\\1\#{schema_comments}\\n\\n\\\\2")
+                    # Insert the new schema comments before the module/class definition
+                    first_const = modules.first
+                    first_module_or_class = modules.count == 1 ? "class #{first_const}" : "module #{first_const}"
+                    modified_contents = updated_contents.sub(/(A|\n)(#{first_module_or_class})/m, "\\1#{schema_comments}\n\n\\2")
 
                     File.write(model_path, modified_contents)
                   end

data/lib/kirei/config.rb

@@ -37,5 +37,7 @@ module Kirei
     #
     # Source: https://sorbet.org/docs/tstruct#from_hash-gotchas
     prop :db_strict_type_resolving, T.nilable(T::Boolean), default: nil
+
+    prop :allowed_origins, T::Array[String], default: []
   end
 end

data/lib/kirei/model/base_class_interface.rb

@@ -40,6 +40,9 @@ module Kirei
       sig { abstract.returns(T.untyped) }
       def db; end
 
+      sig { abstract.params(sql: T.untyped, params: T.untyped).returns(T.untyped) }
+      def exec_sql(sql, params); end
+
       sig { abstract.returns(T.untyped) }
       def human_id_length; end
 

data/lib/kirei/model/class_methods.rb

@@ -34,6 +34,12 @@ module Kirei
         App.raw_db_connection
       end
 
+      sig { override.params(sql: String, params: T::Array[T.untyped]).returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+      def exec_sql(sql, params)
+        # Splats aren't supported in Sorbet, see: https://sorbet.org/docs/error-reference#7019
+        T.unsafe(db).fetch(sql, *params).all
+      end
+
       sig do
         override.params(
           hash: T::Hash[Symbol, T.untyped],
@@ -107,7 +113,6 @@ module Kirei
         col_info.fetch(:db_type).match?(/vector\(\d+\)/)
       end
 
-      # New method to cast an array to a vector
       sig { params(value: T.any(T::Array[Numeric], Sequel::SQL::Expression)).returns(Sequel::SQL::Expression) }
       def cast_to_vector(value)
         return value if value.is_a?(Sequel::SQL::Expression) || value.is_a?(Sequel::SQL::PlaceholderLiteralString)

data/lib/kirei/routing/base.rb

@@ -98,6 +98,8 @@ module Kirei
           headers[header_name] ||= default_value
         end
 
+        add_cors_headers(headers, env)
+
         [
           status,
           headers,
@@ -143,7 +145,6 @@ module Kirei
 
       sig { returns(T::Hash[String, String]) }
       def default_headers
-        # "Access-Control-Allow-Origin": the user should set that, see comment about "cors" above
         {
           # security relevant headers
           "X-Frame-Options" => "DENY",
@@ -159,6 +160,18 @@ module Kirei
         }
       end
 
+      sig { params(headers: T::Hash[String, String], env: RackEnvType).void }
+      def add_cors_headers(headers, env)
+        origin = T.cast(env.fetch("HTTP_ORIGIN"), String)
+        allowed_origins = Kirei::App.config.allowed_origins
+        return unless allowed_origins.include?(origin)
+
+        headers["Access-Control-Allow-Origin"] = origin
+        headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, PATCH, DELETE, OPTIONS"
+        headers["Access-Control-Allow-Headers"] = "Content-Type, Authorization, Referer"
+        headers["Access-Control-Allow-Credentials"] = "true"
+      end
+
       sig { params(hooks: NilableHooksType).void }
       private def run_hooks(hooks)
         return if hooks.nil? || hooks.empty?

data/lib/kirei/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kirei
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ludwig Reinmiedl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-20 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj