homura-runtime 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7426d1447a4eca3f4ae0b8826e8dfaee809c9868d99314e381ae5b0e338defc3
-  data.tar.gz: d42df70713ac5bf410d91ccd77ade2c3500464a2280c769ee5475449ce427231
+  metadata.gz: 30dae4fa7db65c3e931dedfd413a8a64c76477522ce0f1c51dc7cdd7b878d856
+  data.tar.gz: e3d93d0bbe8416b247df3da2cac86e3bbe2c09337bea37c4f6c03aea2df045f0
 SHA512:
-  metadata.gz: f92aca6718eeb4440a60a45611378e0fa4669116fbe56f56f4663705f6440e9010e92d9d30f09c5faac5b2d7de47798a2c26dba69f9995012ce655b861831c9e
-  data.tar.gz: 9686bae18cd4c9f858f8056c807d47e068130710b44d73b796b21119b102a176f9c5154f9f5e40b95f0e4b5c6a846e6b37a16a00677c208820cef5263c7b4e27
+  metadata.gz: e112c045281a25b0adce47868e8cda5c6a890d80cdcfe38f20babc3cf00c4172fb2e8197990287c431b1e29d5d820521a94afa100b73c3f42e5763f32e2367be
+  data.tar.gz: de25414d62f1463c10cb7e2c214f6ca86f825be14a16705122d187f17f6efc9e6e3e241264162db50d677052ec4309affb2d81c6d6f8f0110a1b623d63e2dee3

data/exe/compile-erb

@@ -136,10 +136,13 @@ module HomuraERB
   end
 
   # Wrap the compiled body in a `#{namespace}.register` call.
+  # `template_name` may be a Symbol whose name contains a `/`
+  # (e.g. `:"posts/index"`); use `inspect` so the literal serialises
+  # as `:"posts/index"` and is parseable by Opal.
   def wrap(template_name, compiled_body, namespace)
     indented = compiled_body.each_line.map { |l| "    #{l}" }.join
     <<~RUBY
-      #{namespace}.register(:#{template_name}) do |locals = {}|
+      #{namespace}.register(#{template_name.inspect}) do |locals = {}|
       #{indented.chomp}
       end
     RUBY
@@ -151,11 +154,19 @@ end
 # ---------------------------------------------------------------------------
 
 def default_inputs_for(dir)
-  Dir.glob(File.join(dir, '*.erb')).sort
+  # Recursive so `views/posts/index.erb` becomes `:'posts/index'`,
+  # matching upstream Sinatra's subdirectory convention.
+  Dir.glob(File.join(dir, '**', '*.erb')).sort
 end
 
-def template_name_for(path)
-  File.basename(path, '.erb').to_sym
+def template_name_for(path, root)
+  rel = path.dup
+  if root
+    root_with_sep = root.end_with?('/') ? root : "#{root}/"
+    rel = rel[root_with_sep.length..] if rel.start_with?(root_with_sep)
+  end
+  rel = File.basename(rel) unless rel.include?('/')
+  rel.delete_suffix('.erb').to_sym
 end
 
 def emit_header(io, namespace)
@@ -209,13 +220,13 @@ def emit_header(io, namespace)
   RUBY
 end
 
-def emit_templates(io, inputs, namespace)
+def emit_templates(io, inputs, namespace, root)
   inputs.each do |path|
-    name = template_name_for(path)
+    name = template_name_for(path, root)
     source = File.read(path)
     compiled = HomuraERB.compile(source)
     io.puts
-    io.puts "# ---- #{path} -> :#{name} --------------------------------------"
+    io.puts "# ---- #{path} -> :#{name.inspect} --------------------------------------"
     io.puts HomuraERB.wrap(name, compiled, namespace)
   end
 end
@@ -256,9 +267,14 @@ def emit_sinatra_patch(io, namespace)
         # have one. Unknown symbols raise a clear message instead of
         # wandering into upstream Tilt, which would blow up on
         # Workers with "Code generation from strings disallowed".
