sinatra-homura 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ddb68385ebe9bdec3a44b9f684df8481aa19f6e0a97e022efd1adb2e1779b2c
-  data.tar.gz: 357f4cb131d84ef3bb59acfd855ff51183f9efbcc8b7836789c8d56b278aa8eb
+  metadata.gz: 0772bd5644111e46f314060d774ac9b745e3aa7b729ee4616a4e90081014fe1b
+  data.tar.gz: 69aef71d42ca1cb508489b54ccb733325eb6f22cdd5bfce85c447922b525eefd
 SHA512:
-  metadata.gz: 754c80ce1d21f3f9ba413d5ae755e7bc03ef533d768c0915212ed3f7de2eadd271d41a108d29f4038505a091765641582b83fec9c9e2c1d1469a8a498c5c0986
-  data.tar.gz: f674d56f6254d06680cfe2b14679204220d8056f13c83878ea7c6b278831ea50ed4e7bfbf1e28d6ce31e9545172b4928a670e99a9ff3855b89932cdf3a3522e7
+  metadata.gz: 98e9aac3947b40385d6c8ff2ccfd3a0dfc9f42b70b1b1a9d078fed41ed3e3a3e6f7e2e13c9241e0abd81f77d8fcf188a139e513188c3939114d6046377f176d5
+  data.tar.gz: 6134f4fb4d2b7483c3cb840693a3ab3471d843bbb96223a2c4ce7e3cefcd2c577d611c32c86870dd82ff646a36d12202fecbc5588ad5a68fb6264bebfadffbb3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.3.2 (2026-05-03)
+
+- Register `Cloudflare::BindingHelpers` on `Sinatra::Base`, making D1,
+  KV, R2, Workers AI, Email, Queues, Cache, and Durable Object bindings
+  available through Ruby-shaped helpers in normal routes.
+- Route scheduled jobs through the same binding env builder as HTTP,
+  then expose the same helpers on `ScheduledContext`.
+- Require `homura-runtime >= 0.3.5` so the helper surface and shared
+  binding builder are present.
+
 ## 0.3.1 (2026-04-30)
 
 - README: drop the leftover `require 'sinatra/cloudflare_workers'` snippet

data/lib/sinatra/homura.rb

@@ -83,6 +83,8 @@ module Sinatra
   end
 end
 
+Sinatra::Base.helpers Cloudflare::BindingHelpers if defined?(Sinatra::Base) && defined?(Cloudflare::BindingHelpers)
+
 # Kept for backward compatibility with code that still wires up at_exit
 # explicitly; harmless on Workers because the isolate doesn't exit.
 at_exit { Sinatra::Homura.ensure_rack_app! }

data/lib/sinatra/scheduled.rb

@@ -14,11 +14,10 @@
 #       register Sinatra::Scheduled
 #
 #       schedule '*/5 * * * *', name: 'heartbeat' do |event|
-#         db = env['cloudflare.DB']
 #         db.execute_insert(
 #           'INSERT INTO heartbeats (cron, scheduled_at) VALUES (?, ?)',
 #           [event.cron, event.scheduled_time.to_i]
-#         ).__await__
+#         )
 #       end
 #
 #       schedule '0 */1 * * *' do |event|
@@ -216,9 +215,8 @@ module Sinatra
 
       private
 
-      # Build a tiny Rack-shaped env so the block has the same
-      # `env['cloudflare.DB']` / `KV` / `BUCKET` accessors that HTTP
-      # routes use. We deliberately do NOT spin up a full Sinatra
+      # Build a tiny Rack-shaped env so the block has the same binding
+      # helpers that HTTP routes use. We deliberately do NOT spin up a full Sinatra
       # request — there is no HTTP request, no params, no response.
       def invoke_scheduled_job(job, event, js_env, js_ctx)
         env = build_scheduled_env(event, js_env, js_ctx)
@@ -264,23 +262,12 @@ module Sinatra
       end
 
       def build_scheduled_env(event, js_env, js_ctx)
-        env = {
+        Cloudflare::Bindings.build_env(js_env, js_ctx, {
           'cloudflare.scheduled'      => true,
           'cloudflare.event'          => event,
           'cloudflare.cron'           => event.cron,
-          'cloudflare.scheduled_time' => event.scheduled_time,
-          'cloudflare.env'            => js_env,
-          'cloudflare.ctx'            => js_ctx
-        }
-        if js_env
-          js_db = `#{js_env} && #{js_env}.DB`
-          js_kv = `#{js_env} && #{js_env}.KV`
-          js_r2 = `#{js_env} && #{js_env}.BUCKET`
-          env['cloudflare.DB']     = ::Cloudflare::D1Database.new(js_db)  if `#{js_db} != null`
-          env['cloudflare.KV']     = ::Cloudflare::KVNamespace.new(js_kv) if `#{js_kv} != null`
-          env['cloudflare.BUCKET'] = ::Cloudflare::R2Bucket.new(js_r2)    if `#{js_r2} != null`
-        end
-        env
+          'cloudflare.scheduled_time' => event.scheduled_time
+        })
       end
     end
 
@@ -298,9 +285,18 @@ module Sinatra
         @js_ctx = js_ctx
       end
 
-      def db;     env['cloudflare.DB'];     end
+      def d1;     env['cloudflare.DB'];     end
+      def db;     d1;                    end
+      def cf_env; env['cloudflare.env']; end
+      def cf_ctx; env['cloudflare.ctx']; end
       def kv;     env['cloudflare.KV'];     end
       def bucket; env['cloudflare.BUCKET']; end
+      def ai; Cloudflare::Bindings.ai(env); end
+      def send_email; env['cloudflare.SEND_EMAIL']; end
+      def jobs_queue; env['cloudflare.QUEUE_JOBS']; end
+      def durable_object(name, id_or_name = nil)
+        Cloudflare::Bindings.durable_object(env, name, id_or_name)
+      end
 
       # Forward a long-running promise to the Workers runtime so the
       # job can return immediately while the work continues.

data/templates/Rakefile.example

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # Example Rake tasks for a Sinatra-on-Cloudflare-Workers project using
-# sinatra-cloudflare-workers + cloudflare-workers-runtime.
+# sinatra-homura + homura-runtime.
 #
 # Copy to your app root as `Rakefile` and adjust paths.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-homura
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kazuhiro Homma
@@ -13,16 +13,22 @@ dependencies:
   name: homura-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: opal-homura
   requirement: !ruby/object:Gem::Requirement