syntropy 0.21 → 0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8069c4fe6a21289babda24dae14b580c5ea476a5d77bdcb09e31ae72d751459c
-  data.tar.gz: de80dbc652706f64819cef25d23ca81f19ed0e628d2860ae01a0e5792ea1bc6d
+  metadata.gz: 3b4c22909d2138e53068131ae1c5028c435bc89da146f54a5b920038922fc0c1
+  data.tar.gz: a8554b368ff3a3921315d46f900b68336c02eb52e3bbc15cb216ff84f7cecc28
 SHA512:
-  metadata.gz: ec0769f1619a71b926a19c56499b28c4e2331d05d417c8d0d6d3b21c1804a2ea2e52c93307a716c289c381b617bb66fcd174bb92b0c9b612f80f7561b32f0bba
-  data.tar.gz: b836b5a0bd012ae3a179c515cb177959723da53e99c0bb2212a1b5caab6270b38a9a33282b73279a6915ac768324cd61604ce6db02237f33b55980145c87f5e8
+  metadata.gz: bb028e99b10297bfd69f2f6635959c16bdfcd6c2456a1eec0420e49510f3212b4f15eb44ca217d7b6900fa3aa4aaef1b8ce418dd8d1efe9852b6ea069bbcf91c
+  data.tar.gz: 83b2fb77886360cff21cc8859fe57f5a9f7a2c53e14d59f7a50118380f47fed955fd774e62215f8745c13b027ad52717c699768e6c416017d307f477ccce3862

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.22 2025-09-29
+
+- Fix `@ref` for index modules
+
 # 0.21 2025-09-29
 
 - Fix routing with wildcard `index+.rb` modules

data/lib/syntropy/module.rb

@@ -98,7 +98,7 @@ module Syntropy
 
       @fn_map[fn] = ref
       code = IO.read(fn)
-      env = @env.merge(module_loader: self, ref: ref)
+      env = @env.merge(module_loader: self, ref: clean_ref(ref))
       m = Syntropy::Module.load(env, code, fn)
       add_dependencies(ref, m.__dependencies__)
       export_value = transform_module_export_value(m.__export_value__)
@@ -110,6 +110,12 @@ module Syntropy
       }
     end
 
+    def clean_ref(ref)
+      return '/' if ref =~ /^index(\+)?$/
+      
+      ref.gsub(/\/index(?:\+)?$/, '')
+    end
+
     # Transforms the given export value. If the value is nil, an exception is
     # raised.
     #

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.21'
+  VERSION = '0.22'
 end

data/test/app/mod/bar/index+.rb

@@ -0,0 +1,5 @@
+def env
+  @env
+end
+
+export self

data/test/app/mod/foo/index.rb

@@ -0,0 +1,5 @@
+def env
+  @env
+end
+
+export self

data/test/test_module.rb

@@ -43,6 +43,12 @@ class ModuleTest < Minitest::Test
     assert_equal @machine, mod.machine
     assert_equal @loader, mod.module_loader
     assert_equal 42, mod.app
+
+    assert_equal mod, mod.module_const
+    assert_equal @env.merge(module_loader: @loader, ref: '_lib/env'), mod.env
+    assert_equal @machine, mod.machine
+    assert_equal @loader, mod.module_loader
+    assert_equal 42, mod.app
   end
 
   def test_dependency_invalidation
@@ -54,4 +60,12 @@ class ModuleTest < Minitest::Test
 
     assert_equal [], @loader.modules.keys
   end
+
+  def test_index_module_env
+    mod = @loader.load('mod/bar/index+')
+    assert_equal 'mod/bar', mod.env[:ref]
+
+    mod = @loader.load('mod/foo/index')
+    assert_equal 'mod/foo', mod.env[:ref]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: '0.22'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -236,6 +236,8 @@ files:
 - test/app/bar.rb
 - test/app/baz.rb
 - test/app/index.html
+- test/app/mod/bar/index+.rb
+- test/app/mod/foo/index.rb
 - test/app/params/[foo].rb
 - test/app/rss.rb
 - test/app/tmp.rb