edgeway 0.1.0 → 0.3.0

data/lib/edgeway/service/import_result.rb

@@ -0,0 +1,24 @@
+module Edgeway
+  module ImportResult
+    ffi_source <<~C
+      #include <stdlib.h>
+
+      typedef struct {
+        char *text;
+        int capacity;
+      } ImportResultBuffer;
+
+      static const char *take_import_result(ImportResultBuffer *buffer, int length, void (*take)(char *)) {
+        if (length + 1 > buffer->capacity) {
+          char *grown = realloc(buffer->text, length + 1);
+          if (!grown) abort();
+          buffer->text = grown;
+          buffer->capacity = length + 1;
+        }
+        take(buffer->text);
+        buffer->text[length] = 0;
+        return buffer->text;
+      }
+    C
+  end
+end

data/lib/edgeway/test/sqlite_databases.rb

@@ -0,0 +1,18 @@
+module Edgeway
+  module TestDatabases
+    # Called before each test.
+    def self.reset
+    end
+
+    def self.open(name)
+      migrations = name == Edgeway::Model::PRIMARY ? "db/migrations" : "db/#{name}/migrations"
+      directory = File.join(Edgeway::TEST_APP_ROOT, migrations)
+      if name != Edgeway::Model::PRIMARY && !File.directory?(directory)
+        raise Edgeway::ConfigurationError, "database #{name} (config/database.yml) has no #{migrations} directory"
+      end
+      database = Edgeway::DB::SQLiteAdapter.new(":memory:")
+      database.apply_migrations(directory)
+      database
+    end
+  end
+end

data/lib/edgeway/test.rb

@@ -3,14 +3,15 @@
 # and tmp/test_app.rb, which `edgeway test` rewrites on every run (and which
 # is git-ignored): Spinel resolves require
 # at compile time, so the app's files are listed there (in Build's order)
-# rather than found at run time. Unlike build/main.rb it never calls
+# rather than found at run time, and so is the database the tests use
+# (Edgeway::TestDatabases). Unlike build/main.rb it never calls
 # Edgeway::Server.run. Run the tests with `edgeway test`, not spinel_test-unit
 # directly: a missing or stale tmp/test_app.rb only shows up as Spinel's own
 # "cannot find tmp/test_app" (the message cannot be customised at compile time).
 require "spinel_test/unit"
 require "edgeway"
-require "edgeway/db/memory"
-require "edgeway/db/sqlite"
+require "edgeway/http/stub_transport"
+require "edgeway/rate_limit/stub_limiter"
 require "tmp/test_app"
 
 module Edgeway
@@ -25,22 +26,61 @@ module Edgeway
     end
   end
 
-  # What a model test needs: a fresh in-memory SQLite database per test
-  # (SQLiteAdapter), with the app's db/migrations applied in file name order,
-  # so a test can check what was stored (Todo.find, db.select_all) and read
-  # db.log for the SQL. Edgeway's own tests use MemoryAdapter instead, which
-  # stores nothing.
+  # What a model test needs: a fresh database per test (Edgeway::TestDatabases,
+  # chosen by `edgeway test` from config/database.yml), with the app's
+  # db/migrations applied in file name order, so a test can check what was
+  # stored (Todo.find, db.select_all) and read db.log for the SQL. A database
+  # under databases: in config/database.yml gets its own, with
+  # db/NAME/migrations, read with db(:name). Edgeway's own tests use
+  # MemoryAdapter instead, which stores nothing. Edgeway.cache is a NullStore in
+  # every test, whatever config/cache.yml says; a test that checks caching sets
+  # `Edgeway.cache = Edgeway::Cache::MemoryStore.new` itself. The rate limiter
+  # allows every request and records the checks (stub_rate_limit,
+  # rate_limit_checks).
   class UnitTest < SpinelTest::Unit::TestCase
-    attr_reader :db
-
     def setup
