interscript 2.4.3 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f937aac91160169f007353c245aa689ed3c5e3e4ed946c6da44f399ea733b1
-  data.tar.gz: 4c67b41ff52d4927793d772660d12b0c42c6548703a4c96f426ec1c26b54b9b7
+  metadata.gz: 4d70ba0bcf8f6cf72951983b6aacd3a0089e2d79ceb62b441bd4549a7731bfcb
+  data.tar.gz: 1fd552a2803d7c67cd12ec7ed3f2b956c1fc603d624673e3cace9f2db3bc2adb
 SHA512:
-  metadata.gz: 68c4890831dc4481c1c5152dc4781a061b214cebfee877d69876a972d43ee77616b533f6462db4d662e2fd032a93693d6afde443dd429096bead01f1238f35b8
-  data.tar.gz: ab9df5bc388a6882c0be9f83e3170944995f0104f593d0ff6a46360b6860bde1e0fa003f7db92531b837ebcfe56860e5635442f559d9c388f1997ea23b0fd14e
+  metadata.gz: e0ed290794bc0724ece2c4e9ce547fe7a716566b119061c3ee6ec65240b92d81b2b41be833a257ca130aba9f440294ad9626accc4fd905d96a21a644fdaa6c00
+  data.tar.gz: ba5ed46ba6dddf8c422fbc671492e41bc8898ed0cb1622e63310a77c6972352ee6285f9eb01d038f576dbd926a120ea41f7aa41fb60df66318c2274144551634

data/.github/workflows/assets.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
 
 jobs:
   assets:
@@ -23,7 +24,7 @@ jobs:
       - name: Use Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.0"
           bundler-cache: true
 
       - name: Install bundle

data/.github/workflows/rake.yml

@@ -2,7 +2,7 @@ name: rake
 
 on:
   push:
-    branches: [ main, v* ]
+    branches: [ main, v*, ci-check ]
     tags: [ v* ]
   pull_request:
 
@@ -10,23 +10,21 @@ jobs:
   rspec:
     name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
+    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.7, 2.6, 2.5 ]
+        ruby: [ "3.0", 2.7, 2.6 ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
         include:
-          - ruby: "3.0"
+          - ruby: "3.1"
             os: 'ubuntu-latest'
-            experimental: true
-          - ruby: "3.0"
-            os: 'windows-latest'
-            experimental: true
-          - ruby: "3.0"
+          - ruby: "3.2"
+            os: 'ubuntu-latest'
+          - ruby: "3.1"
+            os: 'macos-latest'
+          - ruby: "3.2"
             os: 'macos-latest'
-            experimental: true
 
     env:
       BUNDLE_WITHOUT: "secryst"

data/.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
 
       - uses: actions/setup-node@v1
         with:
@@ -44,6 +44,7 @@ jobs:
           RUBYGEMS_API_KEY: ${{secrets.INTERSCRIPT_RUBYGEMS_API_KEY}}
         run: |
           gem install gem-release
+          mkdir -p ~/.gem
           touch ~/.gem/credentials
           cat > ~/.gem/credentials << EOF
           ---

data/lib/interscript/dsl/metadata.rb

@@ -20,13 +20,12 @@ class Interscript::DSL::Metadata
 
   STANDARD_STRING_KEYS = %i{authority_id id
   language source_script destination_script
-  name url creation_date adoption_date description
-  character source confirmation_date}
+  name creation_date adoption_date description
+  character source confirmation_date original_description}
 
-  STANDARD_ARRAY_KEYS = %i{notes}
+  STANDARD_ARRAY_KEYS = %i{notes implementation_notes original_notes url}
 
-  NONSTANDARD_KEYS = %i{special_rules original_description original_notes
-    implementation_notes}
+  NONSTANDARD_KEYS = %i{special_rules}
   
   NECESSARY_KEYS = %i{name language source_script destination_script}
 

data/lib/interscript/dsl.rb

@@ -76,7 +76,12 @@ module Interscript::DSL
     yaml = if yaml =~ /\A\s*\z/
       {}
     else
-      YAML.load(yaml, filename: exc_fname)
+      unsafe_load = if YAML.respond_to? :unsafe_load
+        :unsafe_load
+      else
+        :load
+      end
+      YAML.public_send(unsafe_load, yaml, filename: exc_fname)
     end
 
     md = Interscript::DSL::Metadata.new(yaml: true, map_name: map_name, library: library) do

data/lib/interscript/version.rb

@@ -1,3 +1,3 @@
 module Interscript
-  VERSION = "2.4.3"
+  VERSION = "2.4.5"
 end

data/lib/interscript/visualize/map.html.erb

@@ -35,7 +35,7 @@
 
   <% case k
      when :url %>
-    <dd><a href="<%= h v %>"><%= h v %></a>
+    <dd><% v.each do |i| %><a href="<%= h i %>"><%= h i %></a><% if i != v.last %>; <% end %><% end %>
   <% when :notes, :implementation_notes, :special_rules, :original_notes, :original_description # We ignore notes for now %>
   <% else %>
     <dd><%= h v %>
@@ -43,4 +43,4 @@
 <% end %>
 </dl>
 
-<%= render_stage(self.map.name, :main) %>
+<%= render_stage(self.map.name, :main) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interscript
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.5
 platform: ruby
 authors:
 - Ribose Inc.
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Interoperable script conversion systems