Merge pull request #27 from jlong/github-actions

Add GitHub Action CI

.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - ruby-version: '2.7.8'
+            bundler-version: '2.4.22'
+          - ruby-version: '3.0.7'
+            bundler-version: '2.5.23'
+          - ruby-version: '3.1.6'
+            bundler-version: '2.6.1'
+          - ruby-version: '3.3.6'
+            bundler-version: '2.6.1'
+          - ruby-version: '3.4.0-rc1'
+            bundler-version: '2.6.1'
+          - ruby-version: 'jruby'
+            bundler-version: '2.6.1'
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler: ${{ matrix.bundler-version }}
+          bundler-cache: true
+      - name: Run tests
+        env:
+          COVERALLS: ${{ matrix.ruby-version != 'jruby' }}
+          JRUBY_OPTS: ${{ matrix.ruby-version == 'jruby' && '--debug' || '' }}
+        run: bundle exec rake

Gemfile

@@ -7,14 +7,19 @@ group :test do
   gem 'rake'
   gem 'kramdown'
   gem "simplecov"
-  gem 'coveralls-ruby', :require => false
+  gem 'coveralls_reborn', :require => false
   gem 'minitest'
 end
 
 
 platforms :rbx do
   gem 'racc'                     # if using gems like ruby_parser or parser
   # gem 'rubysl', '~> 2.0'
-  gem 'psych'
+  # gem 'psych'
   gem 'rubinius-developer_tools'
 end
+
+platforms :jruby do
+  gem 'jar-dependencies', '~> 0.4.1'
+  gem 'ruby-maven', '~> 3.3.11'
+end

lib/radius/context.rb

@@ -58,6 +58,7 @@ def render_tag(name, attributes = {}, &block)
       else
         tag_definition_block = @definitions[qualified_tag_name(name.to_s)]
         if tag_definition_block
+          # puts name: name, attributes: attributes
           stack(name, attributes, block) do |tag|
             tag_definition_block.call(tag).to_s
           end

lib/radius/parser.rb

@@ -67,7 +67,11 @@ def stack_up
 
     def default_scanner
       if RUBY_PLATFORM == 'java'
-        require 'java'
+        if Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new('9.3')
+          require 'jruby'
+        else
+          require 'java'
+        end
         require 'radius/parser/java_scanner.jar'
         ::Radius.send(:include_package, 'radius.parser')
         Radius::JavaScanner.new(JRuby.runtime)

lib/radius/parser/JavaScanner.rl

@@ -3,20 +3,37 @@
 
 	action _prefix { mark_pfx = p; }
 	action prefix {
-    prefix = input.substring(mark_pfx, p);
+    prefix = String.valueOf(input.substring(mark_pfx, p));
 	}
   action _check_prefix {
 	  if ( !prefix.equals(tag_prefix) ) {
-      // have to manually add ':' / Sep
-      // pass the text through & reset state
-      pass_through(input.substring(tagstart, p) + ":");
+      // Pass through the entire tag markup as text
+      pass_through(input.substring(tagstart, p + 1));
+      // Reset all state
       prefix = "";
+      name = "";
+      attributes = RubyHash.newHash(runtime);
+      flavor = RubySymbol.newSymbol(runtime, "tasteless".intern());
+      tagstart = p + 1;
       fgoto main;
     }
   }
 
 	action _starttag { mark_stg = p; }
-	action starttag { name = input.substring(mark_stg, p); }
+	action starttag {
+    name = String.valueOf(input.substring(mark_stg, p));
+    if (name == null || name.trim().isEmpty()) {
+      // Pass through the entire tag markup as text
+      pass_through(input.substring(tagstart, p + 1));
+      // Reset all state
+      prefix = "";
+      name = "";
+      attributes = RubyHash.newHash(runtime);
+      flavor = RubySymbol.newSymbol(runtime, "tasteless".intern());
+      tagstart = p + 1;
+      fgoto main;
+    }
+	}
 	action _attr { mark_attr = p; }
 	action attr {
     attributes.op_aset(
@@ -40,7 +57,7 @@
 	# words
 	PrefixChar = [\-A-Za-z0-9._?] ;
 	NameChar = [\-A-Za-z0-9._:?] ;
-	TagName = NameChar+ >_starttag %starttag;
+	TagName = ([\-A-Za-z0-9._?]+ (':' [\-A-Za-z0-9._?]+)*) >_starttag %starttag;
 	Prefix = PrefixChar+ >_prefix %prefix;
   Open = "<";
   Sep = ":" >_check_prefix;
@@ -111,11 +128,23 @@ public class JavaScanner {
   }
 
   void tag(String prefix, String name, RubyHash attr, RubySymbol flavor) {
+    // Validate both prefix and name
+    if ((prefix == null || prefix.trim().isEmpty()) && 
+        (name == null || name.trim().isEmpty())) {
+        pass_through("<");
+        return;
+    }
+
+    if (name == null || name.trim().isEmpty()) {
+        pass_through("<" + prefix + ":");
+        return;
+    }
+
     RubyHash tag = RubyHash.newHash(runtime);
     tag.op_aset(
       runtime.getCurrentContext(),
       RubySymbol.newSymbol(runtime, "prefix"),
-      RubyString.newString(runtime, prefix)
+      RubyString.newString(runtime, prefix != null ? prefix : "")
     );
     tag.op_aset(
       runtime.getCurrentContext(),