landline 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cfe9c90223c0d5d2fdc054e3aa2f96e76cdfeada0e865e13ef72d87b08526ff
-  data.tar.gz: 5a3b62e85bdafa0f9470f42d6c6789c32a4eaf9f00df686188837c3b13c570ff
+  metadata.gz: 58106097aed53f3fb0edd51bf2d9ecf8ba9d976946ffd7e4570c7f1b5ecdafa7
+  data.tar.gz: 2b1a03b8a2afeb431a9afe0207a7f17a9ea5439372cccd2c7d2e02b50f544ff1
 SHA512:
-  metadata.gz: f89f80cab3f587d952a3aaca92fce4f715d7778475ffc7c36abc207b6e377a233d8450e8b051013c6bcd7c77f9271fbdf0c48b336e0961f0841437fb7fef4f07
-  data.tar.gz: 49a13a596296b21c9a8abedc9f1aaf479f7bdda3a20e0eeff874c2cb92f064df577e6b14067b31765cb4aeddbea46c35a54804a8ce77be66f47cdbf22b371a80
+  metadata.gz: 9422f97e4310cea957b3c8ee6aed9ecc279bdffbb3e8578263a1f03316881d2833a3e3bdac42816a077702d3501d7c71027d6e7f5d72a8e1cf34ca4e114f66b8
+  data.tar.gz: ea8a961e1a6cbb755a8be74c75288932c736174fdef1a7c04c5ef5f6d5d3e0687f393ff5076a8435c1e6eb57978c4993f0152a38af5e5ec77c99adfdedfffe6c

data/README.md

@@ -142,7 +142,7 @@ For things to render correctly, please install the `redcarpet` gem.
 
 ```plain
     Landline - an HTTP request pattern matching system 
-    Copyright (C) 2022 yessiest (yessiest@memeware.net)
+    Copyright (C) 2022 yessiest (yessiest@text.512mb.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

data/lib/landline/dsl/constructors_probe.rb

@@ -8,8 +8,9 @@ module Landline
       # @see {Landline::Template#new}
       def erb(input, vars = {})
         Landline::Templates::ERB.new(input,
-                                 vars,
-                                 parent: @origin)
+                                     vars,
+                                     parent: @origin,
+                                     filename: caller_locations[0].path)
       end
 
       # Create a new erb template using Erubi engine
@@ -18,10 +19,11 @@ module Landline
       # @param capture [Boolean] whether to enable output capturing
       def erubi(input, vars = {}, freeze: true, capture: false)
         Landline::Templates::Erubi.new(input,
-                                   vars,
-                                   parent: @origin,
-                                   freeze: freeze,
-                                   capture: capture)
+                                       vars,
+                                       parent: @origin,
+                                       freeze: freeze,
+                                       capture: capture,
+                                       filename: caller_locations[0].path)
       end
     end
   end

data/lib/landline/dsl/methods_path.rb

@@ -67,7 +67,9 @@ module Landline
 
           object
         end
-        @origin.children.append(self.instance_eval(File.read(filename)))
+        @origin.children.append(
+          self.instance_eval(File.read(filename), filename)
+        )
         self.singleton_class.undef_method :run
       end
     end

data/lib/landline/template/erb.rb

@@ -8,7 +8,7 @@ module Landline
     # ERB Template language adapter
     class ERB < Landline::Template
       # @see {Landline::Template#new}
-      def initialize(input, vars = nil, parent:)
+      def initialize(input, vars = nil, parent:, filename:)
         super
         varname = "_part_#{SecureRandom.hex(10)}".to_sym
         while @binding.local_variable_defined? varname
@@ -20,6 +20,7 @@ module Landline
 
       # Run the template.
       def run
+        @template.filename = @filename
         @template.result @binding
       end
     end

data/lib/landline/template/erubi.rb

@@ -10,26 +10,24 @@ module Landline
       # @see {Landline::Template#new}
       def initialize(input,
                      vars = nil,
-                     parent:,
-                     freeze: true,
-                     capture: false)
-        super(input, vars, parent: parent)
+                     **ext)
+        super(input, vars, parent: ext[:parent], filename: ext[:filename])
         varname = "_part_#{SecureRandom.hex(10)}"
         while @binding.local_variable_defined? varname.to_sym
           varname = "_part_#{SecureRandom.hex(10)}"
         end
         properties = {
-          filename: input.is_a?(File) ? input.path : "(Inline)",
           bufvar: varname,
-          freeze: freeze
+          freeze: ext.fetch(:freeze, true)
         }
+        capture = ext.fetch(:capture, false)
         engine = capture ? ::Erubi::CaptureEndEngine : ::Erubi::Engine
         @template = engine.new(@template, properties)
       end
 
       # Run the template.
       def run
-        @binding.eval(@template.src)
+        @binding.eval(@template.src, @filename)
       end
     end
   end

data/lib/landline/template.rb

@@ -36,8 +36,13 @@ module Landline
     # @param input [String, File] template text
     # @param vars [Hash] local variables for tempalte
     # @param parent [Landline::Node] parent node
-    def initialize(input, vars = {}, parent:)
-      @template = input.is_a?(File) ? input.read : input
+    # @param filename [String] filename for eval if input is a string
+    def initialize(input, vars = {}, parent:, filename:)
+      @template, @filename = if input.is_a?(File)
+                               [input.read, input.path]
+                             else
+                               [input, filename]
+                             end
       @context = TemplateContext.new(parent, self)
       @parent = parent
       input.close if input.is_a? File

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landline
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Yessiest
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies: []
 description: |
   Landline is a no-hard-dependencies HTTP routing DSL that was made entirely for fun.
@@ -71,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="