-      @db = Edgeway::DB::SQLiteAdapter.new(":memory:")
-      @db.apply_migrations(File.join(Edgeway::TEST_APP_ROOT, "db/migrations"))
-      Edgeway::Model.connection = @db
+      @databases = {}
+      @http = Edgeway::HTTP::StubTransport.new
+      Edgeway::HTTP.client = @http
+      Edgeway.cache = Edgeway::Cache::NullStore.new
+      @rate_limiter = Edgeway::RateLimit::StubLimiter.new
+      Edgeway::Controller.rate_limiter = @rate_limiter
+      Edgeway::TestDatabases.reset
+      open_database(Edgeway::Model::PRIMARY)
+      Edgeway::TEST_DATABASES.each { |name| open_database(name) }
     end
 
     def teardown
-      @db.close
+      @databases.each do |name, database|
+        database.close
+        Edgeway::Model.disconnect(name)
+      end
+    end
+
+    def db(name = Edgeway::Model::PRIMARY) = @databases.fetch(name.to_s)
+
+    def stub_http(verb, url, status: 200, body: "", headers: {})
+      @http.stub(verb, url, status, body, headers)
+    end
+
+    def stub_http_error(verb, url, message = "connection failed", timeout: false)
+      @http.stub_error(verb, url, message, timeout)
+    end
+
+    def http_requests = @http.requests
+
+    def stub_rate_limit(binding_name, exceeded: true)
+      @rate_limiter.stub(binding_name, exceeded)
+    end
+
+    def rate_limit_checks = @rate_limiter.checks
+
+    private
+
+    def open_database(name)
+      database = Edgeway::TestDatabases.open(name)
+      Edgeway::Model.connect(name, database)
+      @databases[name] = database
     end
   end
 
@@ -55,11 +95,11 @@ module Edgeway
       @json = nil
     end
 
-    def get(path, json: nil, headers: {}) = request("GET", path, json, headers)
-    def delete(path, json: nil, headers: {}) = request("DELETE", path, json, headers)
-    def post(path, json: nil, headers: {}) = request("POST", path, json, headers)
-    def put(path, json: nil, headers: {}) = request("PUT", path, json, headers)
-    def patch(path, json: nil, headers: {}) = request("PATCH", path, json, headers)
+    def get(path, json: nil, headers: {}, remote_addr: "") = request("GET", path, json, headers, remote_addr)
+    def delete(path, json: nil, headers: {}, remote_addr: "") = request("DELETE", path, json, headers, remote_addr)
+    def post(path, json: nil, headers: {}, remote_addr: "") = request("POST", path, json, headers, remote_addr)
+    def put(path, json: nil, headers: {}, remote_addr: "") = request("PUT", path, json, headers, remote_addr)
+    def patch(path, json: nil, headers: {}, remote_addr: "") = request("PATCH", path, json, headers, remote_addr)
 
     # The body parsed as JSON.
     def json
@@ -73,7 +113,7 @@ module Edgeway
 
     private
 
-    def request(verb, target, json, headers)
+    def request(verb, target, json, headers, remote_addr)
       path = target
       query = ""
       q = target.index("?")
@@ -83,15 +123,35 @@ module Edgeway
       end
       body = json.nil? ? "" : JSON.generate(json)
       content_type = json.nil? ? "" : "application/json"
-      headers.each { |k, v| ENV["HTTP_" + k.upcase.gsub("-", "_")] = v }
-      begin
-        res = Edgeway.application.call(Edgeway::HTTP::Request.new(verb, path, query, content_type, body))
-      ensure
-        headers.each { |k, _v| ENV.delete("HTTP_" + k.upcase.gsub("-", "_")) }
-      end
+      res = call_application(Edgeway::HTTP::Request.new(verb, path, query, content_type, body), headers, remote_addr)
       @json = nil
       @response = Edgeway::TestResponse.new(res.status, res.body, res.headers)
       @response
     end
