rebus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa46618c42ed2cbe33450f45f0cb8a47aa8a579ae6b32cb35033335b67c48b8
-  data.tar.gz: 689d4892b290ee8664529fc938b69946d6665fa6d55bb7fbb3ad41781e6444dd
+  metadata.gz: c84a583cff147a9d67e9d05c36ad6128c2817bdf7005928027d3b7471bf423a4
+  data.tar.gz: e92be149abc13dfb31cbe5a852fe0931fa1f27a58e17fdc1d35b111410a19416
 SHA512:
-  metadata.gz: ccc9d6db824f8cc01acb1b824614bf0fdb59d0c53d0763ea20caa44731dda006d01181c6f266d9d2c844900760c967edbbac6d1fd5da95dc718612ed4859aeb6
-  data.tar.gz: 0d66b98e982ed01a3bd00db4f9493a92389cda0a9d0f6fed8af0c5970c496b931a9e9a91aad82bd2a127bd6891557d64317e059dc8872999b6e3d41b32ae0326
+  metadata.gz: fa6c687117524b028b77d0669001444c0cba83ee660adf3116a68ff1282c8400a30b2c1c23661fd3b279cce8b0f254a503437bf7702830913418da668ac650ea
+  data.tar.gz: 49fb0000f1b1486540b3c3bfa4466b7b03bb284ad8355ca1ff53f4e1b61de78664795625fef490846f65b858103d7ace1db4e97a291c84cb408ca4713694a6e2

data/lib/rebus/compiler.rb

@@ -4,24 +4,25 @@ require 'modeling'
 module Rebus
   class Compiler
     
-    model :code_prefix, :comment_prefix, :context do
+    model :code_prefix, :comment_prefix, :strip_lines, :context do
       @code_prefix ||= Rebus.code_prefix
       @comment_prefix ||= Rebus.comment_prefix
-      reset_lines
+      @strip_lines ||= @strip_lines.nil? && Rebus.strip_lines
     end
-
-    def reset_lines
-      @current_line = 1
-      @string_lines = []
+        
+    def reset
+      @code_mode = true
+      @text_line_begin = "yield <<-\"#{@code_prefix}\".chomp!.chomp\n"
+      @text_line_end = "#{code_prefix}\n"
     end
 
     def compile source
-      return compile source do;end if !block_given?
-
-      reset_lines
+      # yield to ether if no block given
+      return compile(source){} unless block_given?
+      reset
       parsed = parse source
       error = nil
-
+      
       begin
         if source.is_a? File
           context.instance_eval parsed, source.path
@@ -32,7 +33,7 @@ module Rebus
         error = err
       end
       if error
-        raise prepare_error error
+        raise prepare_error error, parsed
       end
       self
     end
@@ -46,48 +47,51 @@ module Rebus
       else 
         raise "Unsupported source #{source.class}"
       end
-
-      escaped_code_prefix = Regexp.escape @code_prefix
-      line_regexp = /^\s*(#{@comment_prefix})?(#{escaped_code_prefix})?\s*(.+)\s*$/
-      source.each_line.map{ parse_line _1, line_regexp }.compact.join "\n"
+      result = source
+        .each_line
+        .lazy
+        .map{ parse_line _1 }
+        .compact
+        .reduce{|acc, line| "#{acc}\n#{line}" }
+      result + "\n" + code("")
     end
 
-    def parse_line line, regexp
-      if line =~ regexp
-        if $1 # comment
-          @current_line += 1
-          return ""
-        else
-          if $2 # code
-            @current_line += 1
-            return $3
-          else # string
-            @string_lines << @current_line + 1
-            @current_line += 3
-            return "yield <<-\"#{@code_prefix}\".chop\n#{$3}\n#{@code_prefix}"
-          end
-        end
-      else # blank line
-        @current_line += 1
-        return "yield ''"
+    private
+
+    def parse_line line
+      stripped = line.strip
+      if stripped.start_with?(@code_prefix) || stripped == @code_prefix.strip
+        code stripped[@code_prefix.length..] || ""
+      elsif stripped.start_with?(@comment_prefix) || stripped == @comment_prefix.strip
+        nil
+      else
+        text @strip_lines ? stripped : line.chomp
       end
     end
 
-    private
+    def text line
+      return line unless @code_mode
+      @code_mode = false
+      "#{@text_line_begin}#{line}"
+    end
 
-    def prepare_error error
-      lines = error.message.split("\n")
+    def code line
+      return line if @code_mode
+      @code_mode = true
+      "\n#{@text_line_end}#{line}"
+    end
+
+    def prepare_error error, parsed
+      first_line, lines = *error.message.split("\n", 2)
       path_regexp = /^(.*:)(\d+):(.*)/
-      if lines[0] =~ path_regexp
-        lineno = $2.to_i
-        lineno -= @string_lines.map{ (lineno <=> _1) + 1 }.sum
+      if first_line =~ path_regexp
+        lineno = reduce_error_lineno $2.to_i, parsed
         backtrace = [$1 + lineno.to_s, *error.backtrace]
-        message = "#{$3}\n#{lines[1..]&.join "\n"}"
+        message = "#{$3}\n#{lines}"
       elsif error.backtrace[0] =~ path_regexp
-        lineno = $2.to_i
-        lineno -= @string_lines.map{ _1 <= lineno ? _1 < lineno ? 2 : 1 : 0 }.sum
+        lineno = reduce_error_lineno $2.to_i, parsed
         backtrace = [$1 + lineno.to_s, *error.backtrace[1..]]
-        message = "#{lines&.join "\n"}"
+        message = error.message
       else
         backtrace = error.backtrace
         message = error.message
@@ -96,5 +100,18 @@ module Rebus
       new_error.set_backtrace backtrace
       return new_error
     end
+
+    def reduce_error_lineno error_lineno, parsed
+      lineno = 0
+      parsed.each_line.each_with_index do |line, i|
+        break if i >= error_lineno
+        if line == @text_line_end
+          lineno -= 1
+        elsif line != @text_line_begin
+          lineno += 1
+        end
+      end
+      lineno
+    end
   end
 end

data/lib/rebus/version.rb

@@ -1,3 +1,3 @@
 module Rebus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rebus.rb

@@ -3,9 +3,7 @@ require_relative 'rebus/context'
 
 module Rebus
   class << self
-    attr_accessor :code_prefix
-    attr_accessor :comment_prefix
-    attr_accessor :home
+    attr_accessor :code_prefix, :comment_prefix, :strip_lines, :home
 
     def compile_file filename, context = nil, **na, &block
       if !File.absolute_path? filename
@@ -45,6 +43,7 @@ module Rebus
     end
   end
   
-  self.code_prefix = "|>"
-  self.comment_prefix = "#[^{@$]"
+  self.code_prefix = "$ "
+  self.comment_prefix = "# "
+  self.strip_lines = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rebus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modeling
@@ -16,16 +16,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
-description: "Universal template compiler based on ruby dynamic evaluation feature.
-  \nMinimalistic design, customizable tokens, comments support, easy debugging.\n"
+        version: 0.1.0
+description: |
+  Rebus template language compiler based on Ruby dynamic evaluation.
+  Minimalistic and customizable.
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
@@ -56,8 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
-summary: ruby stencil compiler
+summary: Ruby stencil compiler
 test_files: []