sablon 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c83f07a4e1add4db3c1c12d6ffab63e53b7f0acc89e7947efa8cac8a140a35eb
-  data.tar.gz: 23b8e9d2685409410dc418f615c8a23742dbcbc58c3f7a93fcb6a594e84450bf
+  metadata.gz: 720cffa05ff6bb8247f98dcf41bc071337261dcea325efe2b7f711bc728b342d
+  data.tar.gz: 1a75ef6694f0a608c5d5fc2ceec212017bf2ff0a547970291b1de86ef44f436c
 SHA512:
-  metadata.gz: 8bf3e622843f453b9f2f8b7b9ebbaa18560ec83ecd11ca2386a885bc497ca0149e6e9db64be4a9220a508bf625b7e81748ca636456e03f274d58883efce5453c
-  data.tar.gz: 5bfe0d0737b928420342146c8b920283f0a4c3f9fa32b585871792076df75305048e17c348c44b7ca470408a84e763c2b47ac401a7711cd5219e26270c9d310a
+  metadata.gz: 43becf98304baf22069a66dd2f7317f78acb66047523129f9f108d83b682b3bcbdb154142a536bc629d3c71a56edeef3c1b1aac81004fbc71946499d5587fb98
+  data.tar.gz: ee6d21a857e7ae944bc173663868b7987b60c96752e2fae6d303b96ded3208f7e041cc8f38018547a8f9b469a9574677a237666a72cffd1a60ba7113480fa47b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sablon (0.4.0)
+    sablon (0.4.1)
       nokogiri (>= 1.8.5)
       rubyzip (>= 1.3.0)
 
@@ -9,9 +9,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.20.0)
-    nokogiri (1.15.5)
+    nokogiri (1.16.5-arm64-darwin)
       racc (~> 1.4)
-    racc (1.7.3)
+    racc (1.8.0)
     rake (13.1.0)
     rexml (3.2.6)
     rubyzip (2.3.2)
@@ -19,7 +19,7 @@ GEM
       rexml
 
 PLATFORMS
-  ruby
+  arm64-darwin-23
 
 DEPENDENCIES
   bundler (>= 1.6)

data/lib/sablon/context.rb

@@ -6,6 +6,9 @@ module Sablon
   # user supplied hash into a data structure suitable for rendering the
   # docx template.
   module Context
+    class << self; attr_accessor :content_regex end
+    self.content_regex = /\A([^:]+):(.+)\z/
+
     class << self
       def transform_hash(hash)
         Hash[hash.map { |k, v| transform_pair(k.to_s, v) }]
@@ -25,12 +28,12 @@ module Sablon
       end
 
       def transform_pair(key, value)
-        if key =~ /\A([^:]+):(.+)\z/
+        if match = content_regex.match(key)
           if value.nil?
-            [Regexp.last_match[2], value]
+            [match[2], value]
           else
-            key_sym = Regexp.last_match[1].to_sym
-            [Regexp.last_match[2], Content.make(key_sym, value)]
+            type_id = match[1].to_sym
+            [match[2], Content.make(type_id, value)]
           end
         else
           transform_standard_key(key, value)

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/context_test.rb

@@ -61,4 +61,26 @@ class ContextTest < Sablon::TestCase
     context = Sablon::Context.transform_hash(input_context)
     assert_equal expected_context, context
   end
+
+  def test_tune_typed_content_regex
+    input_context = {
+      default: "string",
+      "word_ml:runs" => "<w:r><w:t>Text</w:t><w:r>",
+      "urn:some:example" => "string as well"
+    }
+    expected_context = {
+      "default" => "string",
+      "runs" => Sablon.content(:word_ml, "<w:r><w:t>Text</w:t><w:r>"),
+      "urn:some:example" => "string as well"
+    }
+
+    original_regex = Sablon::Context.content_regex
+    begin
+      Sablon::Context.content_regex = /\A((?!urn:)[^:]+):(.+)\z/
+      context = Sablon::Context.transform_hash(input_context)
+      assert_equal expected_context, context
+    ensure
+      Sablon::Context.content_regex = original_regex
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Yves Senn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: docx template processor