+
+    def call_application(http_request, headers, remote_addr)
+      variables = { "REMOTE_ADDR" => remote_addr }
+      headers.each { |name, value| variables["HTTP_" + name.upcase.gsub("-", "_")] = value }
+      with_environment(variables) { Edgeway.application.call(http_request) }
+    end
+
+    def with_environment(variables)
+      previous = {}
+      variables.each_key { |name| previous[name] = ENV[name].to_s unless ENV[name].nil? }
+      begin
+        variables.each { |name, value| ENV[name] = value }
+        yield
+      ensure
+        variables.each_key { |name| restore_variable(name, previous) }
+      end
+    end
+
+    def restore_variable(name, previous)
+      if previous.key?(name)
+        ENV[name] = previous[name]
+      else
+        ENV.delete(name)
+      end
+    end
   end
 end

data/lib/edgeway/version.rb

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

data/lib/edgeway/view.rb

@@ -0,0 +1,24 @@
+module Edgeway
+  module View
+    ESCAPES = { "&" => "&amp;", "<" => "&lt;", ">" => "&gt;", '"' => "&quot;", "'" => "&#39;" }
+
+    class SafeHTML
+      def initialize(text)
+        @text = text.to_s.dup
+      end
+
+      def to_s = @text
+    end
+
+    def self.escape(obj)
+      return "" if obj.nil?
+      return obj.to_s if obj.is_a?(SafeHTML)
+      s = obj.to_s
+      s.gsub(/[&<>"']/, ESCAPES)
+    end
+  end
+end
+
+class String
+  def html_safe = Edgeway::View::SafeHTML.new(self)
+end

data/lib/edgeway.rb

@@ -1,29 +1,38 @@
+require "digest"
 require "json"
 require "time"
+require "uri"
 require_relative "edgeway/version"
 require_relative "edgeway/errors"
 require_relative "edgeway/inflector"
+require_relative "edgeway/view"
 require_relative "edgeway/config"
 require_relative "edgeway/logger"
 require_relative "edgeway/http/response"
 require_relative "edgeway/http/parameters"
 require_relative "edgeway/http/json_body"
 require_relative "edgeway/http/request"
+require_relative "edgeway/http/client"
 require_relative "edgeway/routing/route"
 require_relative "edgeway/routing/route_set"
 require_relative "edgeway/routing/mapper"
 require_relative "edgeway/db/adapter"
+require_relative "edgeway/model/connection_registry"
 require_relative "edgeway/model/attributes"
 require_relative "edgeway/model/validations"
 require_relative "edgeway/model/macros"
 require_relative "edgeway/model/relation"
 require_relative "edgeway/model/persistence"
 require_relative "edgeway/model/base"
+require_relative "edgeway/cache"
+require_relative "edgeway/rate_limit"
 require_relative "edgeway/http/auth/jwt"
 require_relative "edgeway/controller/callbacks"
 require_relative "edgeway/controller/rescuable"
 require_relative "edgeway/controller/rendering"
 require_relative "edgeway/controller/authentication"
+require_relative "edgeway/controller/caching"
+require_relative "edgeway/controller/rate_limiting"
 require_relative "edgeway/controller/base"
 require_relative "edgeway/controller/dispatcher"
 require_relative "edgeway/application"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edgeway
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuji Yaginuma
@@ -16,21 +16,41 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - exe/edgeway
 - js/cgi.js
+- js/cloudflare-d1-sessions.js
+- js/cloudflare-kv.js
+- js/cloudflare-ratelimit.js
+- js/cloudflare-test-database.js
+- js/cloudflare-test-runner.js
 - js/cloudflare.js
 - js/cors.js
+- js/fetch.js
+- js/headers.js
+- js/jspi.js
 - js/jwt.js
 - js/runtime.js
 - js/wasi-shim.js
 - lib/edgeway.rb
 - lib/edgeway/application.rb
+- lib/edgeway/cache.rb
+- lib/edgeway/cache/limits.rb
+- lib/edgeway/cache/memory_store.rb
+- lib/edgeway/cache/null_store.rb
+- lib/edgeway/cache/store.rb
 - lib/edgeway/cli.rb
-- lib/edgeway/cli/app_config.rb
-- lib/edgeway/cli/app_files.rb
 - lib/edgeway/cli/build.rb
+- lib/edgeway/cli/build/app_config.rb
+- lib/edgeway/cli/build/app_files.rb
+- lib/edgeway/cli/build/cache_config.rb
+- lib/edgeway/cli/build/database_config.rb
+- lib/edgeway/cli/build/js_files.rb
+- lib/edgeway/cli/build/view_compiler.rb
+- lib/edgeway/cli/cloudflare_test.rb
+- lib/edgeway/cli/cloudflare_test/wasm_test_cli.rb
 - lib/edgeway/cli/generate.rb
 - lib/edgeway/cli/new.rb
 - lib/edgeway/cli/package_manager.rb
@@ -41,59 +61,85 @@ files:
 - lib/edgeway/config.rb
 - lib/edgeway/controller/authentication.rb
 - lib/edgeway/controller/base.rb
+- lib/edgeway/controller/caching.rb
 - lib/edgeway/controller/callbacks.rb
 - lib/edgeway/controller/dispatcher.rb
+- lib/edgeway/controller/rate_limiting.rb
 - lib/edgeway/controller/rendering.rb
 - lib/edgeway/controller/rescuable.rb
 - lib/edgeway/db/adapter.rb
 - lib/edgeway/db/memory.rb
+- lib/edgeway/db/query_stats.rb
 - lib/edgeway/db/sqlite.rb
 - lib/edgeway/errors.rb
+- lib/edgeway/generators/app/templates/.github/workflows/ci.yml.tt
 - lib/edgeway/generators/app/templates/.gitignore
+- lib/edgeway/generators/app/templates/.ruby-version.tt
 - lib/edgeway/generators/app/templates/Gemfile.tt
 - lib/edgeway/generators/app/templates/README.md.tt
 - lib/edgeway/generators/app/templates/app/controllers/application_controller.rb
 - lib/edgeway/generators/app/templates/app/controllers/health_controller.rb
 - lib/edgeway/generators/app/templates/app/models/application_model.rb
+- lib/edgeway/generators/app/templates/app/views/layouts/application.html.erb
 - lib/edgeway/generators/app/templates/bin/build.tt
 - lib/edgeway/generators/app/templates/bin/deploy.tt
 - lib/edgeway/generators/app/templates/bin/setup.tt
+- lib/edgeway/generators/app/templates/bin/test.tt
+- lib/edgeway/generators/app/templates/config/cache.yml
 - lib/edgeway/generators/app/templates/config/database.yml
 - lib/edgeway/generators/app/templates/config/routes.rb
 - lib/edgeway/generators/app/templates/db/migrations/.keep
 - lib/edgeway/generators/app/templates/mise.toml.tt
 - lib/edgeway/generators/app/templates/package.json.tt
+- lib/edgeway/generators/app/templates/public/.assetsignore
 - lib/edgeway/generators/app/templates/src/worker.js
 - lib/edgeway/generators/app/templates/test/controllers/health_test.rb
 - lib/edgeway/generators/app/templates/test/test_helper.rb
 - lib/edgeway/generators/app/templates/wrangler.toml.tt
 - lib/edgeway/http/auth/jwt.rb
 - lib/edgeway/http/auth/stub.rb
+- lib/edgeway/http/client.rb
 - lib/edgeway/http/json_body.rb
 - lib/edgeway/http/parameters.rb
 - lib/edgeway/http/request.rb
 - lib/edgeway/http/response.rb
+- lib/edgeway/http/stub_transport.rb
 - lib/edgeway/inflector.rb
 - lib/edgeway/logger.rb
 - lib/edgeway/model/attributes.rb
 - lib/edgeway/model/base.rb
+- lib/edgeway/model/connection_registry.rb
 - lib/edgeway/model/macros.rb
 - lib/edgeway/model/persistence.rb
 - lib/edgeway/model/relation.rb
 - lib/edgeway/model/validations.rb
+- lib/edgeway/rate_limit.rb
+- lib/edgeway/rate_limit/limiter.rb
+- lib/edgeway/rate_limit/null_limiter.rb
+- lib/edgeway/rate_limit/stub_limiter.rb
 - lib/edgeway/routing/mapper.rb
 - lib/edgeway/routing/route.rb
 - lib/edgeway/routing/route_set.rb
 - lib/edgeway/server.rb
 - lib/edgeway/service/cloudflare/d1.rb
 - lib/edgeway/service/cloudflare/jwt.rb
+- lib/edgeway/service/cloudflare/kv.rb
+- lib/edgeway/service/cloudflare/kv_store.rb
+- lib/edgeway/service/cloudflare/rate_limit.rb
+- lib/edgeway/service/cloudflare/rate_limiter.rb
+- lib/edgeway/service/cloudflare/test_databases.rb
+- lib/edgeway/service/fetch.rb
+- lib/edgeway/service/import_result.rb
 - lib/edgeway/test.rb
+- lib/edgeway/test/sqlite_databases.rb
 - lib/edgeway/version.rb
+- lib/edgeway/view.rb
 homepage: https://github.com/y-yagi/edgeway
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/y-yagi/edgeway
+  changelog_uri: https://github.com/y-yagi/edgeway/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -109,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A library for Ruby compiled by Spinel to wasm on edge workers.
 test_files: []

data/lib/edgeway/cli/app_config.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Edgeway
-  module CLI
-    class AppConfig
-      # adapter: => the file build/main.rb requires for it.
-      ADAPTERS = {
-        "d1" => "edgeway/service/cloudflare/d1",
-        "memory" => "edgeway/db/memory"
-      }.freeze
-
-      attr_reader :env, :adapter, :binding_name
-
-      def self.load(root, env)
-        path = File.join(root, "config", "database.yml")
-        raise Error, "no config/database.yml in #{root} (is this an Edgeway app?)" unless File.exist?(path)
-
-        section = (YAML.safe_load_file(path) || {})[env]
-        raise Error, "config/database.yml has no #{env} section" unless section.is_a?(Hash)
-
-        new(env, section["adapter"].to_s, (section["binding"] || "DB").to_s)
-      end
-
-      def initialize(env, adapter, binding_name)
-        raise Error, "unknown database adapter #{adapter.inspect} (one of #{ADAPTERS.keys.join(", ")})" unless ADAPTERS.key?(adapter)
-
-        @env = env
-        @adapter = adapter
-        @binding_name = binding_name
-      end
-
-      def adapter_file = ADAPTERS.fetch(@adapter)
-    end
-  end
-end

data/lib/edgeway/cli/app_files.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Edgeway
-  module CLI
-    class AppFiles
-      def initialize(root)
-        @root = root
-      end
-
-      def require_lines
-        lines = []
-        app = File.join(@root, "app")
-        dirs = Dir.exist?(app) ? Dir.children(app).sort.select { |d| File.directory?(File.join(app, d)) } : []
-        dirs.each do |d|
-          next if %w[models controllers].include?(d)
-
-          lines.concat(requires("app/#{d}"))
-        end
-        lines.concat(requires("app/models"))
-        lines.concat(requires("app/controllers"))
-        lines << 'require_relative "../config/routes"'
-        lines
-      end
-
-      # require_relative lines for the .rb files under dir, application_*.rb first.
-      def requires(dir)
-        full = File.join(@root, dir)
-        return [] unless Dir.exist?(full)
-
-        files = Dir.glob("**/*.rb", base: full).map { |f| File.join(dir, f) }
-        first, rest = files.partition { |f| File.basename(f).start_with?("application_") }
-        # String#dump quotes a path with spaces, quotes or "#{" safely.
-        (first.sort + rest.sort).map { |f| "require_relative #{"../#{f.delete_suffix(".rb")}".dump}" }
-      end
-    end
-  end
-end