landline 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4924570720bd14c3d6149435782f59a64cd7c36727da5a204462653125de65d
-  data.tar.gz: 8f06e6d9194aee22eb39752047c548fda980964548b0f5c78f20200e7f441c6e
+  metadata.gz: a6713c809dcb1f2216afff7f05d00e932c85d36c1b205359a2c8f8655b79fbb1
+  data.tar.gz: 34846e521a08d55376a520a194417edf0cb66972bf6c052ac6fb5d888fea30f2
 SHA512:
-  metadata.gz: 353d30b81860f95e23d542e3b954e3fd1be308fa1cbd534017518a02238d5a79e886cd65e7237380be660286795cfe134c703fb5c2b19765420a065a5400f5d1
-  data.tar.gz: d9be7521e662b6ff25f5cf7ac9c98bfe7f6d38a174cf3b9d95110b2c8ff42c500cb0e916a4961dadb48263566aa58812e2b3b5973b0e15c458b69856d0460d25
+  metadata.gz: b54438875d8532e95858567f0305b03baf00a6c88a735851116be73ea2b7619031226624ff846d05a7439050deff1b02acfe5c5a7d1a8afdb8e67b2ea6b520a1
+  data.tar.gz: 03031f8d28c5e8657854cdff63e4f205d9b553cb03e34109b761a5f65207fd473005a61a5504a3f96517a37fe2d1f1b234b733916a3bd5f33f4de0e64a30fbab

data/README.md

@@ -139,10 +139,8 @@ end
 class Application < Landline::App
   use TimerMiddleware
 
-  setup do
-    get "/hello" do
-      "Hello world!"
-    end
+  get "/hello" do
+    "Hello world!"
   end
 end
 

data/lib/landline/app.rb

@@ -3,18 +3,20 @@
 module Landline
   # Rack application interface
   class App
-    # TODO: fix this mess somehow (probably impossible)
-
-    # @!parse include Landline::DSL::PathMethods
-    # @!parse include Landline::DSL::PathConstructors
-    # @!parse include Landline::DSL::ProbeConstructors
-    # @!parse include Landline::DSL::ProbeMethods
-    # @!parse include Landline::DSL::CommonMethods
     class << self
+      # TODO: fix this mess somehow (probably impossible)
+      # @!parse include Landline::DSL::PathMethods
+      # @!parse include Landline::DSL::PathConstructors
+      # @!parse include Landline::DSL::ProbeConstructors
+      # @!parse include Landline::DSL::ProbeMethods
+      # @!parse include Landline::DSL::CommonMethods
+
       # Duplicate used middleware for the subclassed app
       def inherited(subclass)
         super(subclass)
+        @setup_chain ||= []
         subclass.middleware = @middleware.dup
+        subclass.setup_chain = @setup_chain.dup
       end
 
       # Include a middleware in application
@@ -24,17 +26,30 @@ module Landline
         @middleware.append(middleware)
       end
 
-      # Setup block
-      # @param block [#call]
-      def setup(&block)
-        @setup_block = block
+      # Check if Server can respond to given symbol
+      def respond_to_missing?(symbol, _include_private)
+        Landline::ServerContext.instance_methods.include?(symbol) || super
       end
 
-      attr_accessor :middleware, :setup_block
+      # Store applied app manipulations
+      def method_missing(symbol, *args, **params, &callback)
+        if Landline::ServerContext.instance_methods.include? symbol
+          @setup_chain.append([symbol, args, params, callback])
+        else
+          super(symbol, *args, **params, &callback)
+        end
+      end
+
+      attr_accessor :middleware, :setup_chain
     end
 
     def initialize(*args, **opts)
-      @app = ::Landline::Server.new(*args, **opts, &self.class.setup_block)
+      setup_chain = self.class.setup_chain
+      @app = ::Landline::Server.new(*args, **opts) do
+        setup_chain.each do |symbol, cargs, cparams, callback|
+          send(symbol, *cargs, **cparams, &callback)
+        end
+      end
       self.class.middleware&.reverse_each do |cls|
         @app = cls.new(@app)
       end

data/lib/landline/dsl/methods_probe.rb

@@ -43,21 +43,21 @@ module Landline
       # @param path [String]
       def jump(path)
         @origin.request.path = path
-        throw(:break, [307, { "x-internal-jump": true }, []])
+        throw(:finish, [307, { "x-internal-jump": true }, []])
       end
 
       # (in Landline::Probe context)
       # Do clientside request redirection via 302 code
       # @param path [String]
       def redirect(path)
-        throw(:break, [302, { "location": path }, []])
+        throw(:finish, [302, { "location": path }, []])
       end
 
       # (in Landline::Probe context)
       # Do clientside request redirection via 307 code
       # @param path [String]
       def redirect_with_method(path)
