Merge pull request #39 from leoarnold/ruby-3

Add support for Ruby 3. Fixes #36

Author: os6sense

.github/workflows/rspec.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.6.6', '2.7.2' ]
+        ruby: [ '2.6.6', '2.7.2', '3.0.3', '3.1.1' ]
     env:
       RAILS_ENV: test
     steps:

lib/xumlidot/diagram/dot.rb

@@ -21,7 +21,7 @@ def draw # rubocop:disable Metrics/AbcSize
         end
 
         @stack.traverse do |klass|
-          # Check - i shouldnt need to extend twice
+          # Check - i shouldn't need to extend twice
           klass.extend(::Xumlidot::Diagram::Dot::Klass)
 
           if ::Xumlidot::Options.inheritance

lib/xumlidot/loader.rb

@@ -30,7 +30,7 @@ def load
       # we will create a dummy class.
       #
       # if a class is inherited from, we want to find it using the constant lookup
-      # rules definind in the resolver
+      # rules defining in the resolver
       #
       # and what ... we want to add a reference too it?
       #

lib/xumlidot/parsers/args.rb

@@ -15,7 +15,7 @@ def initialize(exp)
 
         @arguments = ::Xumlidot::Types::Arguments.new
 
-        process(exp)
+        process(Sexp.new.concat(exp))
       rescue StandardError => _e
         warn " ** bug: unable to process args #{exp} "
       end

lib/xumlidot/parsers/generic.rb

@@ -48,7 +48,7 @@ def process_class(exp,
                         type: Xumlidot::Types::Klass)
 
         Scope.set_visibility
-        definition = definition_parser.new(exp.dup[0..2], @class_stack).definition
+        definition = definition_parser.new(Sexp.new.concat(exp[0..2]), @class_stack).definition
 
         warn definition.to_s if ::Xumlidot::Options.debug == true
         super(exp) do

spec/integration/lib_version/lib_version_spec.rb

@@ -4,11 +4,11 @@
 
 describe 'Output of lib/version.rb' do
   let(:directory) { 'spec/app/lib/version' }
-  # let(:expect_xmi) { File.open('spec/integration/lib_version/lib_version.xmi lib_version.xmi').read }
+  # let(:expect_xmi) { File.read('spec/integration/lib_version/lib_version.xmi lib_version.xmi') }
   let(:expect_dot) { File.read('spec/integration/lib_version/lib_version.dot') }
 
   specify { expect { generate_dot(directory) }.to output(expect_dot).to_stdout }
 
-  # TODO: Make xmi output id repeatble ...
+  # TODO: Make xmi output id repeatable ...
   # specify { expect { generate_xmi(directory) }.to output(expect_xmi).to_stdout }
 end

xumlidot.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.email = ['[email protected]']
   s.executables = ['xumlidot']
   s.homepage = 'http://github.com/os6sense/xumlidot'
-  s.required_ruby_version = '>= 2.6', '< 3'
+  s.required_ruby_version = '>= 2.6', '< 4'
   s.license = 'MIT'
   s.name = 'xumlidot'
   s.summary = %(Generates DOT and XMI for Ruby and Rails UML Class Diagrams. )
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.version = '0.1.1'
 
+  s.add_dependency 'rexml'
   s.add_dependency 'ruby_parser'
   s.add_dependency 'sexp_processor'