ttl2html 2.0.11 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9724547c455f091392715e13f386a3e0287c688cfffaf90f9609cb01ff887d4
-  data.tar.gz: 31e1fe0848b38b0015eaa405d51bb8040ba7f3bf0852c2968fc63ca2a4cfd708
+  metadata.gz: 7bea49c3e41eef2b8b8951a536044c77b654d36f929f01bff0f7ab4c183376c2
+  data.tar.gz: 02ce27d24d451c56c6096fc4190a3b47976cb46832ba5c40689074bec5934513
 SHA512:
-  metadata.gz: b06c2ffd5d06abeffddc1ee87910cc6b0035949742cd36433f52e1e3b6efeced85f09c0dc7601a4ad9650deec3fb788ad8ad71e4924d5189c1f9766ca10dcec7
-  data.tar.gz: 0f3e934743a63fbcdabbe93aabbd78408891285ece08eb32f0a7fe752c0a296648204ae508ba2931e93a5312391e497e310427d5e05aa34c6dba65ff979177c7
+  metadata.gz: a5e50ad48925e650ffcc6d020977478a26e3bf19d11ea82ab94c9549cbb670ef59d620801837bea591d8daba4381af0a38dc0fc773aa8717cc02c75d5e816912
+  data.tar.gz: 6c41975ecb5674e5595acd7a51556d76a0c90515dbb8128f89f3fc58a9ddb8939a185df091c5a07b2bd8276a88ae631380eb4df72850b04b67812cb03058b2f8

data/lib/ttl2html/version.rb

@@ -1 +1 @@
-TTL2HTML::VERSION = "2.0.11"
+TTL2HTML::VERSION = "2.1.0"

data/lib/ttl2html.rb

@@ -6,6 +6,7 @@ require "yaml"
 require "nokogiri"
 require "rdf/turtle"
 require "ruby-progressbar"
+require "parallel"
 
 require "ttl2html/util"
 require "ttl2html/template"
@@ -40,19 +41,21 @@ module TTL2HTML
     end
 
     def load_turtle(file)
-      STDERR.puts "loading #{file}..."
+      $stderr.puts "loading #{file}..."
       count = 0
+      subjects = Set.new
       if file.end_with?(".gz")
         io = Zlib::GzipReader.open(file)
       else
         io = File.open(file)
       end
       RDF::Format.for(:turtle).reader.new(io) do |reader|
-        reader.statements.each do |statement|
+        reader.each_statement do |statement|
           s = statement.subject
           v = statement.predicate
           o = statement.object
           count += 1
+          subjects << s
           @data[s.to_s] ||= {}
           @data[s.to_s][v.to_s] ||= []
           if o.is_a? RDF::URI or o.is_a? RDF::Node
@@ -66,7 +69,7 @@ module TTL2HTML
         end
         @prefix.merge! reader.prefixes
       end
-      STDERR.puts "#{count} triples. #{@data.size} subjects."
+      $stderr.puts "#{count} triples. #{subjects.size} subjects."
       @data
     end
     def format_turtle(subject, depth = 1)
@@ -122,17 +125,17 @@ module TTL2HTML
     end
 
     def each_data(label = :each_data)
-      progressbar = ProgressBar.create(title: label,
-        total: @data.size,
-        format: "(%t) %a %e %P% Processed: %c from %C")
-      @data.keys.sort_by do|uri|
+      progressbar_options = {
+        title: label.to_s,
+        format: "(%t) %a %e %P% Processed: %c from %C"
+      }
+      data = @data.keys.sort_by do|uri|
         [ uri.count("/"), uri.size, uri ] 
-      end.reverse_each do |uri|
-        progressbar.increment
+      end.reverse
+      Parallel.each(data, progress: progressbar_options) do |uri|
         next if not uri.start_with? @config[:base_uri]
         yield uri, @data[uri]
       end
-      progressbar.finish
     end
     def output_html_files
       template = Template.new("", @config)
@@ -157,6 +160,7 @@ module TTL2HTML
         end
       end
       @config[:orders_with_class] = shapes2orders(shapes)
+      Dir.mkdir @config[:output_dir] if @config[:output_dir] and not File.exist? @config[:output_dir]
       each_data(:output_html_files) do |uri, v|
         template = Template.new("default.html.erb", @config)
         param = @config.dup
@@ -172,7 +176,6 @@ module TTL2HTML
         end
         file = uri_mapping_to_path(uri, @config, ".html")
         if @config[:output_dir]
-          Dir.mkdir @config[:output_dir] if not File.exist? @config[:output_dir]
           file = File.join(@config[:output_dir], file)
         end
         if template.find_template_path("_default.html.erb")
@@ -190,7 +193,7 @@ module TTL2HTML
           end
         end
         if subjects.empty?
-          STDERR.puts "WARN: top_class parameter specified as [#{@config[:top_class]}], but there is no instance data."
+          $stderr.puts "WARN: top_class parameter specified as [#{@config[:top_class]}], but there is no instance data."
         else
           template = Template.new("index.html.erb", @config)
           param = @config.dup
@@ -469,6 +472,7 @@ module TTL2HTML
     end
 
     def output_turtle_files
+      Dir.mkdir @config[:output_dir] if @config[:output_dir] and not File.exist? @config[:output_dir]
       each_data(:output_turtle_files) do |uri, v|
         file = uri_mapping_to_path(uri, @config, ".ttl")
         if @config[:output_dir]

data/templates/shape-table.html.erb

@@ -66,7 +66,7 @@
       <dd class="col-sm-10"><%=h url %></dd>
       <%- end -%>
       </dl>
-    <%- end -%>
-  </td></tr>
+    </td></tr>
   </tfoot>
+  <%- end -%>
 </table>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ttl2html
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.1.0
 platform: ruby
 authors:
 - Masao Takaku
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,6 +51,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +211,6 @@ homepage: https://github.com/masao/ttl2html
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: ttl2html
 test_files: []