-        throw(:break, [307, { "location": path }, []])
+        throw(:finish, [307, { "location": path }, []])
       end
 
       alias code status

data/lib/landline/path.rb

@@ -4,23 +4,9 @@ require_relative 'pattern_matching'
 require_relative 'node'
 require_relative 'dsl/constructors_path'
 require_relative 'dsl/methods_path'
-require_relative 'dsl/methods_common'
-require_relative 'dsl/methods_probe'
-require_relative 'dsl/constructors_probe'
 require_relative 'util/lookup'
 
 module Landline
-  # Execution context for filters and preprocessors.
-  class ProcessorContext
-    include Landline::DSL::CommonMethods
-    include Landline::DSL::ProbeMethods
-    include Landline::DSL::ProbeConstructors
-
-    def initialize(path)
-      @origin = path
-    end
-  end
-
   # Execution context for path setup block.
   class PathContext
     include Landline::DSL::PathConstructors
@@ -31,21 +17,8 @@ module Landline
     end
   end
 
-  # Ephemeral proxy class to which callback execution binds
-  class PathExecutionOrigin
-    def initialize(request, properties)
-      @request = request
-      @properties = Landline::Util::LookupROProxy.new(properties)
-    end
-
-    attr_accessor :response
-    attr_reader :request, :properties
-  end
-
   # Primary building block of request navigation.
   class Path < Landline::Node
-    ExecutionOrigin = Landline::PathExecutionOrigin
-    ProcContext = Landline::ProcessorContext
     Context = Landline::PathContext
 
     # @param path [Object] Object to generate {Landline::Pattern} from
@@ -108,8 +81,8 @@ module Landline
 
     # Create an execution context for in-path processing blocks
     def get_context(request)
-      exec_origin = self.class::ExecutionOrigin.new(request, @properties)
-      self.class::ProcContext.new(exec_origin)
+      request.context.origin.properties.lookup = @properties
+      request.context
     end
 
     # Sequentially run through all filters and drop request if one is false
@@ -118,7 +91,10 @@ module Landline
     def run_filters(request)
       proccontext = get_context(request)
       @filters.each do |filter|
-        return false unless proccontext.instance_exec(request, &filter)
+        output = catch(:break) do
+          proccontext.instance_exec(request, &filter)
+        end
+        return false unless output
       end
       true
     end
@@ -128,8 +104,13 @@ module Landline
     def run_preprocessors(request)
       proccontext = get_context(request)
       @preprocessors.each do |preproc|
-        proccontext.instance_exec(request, &preproc)
+        output = catch(:break) do
+          proccontext.instance_exec(request, &preproc)
+          true
+        end
+        return false unless output
       end
+      true
     end
 
     # Append postprocessors to request
@@ -146,7 +127,8 @@ module Landline
     def process_wrapped(request)
       return false unless run_filters(request)
 
-      run_preprocessors(request)
+      return false unless run_preprocessors(request)
+
       enqueue_postprocessors(request)
       @children.each do |x|
         value = x.go(request)
@@ -155,7 +137,7 @@ module Landline
       value = index(request)
       return exit_stack(request, value) if value
 
-      @bounce ? exit_stack(request) : _die(404)
+      notfound(request)
     rescue StandardError => e
       _die(request, 500, backtrace: [e.to_s] + e.backtrace)
     end
@@ -167,6 +149,11 @@ module Landline
       response
     end
 
+    # Exit with failure or throw 404
+    def notfound(request)
+      @bounce ? exit_stack(request) : _die(request, 404)
+    end
+
     # Try to perform indexing on the path if possible
     # @param request [Landline::Request]
     # @return [Boolean] true if indexing succeeded

data/lib/landline/probe/handler.rb

@@ -29,8 +29,8 @@ module Landline
       # @return [Boolean] true if further navigation is possible
       # @raise [UncaughtThrowError] may raise if die() is called.
       def process(request)
-        origin = Landline::ProbeExecutionOrigin.new(request, @properties)
-        context = Landline::ProbeContext.new(origin)
+        origin, context = get_context(request)
+
         return reject(request) unless request.path.match?(/^\/?$/)
 
         response = catch(:break) do
@@ -47,6 +47,14 @@ module Landline
         end
         throw :finish, response
       end
+
+      private
+
+      # Create a context to run handler in
+      def get_context(request)
+        request.context.origin.properties.lookup = @properties
+        [request.context.origin, request.context]
+      end
     end
   end
 end

data/lib/landline/probe.rb