+        #
+        # Sinatra's idiom `erb :foo, locals: { x: 1 }` passes locals via
+        # `options[:locals]` rather than the third positional argument;
+        # merge them so both forms work.
         def erb(template, options = {}, locals = {}, &block)
+          template = template.to_sym if template.is_a?(::String)
           if template.is_a?(::Symbol) && ::#{namespace}.registered?(template)
-            locals ||= {}
+            locals = (options[:locals] || {}).merge(locals || {})
             block ||= __homura_default_template_block_for__(template)
             output = ::#{namespace}.render(template, self, locals, &block)
 
@@ -315,11 +331,13 @@ namespace = options[:namespace]
 
 inputs =
   if positional.any?
-    positional.flat_map { |a| File.directory?(a) ? Dir.glob(File.join(a, '*.erb')).sort : [a] }
+    positional.flat_map { |a| File.directory?(a) ? Dir.glob(File.join(a, '**', '*.erb')).sort : [a] }
   else
     default_inputs_for(options[:input_dir])
   end
 
+template_root = positional.find { |a| File.directory?(a) } || options[:input_dir]
+
 if inputs.empty?
   warn "bin/compile-erb: no .erb files found (under #{options[:input_dir]}/ or from args)"
   exit 1
@@ -332,12 +350,12 @@ if write_file
   FileUtils.mkdir_p(File.dirname(out_path))
   File.open(out_path, 'w') do |io|
     emit_header(io, namespace)
-    emit_templates(io, inputs, namespace)
+    emit_templates(io, inputs, namespace, template_root)
     emit_sinatra_patch(io, namespace)
   end
   warn "compile-erb: wrote #{out_path} (#{inputs.size} templates)"
 else
   emit_header($stdout, namespace)
-  emit_templates($stdout, inputs, namespace)
+  emit_templates($stdout, inputs, namespace, template_root)
   emit_sinatra_patch($stdout, namespace)
 end

data/lib/cloudflare_workers/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CloudflareWorkers
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

data/lib/cloudflare_workers.rb

@@ -666,12 +666,34 @@ module Cloudflare
     # a metadata Hash with `changes`, `last_row_id`, `duration`, etc.
     # Returns a JS Promise resolving to that metadata Hash.
     #
+    # The raw D1 `run()` payload nests these fields under `meta`:
+    #   { 'success' => true, 'meta' => { 'last_row_id' => 7, ... }, 'results' => [...] }
+    # sqlite3-ruby exposes them at the top level. To keep the documented
+    # "sqlite3-ruby compatible" surface and still leave the raw shape
+    # available, flatten the common keys to the top level.
+    #
     #   meta = db.execute_insert("INSERT INTO users (name) VALUES (?)", ["alice"])
-    #   meta['last_row_id']  # → 7
+    #   meta['last_row_id']          # → 7  (flattened convenience)
+    #   meta['meta']['last_row_id']  # → 7  (raw D1 shape)
     def execute_insert(sql, bind_params = [])
       stmt = prepare(sql)
       stmt = stmt.bind(*bind_params) unless bind_params.empty?
-      stmt.run
+      raw = stmt.run
+      D1Database.flatten_meta(raw)
+    end
+
+    # Flatten common keys from `result['meta']` to the top of the hash so
+    # callers can write `meta['last_row_id']` without descending into the
+    # nested D1 metadata object. Preserves the original shape unchanged.
+    def self.flatten_meta(result)
+      return result unless result.is_a?(Hash)
+      nested = result['meta']
+      return result unless nested.is_a?(Hash)
+
+      %w[last_row_id changes duration size_after rows_read rows_written].each do |k|
+        result[k] = nested[k] unless result.key?(k)
+      end
+      result
     end
 
     # Execute one or more raw SQL statements separated by semicolons.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homura-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Kazuhiro Homma
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3.rc1.3
+        version: 1.8.3.rc1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.3.rc1.3
+        version: 1.8.3.rc1.4
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement