railroad_diagrams 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 992d560c768d0ad4991ea5c774a60083b4a2f8c407b88c91abfe6c92ab73fea5
-  data.tar.gz: 108ce587863fb33a368d2e5278002ff6ee6bd6885576f6f7b9a7cd4e7c8eec3a
+  metadata.gz: 24208e2a21a6b8889468b2c4e3e2333e104acb223cc1611a42e294722b342c19
+  data.tar.gz: 30d4b980d2716ff688177c13ff1ea8c1a9aff4d4dd174417a940e9e5ec369e31
 SHA512:
-  metadata.gz: 6795906adf826df7a16207cea05cc54a3724cd66ab5dd0a9120643d5b2bf24f08ab7ac2b66d517478cd826c1baccc6faadfe1365b40dc6636bcd102e2ab393cf
-  data.tar.gz: e041c348cea71435c688dedb451eb368b00e71dac41cce239492766e7dd2991c61576c0087774064a948d9248538f74b233dfde439117b6587ed46df310a4ba3
+  metadata.gz: 98ab7a7089c41b92a6d923f51d7d5739e32d5db695a6a729038679409facc160eeecf0e7e7f3f80bf5d106a83e45d152ac00a8034405b220f667b092501b0cc9
+  data.tar.gz: fcf14ebcd8d09f4e21a464c44fae0b83d780e5a4d10f85ca0619c5dc5735b6afbfbe7313fa10676b79a02aff10b8de8a1c1fd987635c4999ee6c7cc6a3641025

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.2.0 - 2025-02-01
+
+- Fix an error for standalone mode.
+- Support Ruby 2.5 ~ 3.4.
+- Change default style.
+
 ## 0.1.0 - 2025-02-01
 
-- Initial release
+- Initial release.

data/lib/railroad_diagrams/choice.rb

@@ -201,7 +201,7 @@ module RailroadDiagrams
                     else
                       []
                     end
-        diagram_td = diagram_td.append_below(item_td, separator, move_entry:, move_exit:)
+        diagram_td = diagram_td.append_below(item_td, separator, move_entry: move_entry, move_exit: move_exit)
       end
       diagram_td
     end

data/lib/railroad_diagrams/comment.rb

@@ -31,7 +31,7 @@ module RailroadDiagrams
         text: @text
       )
       if @href
-        a = DiagramItem.new('a', attrs: { 'xlink:href' => @href }, text:).add(self)
+        a = DiagramItem.new('a', attrs: { 'xlink:href' => @href }, text: text).add(self)
         text.add(a)
       else
         text.add(self)

data/lib/railroad_diagrams/diagram.rb

@@ -71,8 +71,8 @@ module RailroadDiagrams
 
     def text_diagram
       separator, = TextDiagram.get_parts(['separator'])
-      diagram_td = items[0].text_diagram
-      items[1..].each do |item|
+      diagram_td = @items[0].text_diagram
+      @items[1..-1].each do |item|
         item_td = item.text_diagram
         item_td.expand(1, 1, 0, 0) if item.needs_space
         diagram_td = diagram_td.append_right(separator)
@@ -85,7 +85,7 @@ module RailroadDiagrams
       super
     end
 
-    def write_text(_write)
+    def write_text(write)
       output = text_diagram
       output = "#{output.lines.join("\n")}\n"
       output = output.gsub('&', '&amp;').gsub('<', '&lt;').gsub('>', '&gt;').gsub('"', '&quot;') if ESCAPE_HTML
@@ -98,7 +98,7 @@ module RailroadDiagrams
       Style.new(css).add(self)
       @attrs['xmlns'] = 'http://www.w3.org/2000/svg'
       @attrs['xmlns:xlink'] = 'http://www.w3.org/1999/xlink'
-      DiagramItem.write_svg(write)
+      super(write)
       @children.pop
       @attrs.delete('xmlns')
       @attrs.delete('xmlns:xlink')

data/lib/railroad_diagrams/diagram_item.rb

@@ -34,7 +34,7 @@ module RailroadDiagrams
         write.call(" #{name}=\"#{RailroadDiagrams.escape_attr(value)}\"")
       end
       write.call('>')
-      write.call("\n") if @name in %w[g svg]
+      write.call("\n") if %w[g svg].include?(@name)
       @children.each do |child|
         if child.is_a?(DiagramItem) || child.is_a?(Path) || child.is_a?(Style)
           child.write_svg(write)
@@ -73,5 +73,9 @@ module RailroadDiagrams
         [diff / 2, diff / 2]
       end
     end
+
+    def write_standalone(write, css = nil)
+      write_svg(write)
+    end
   end
 end

data/lib/railroad_diagrams/diagram_multi_container.rb

@@ -3,7 +3,7 @@
 module RailroadDiagrams
   class DiagramMultiContainer < DiagramItem
     def initialize(name, items, attrs = nil, text = nil)
-      super(name, attrs:, text:)
+      super(name, attrs: attrs, text: text)
       @items = items.map { |item| wrap_string(item) }
     end
 

data/lib/railroad_diagrams/horizontal_choice.rb

@@ -74,7 +74,7 @@ module RailroadDiagrams
 
       # lower track
       lower_span =
-        @items[1..].sum { |item| item.width + (item.needs_space ? 20 : 0) } +
+        @items[1..-1].sum { |item| item.width + (item.needs_space ? 20 : 0) } +
         ((@items.size - 2) * AR * 2) +
         (last.height.positive? ? AR : 0) -
         AR

data/lib/railroad_diagrams/multiple_choice.rb

@@ -70,7 +70,7 @@ module RailroadDiagrams
       Path.new(x + 30 + AR + @inner_width, y + @height).right(AR).add(self)
 
       # Do the elements that curve below
-      below = @items[(@default + 1)..] || []
+      below = @items[(@default + 1)..-1] || []
       distance_from_y = [10 + AR, default.height + default.down + VS + below.first.up].max if below.any?
 
       below.each_with_index do |item, i|

data/lib/railroad_diagrams/non_terminal.rb

@@ -49,7 +49,7 @@ module RailroadDiagrams
           attrs: {
             'xlink:href' => @href
           },
-          text:
+          text: text
         ).add(self)
         text.add(a)
       else

data/lib/railroad_diagrams/stack.rb

@@ -103,7 +103,7 @@ module RailroadDiagrams
           # The bottom item exits directly to its right.
           right_lines += [line * 2]
         end
-        left_pad, right_pad = TextDiagram._gaps(max_width, item_td.width)
+        left_pad, right_pad = TextDiagram.gaps(max_width, item_td.width)
         item_td = item_td.expand(left_pad, right_pad, 0, 0)
         diagram_td = if item_num.zero?
                        item_td

data/lib/railroad_diagrams/style.rb

@@ -9,8 +9,11 @@ module RailroadDiagrams
     class << self
       def default_style
         <<~CSS
+          * {
+            color: #333333;
+          }
           svg.railroad-diagram {
-            background-color:hsl(30,20%,95%);
+            background-color: white;
           }
           svg.railroad-diagram path {
             stroke-width:3;
@@ -21,17 +24,26 @@ module RailroadDiagrams
             font:bold 14px monospace;
             text-anchor:middle;
           }
-          svg.railroad-diagram text.label{
+          svg.railroad-diagram text.label {
             text-anchor:start;
           }
-          svg.railroad-diagram text.comment{
+          svg.railroad-diagram text.comment {
             font:italic 12px monospace;
           }
-          svg.railroad-diagram rect{
+          svg.railroad-diagram rect {
             stroke-width:3;
-            stroke:black;
+            stroke: #333333;
             fill:hsl(120,100%,90%);
           }
+          svg.railroad-diagram path {
+            stroke: #333333;
+          }
+          svg.railroad-diagram .terminal rect {
+            fill: hsl(190, 100%, 83%);
+          }
+          svg.railroad-diagram .non-terminal rect {
+            fill: hsl(223, 100%, 83%);
+          }
           svg.railroad-diagram rect.group-box {
             stroke: gray;
             stroke-dasharray: 10 5;

data/lib/railroad_diagrams/terminal.rb

@@ -46,7 +46,7 @@ module RailroadDiagrams
         text: @text
       )
       if @href
-        a = DiagramItem.new('a', attrs: { 'xlink:href' => @href }, text:).add(self)
+        a = DiagramItem.new('a', attrs: { 'xlink:href' => @href }, text: text).add(self)
         text.add(a)
       else
         text.add(self)

data/lib/railroad_diagrams/text_diagram.rb

@@ -139,6 +139,32 @@ module RailroadDiagrams
         string + (pad * (gap / pad.length))
       end
 
+      def get_parts(part_names)
+        part_names.map { |name| @parts[name] }
+      end
+
+      def enclose_lines(lines, lefts, rights)
+        unless lines.length == lefts.length && lines.length == rights.length
+          raise 'All arguments must be the same length'
+        end
+
+        lines.each_with_index.map { |line, i| lefts[i] + line + rights[i] }
+      end
+
+      def gaps(outer_width, inner_width)
+        diff = outer_width - inner_width
+        case INTERNAL_ALIGNMENT
+        when 'left'
+          [0, diff]
+        when 'right'
+          [diff, 0]
+        else
+          left = diff / 2
+          right = diff - left
+          [left, right]
+        end
+      end
+
       private
 
       def rectish(rect_type, data, dashed)
@@ -192,32 +218,6 @@ module RailroadDiagrams
 
         new(entry, exit, new_lines)
       end
-
-      def enclose_lines(lines, lefts, rights)
-        unless lines.length == lefts.length && lines.length == rights.length
-          raise 'All arguments must be the same length'
-        end
-
-        lines.each_with_index.map { |line, i| lefts[i] + line + rights[i] }
-      end
-
-      def gaps(outer_width, inner_width)
-        diff = outer_width - inner_width
-        case INTERNAL_ALIGNMENT
-        when 'left'
-          [0, diff]
-        when 'right'
-          [diff, 0]
-        else
-          left = diff / 2
-          right = diff - left
-          [left, right]
-        end
-      end
-
-      def get_parts(part_names)
-        part_names.map { |name| @parts[name] }
-      end
     end
 
     attr_reader :entry, :exit, :height, :lines, :width
@@ -282,7 +282,7 @@ module RailroadDiagrams
       left = [pad * left_width] * @height
       right = [pad * (total_padding - left_width)] * @height
 
-      self.class.new(@entry, @exit, enclose_lines(@lines, left, right))
+      self.class.new(@entry, @exit, self.class.enclose_lines(@lines, left, right))
     end
 
     def copy

data/lib/railroad_diagrams/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailroadDiagrams
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railroad_diagrams
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yudai Takada
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
+date: 2025-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Generate SVG railroad syntax diagrams, like on JSON.org.
 email:
@@ -60,6 +61,7 @@ metadata:
   changelog_uri: https://github.com/ydah/railroad_diagrams/releases
   bug_tracker_uri: https://github.com/ydah/railroad_diagrams/issues
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,14 +69,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: "\U0001F6E4️ A tiny Ruby+SVG library for drawing railroad syntax diagrams
   like JSON.org."