@@ -24,28 +24,6 @@ module Landline
     autoload :Link, "landline/probe/crosscall_handler"
   end
 
-  # Context that provides execution context for Probes.
-  class ProbeContext
-    include Landline::DSL::ProbeConstructors
-    include Landline::DSL::ProbeMethods
-    include Landline::DSL::CommonMethods
-
-    def initialize(origin)
-      @origin = origin
-    end
-  end
-
-  # Ephemeral proxy class to which callback execution binds
-  class ProbeExecutionOrigin
-    def initialize(request, properties)
-      @request = request
-      @properties = Landline::Util::LookupROProxy.new(properties)
-    end
-
-    attr_accessor :response
-    attr_reader :request, :properties
-  end
-
   # Test probe. Also base for all "reactive" nodes.
   class Probe < Landline::Node
     # @param path [Object]

data/lib/landline/request.rb

@@ -3,6 +3,7 @@
 require 'uri'
 require_relative 'util/query'
 require_relative 'util/cookie'
+require_relative 'sandbox'
 
 module Landline
   # Request wrapper for Rack protocol
@@ -30,13 +31,16 @@ module Landline
       @states = []
       # Postprocessors for current request
       @postprocessors = []
+      # Execution context
+      @context = init_context
     end
 
     # Run postprocessors
     # @param response [Landline::Response]
     def run_postprocessors(response)
+      @context.origin.properties.lookup = {}
       @postprocessors.reverse_each do |postproc|
-        postproc.call(self, response)
+        @context.instance_exec(self, response, &postproc)
       end
       @postprocessors = []
     end
@@ -90,11 +94,17 @@ module Landline
 
     attr_reader :request_method, :script_name, :path_info, :server_name,
                 :server_port, :server_protocol, :headers, :param, :splat,
-                :postprocessors, :cookies, :rack
+                :postprocessors, :cookies, :rack, :context
     attr_accessor :path, :filepath, :query
 
     private
 
+    # Initialize execution context
+    def init_context
+      origin = Landline::ProcessorOrigin.new(self, {})
+      Landline::ProcessorContext.new(origin)
+    end
+
     # Initialize basic rack request parameters
     # @param env [Hash]
     def init_request_params(env)

data/lib/landline/sandbox.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'dsl/methods_common'
+require_relative 'dsl/methods_probe'
+require_relative 'dsl/constructors_probe'
+require_relative 'util/lookup'
+
+module Landline
+  # Execution context for filters and preprocessors.
+  class ProcessorContext
+    include Landline::DSL::CommonMethods
+    include Landline::DSL::ProbeMethods
+    include Landline::DSL::ProbeConstructors
+
+    def initialize(path)
+      @origin = path
+    end
+
+    attr_reader :origin
+  end
+
+  # Ephemeral proxy class to which callback execution binds
+  class ProcessorOrigin
+    def initialize(request, properties)
+      @request = request
+      @properties = Landline::Util::LookupROProxy.new(properties)
+    end
+
+    attr_accessor :response
+    attr_reader :request, :properties
+  end
+end

data/lib/landline/server.rb

@@ -14,7 +14,7 @@ module Landline
     # @param parent [Landline::Node, nil] Parent object to inherit properties to
     # @param setup [#call] Setup block
     def initialize(passthrough = nil, parent: nil, **opts, &setup)
-      super("", parent: nil, **opts, &setup)
+      super("", parent: parent, **opts, &setup)
       return if parent
 
       @passthrough = passthrough

data/lib/landline/util/lookup.rb

@@ -46,6 +46,8 @@ module Landline
       def [](key)
         @lookup.[](key)
       end
+
+      attr_accessor :lookup
     end
   end
 end

data/lib/landline.rb

@@ -12,7 +12,7 @@ require_relative 'landline/app'
 # Landline is a backend framework born as a by-product of experimentation
 module Landline
   # Landline version
-  VERSION = '0.12 "Concrete and Gold" (pre-alpha)'
+  VERSION = '0.12.1 "Concrete and Gold" (pre-alpha)'
 
   # Landline branding and version
   VLINE = "Landline/#{Landline::VERSION} (Ruby/#{RUBY_VERSION}/#{RUBY_RELEASE_DATE})\n".freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landline
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Yessiest
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies: []
 description: |
   Landline is a no-hard-dependencies HTTP routing DSL that was made entirely for fun.
@@ -48,6 +48,7 @@ files:
 - lib/landline/probe/serve_handler.rb
 - lib/landline/request.rb
 - lib/landline/response.rb
+- lib/landline/sandbox.rb
 - lib/landline/server.rb
 - lib/landline/template.rb
 - lib/landline/template/erb.rb
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Elegant HTTP DSL