lutaml-uml 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b549fe48dc2957bc3f44d69d32f0727af97ec27755e35f47a2580a307e01edb6
-  data.tar.gz: f9ce93042ba36d940323413f03ffc952b1c174beedc81441a2cd7e7b37a4fa5d
+  metadata.gz: caa272840dbf2e26c09465e9fc43ce87e27264d1304f3e517177e1c2aeb5ddd5
+  data.tar.gz: 63accfb7dc6651f7df5a2fa16e1f3049efeac98f2b7c45ab33797e5589955011
 SHA512:
-  metadata.gz: e3070e60d69100ce2696ab9e4e9efb89ad6331fcf962da7b16222107a18b681faddae48cad66ea2b0d6a03c5871583a299d6d5ab9a41ea8f4451844cfa5d9023
-  data.tar.gz: f09245563a2441c7a3714763e820998341d949d6c2c51b4e12599109c3583513cbe1a85c0d3fca3407fe6b5c2c2bd743e679e39a1755c565b7fd1b4b6bd58df7
+  metadata.gz: 60f0496d0d68e7ec42f96d2dea4e28b2f48be4ff46f079afc0a0041a31e9a0a32d6353f8a208a7194585c4e95a31a7fdaeb5e8bc21e94752b9ce8953d8b4655e
+  data.tar.gz: f1c58b701b5eff18c42c4fb8a38c9beab572663a345ea048abc112993f671b38e17ff8af9852951cc7650969715130996639bb4cb1eb517ba3cae83a023ee30e

data/.github/workflows/windows.yml

@@ -36,9 +36,16 @@ jobs:
           gem install bundler
           bundle config --local path vendor/bundle
           bundle install --jobs 4 --retry 3
-      - name: Install Grpahviz Windows
+      - name: Install graphviz
+        uses: nick-invision/retry@v1
+        with:
+          polling_interval_seconds: 5
+          timeout_minutes: 5
+          max_attempts: 3
+          command: choco install --no-progress graphviz --version 2.38.0.20190211
+      - name: Check dot command
         run: |
-          cinst -y graphviz
+          dot -?
       - name: Run specs
         run: |
           bundle exec rake

data/LUTAML.adoc

@@ -110,6 +110,20 @@ class Relationship {
 class Element {}
 ----
 
+== Class' multiline "definition" property
+
+=== Definition
+
+Full syntax:
+
+[source,java]
+----
+definition {
+  inner text
+}
+----
+
+
 == Attributes/entries
 
 === Definition
@@ -118,7 +132,7 @@ Full syntax:
 
 [source,java]
 ----
-[visibility][/][attribute] name [:type][multiplicity][=initial value][{property string}]
+[visibility][/][attribute] name [:type][multiplicity][=initial value][{attribute body}]
 ----
 
 where:
@@ -128,11 +142,7 @@ where:
 * `/` - symbolizes a derived attribute.
 * `multiplicity` -  Multiplicity is in square brackets (e.g. [1..*]).
 * `initial value` - Default value specifies the initial value of the attribute.
-* `property string` - Property string indicates a modifier that applies to the attribute:
-  ** {readonly}: the property can be read but not changed.
-  ** {union}: the property is a union of subsets.
-  ** {subsets <property>}: the property is a subset of <property>.
-  ** {redefines <property>}: the property is a new definition of <property> (overwritten by inheritance).
+* `{attribute body}` - Body of attribute, additional properties for attribute
 
 
 One can use explicit or implicit syntax for attribute definition
@@ -186,6 +196,21 @@ class Figure {
 }
 ----
 
+=== Additional attribute' properties
+
+example:
+
+[source,java]
+----
+class Figure {
+  + radius {
+    definition {
+      Radius of the Figure
+    }
+  }
+}
+----
+
 == Methods
 
 Syntax for defining methods:

data/bin/plantuml2lutaml

@@ -6,7 +6,7 @@
 # Usage: bin/plantuml2lutaml /path/to/plantuml.wsd
 
 file_path = ARGV[0]
-FILE_NAME = File.basename(file_path, '.wsd')
+FILE_NAME = File.basename(file_path, ".wsd")
 wsd_file = File.new(ARGV[0])
 
 def sync_puts(line, level = 0)
@@ -18,36 +18,36 @@ SKIPPED_LINES_REGEXP = /^(@startuml|'\*{7}|note|@enduml|\!|'\/)/
 COMMENT_START = /\/'/
 COMMENT_END = /'\//
 ASSOCIATION_MAPPINGS = {
-  /-\|>/ => ',inheritance',
-  /<\|-/ => 'inheritance,',
-  /->/ => ',direct',
-  /<-/ => 'direct,'
-}
+  /-\|>/ => ",inheritance",
+  /<\|-/ => "inheritance,",
+  /->/ => ",direct",
+  /<-/ => "direct,",
+}.freeze
 
 in_comment_block = false
 
 def transform_line(line)
   return sync_puts(line, 2) if ASSOCIATION_MAPPINGS.keys.none? { |key| line =~ key }
 
-  owner_type, member_type = ASSOCIATION_MAPPINGS.find { |(key,value)| line =~ key }.last.split(',')
-  blocks = line.split(' ')
+  owner_type, member_type = ASSOCIATION_MAPPINGS.detect { |(key, _value)| line =~ key }.last.split(",")
+  blocks = line.split(" ")
   owner = blocks.first
   member = blocks.last
   sync_puts("association {", 2)
   sync_puts("owner #{owner}", 4)
   sync_puts("member #{member}", 4)
-  sync_puts("owner_type #{owner_type}", 4) if owner_type.to_s.length > 0
-  sync_puts("member_type #{member_type}", 4) if member_type.to_s.length > 0
+  sync_puts("owner_type #{owner_type}", 4) if !owner_type.to_s.empty?
+  sync_puts("member_type #{member_type}", 4) if !member_type.to_s.empty?
   sync_puts("}", 2)
 end
 
 sync_puts("diagram #{FILE_NAME} {")
 wsd_file.readlines.each do |line|
-  if line =~ COMMENT_START
+  if line.match?(COMMENT_START)
     in_comment_block = true
   end
 
-  if line =~ COMMENT_END
+  if line.match?(COMMENT_END)
     in_comment_block = false
   end
 
@@ -55,4 +55,4 @@ wsd_file.readlines.each do |line|
 
   transform_line(line)
 end
-sync_puts("}")
+sync_puts("}")

data/bin/yaml2lutaml

@@ -75,6 +75,7 @@ def process_association(owner, values, encountered_relations)
 end
 sync_puts("diagram #{File.basename(ARGV[0], 'yml')[0..-2]} {")
 sync_puts("title '#{view_yaml['title']}'", 2)
+sync_puts("caption '#{view_yaml['caption']}'", 2)
 
 # Class associations notations
 view_yaml["relations"]&.each do |values|
@@ -83,20 +84,55 @@ end
 
 view_yaml["imports"].keys.each do |entry|
   import = YAML.safe_load(File.read(File.join(models_path, "#{entry}.yml")))
-  import_name = import["name"] ||  File.basename(entry)
+  import_name = import["name"] || File.basename(entry)
   # Class notation
   sync_puts("#{import['modelType']} #{import_name} {", 2)
+  if import["definition"]
+    definition = <<~TEXT
+      definition {
+        #{import['definition']}
+      }
+    TEXT
+    sync_puts(definition, 4)
+  end
   import["values"]&.each_pair do |key, values|
-    sync_puts("#{key}", 4)
+    result_string = key
+    if values["definition"]
+      result_string += <<~TEXT
+        {
+          definition
+          #{values['definition']}
+          end definition
+        }
+      TEXT
+    end
+    sync_puts(result_string, 4)
   end
   import["attributes"]&.each_pair do |key, values|
+    definition = values["definition"]
     cardinality = if values["cardinality"]
                     cardinality_val = values["cardinality"]
                     "[#{cardinality_val['min']}..#{cardinality_val['max']}]"
                   else
                     ""
                   end
-    sync_puts("+#{key}: #{values['type']} #{cardinality}", 4)
+    result_string = "+#{key}"
+    if values["type"]
+      result_string += ": #{values['type']}"
+    end
+    if cardinality
+      result_string += " #{cardinality}"
+    end
+    if definition
+      result_string += <<~TEXT
+        {
+          definition
+          #{definition}
+          end definition
+        }
+      TEXT
+    end
+    sync_puts(result_string, 4)
   end
   sync_puts("}", 2)
 

data/lib/lutaml/uml/class.rb

@@ -16,6 +16,7 @@ module Lutaml
 
       attr_reader :associations,
                   :attributes,
+                  :definition,
                   :members,
                   :modifier
 
@@ -31,6 +32,10 @@ module Lutaml
         @modifier = value.to_s # TODO: Validate?
       end
 
+      def definition=(value)
+        @definition = value.to_s
+      end
+
       def attributes=(value)
         @attributes = value.to_a.map do |attr|
           TopElementAttribute.new(attr)

data/lib/lutaml/uml/data_type.rb

@@ -3,8 +3,11 @@
 module Lutaml
   module Uml
     class DataType < Class
-      def keyword
-        "dataType"
+      attr_reader :keyword
+
+      def initialize(attributes = {})
+        super
+        @keyword = "dataType"
       end
     end
   end

data/lib/lutaml/uml/enum.rb

@@ -12,7 +12,14 @@ module Lutaml
 
       attr_reader :attributes,
                   :members,
-                  :modifier
+                  :modifier,
+                  :definition,
+                  :keyword
+
+      def initialize(attributes = {})
+        super
+        @keyword = "enumeration"
+      end
 
       def attributes=(value)
         @attributes = value.to_a.map do |attr|
@@ -20,14 +27,14 @@ module Lutaml
         end
       end
 
+      def definition=(value)
+        @definition = value.to_s
+      end
+
       # TODO: reserved name, change
       def methods
         []
       end
-
-      def keyword
-        "enumeration"
-      end
     end
   end
 end

data/lib/lutaml/uml/formatter/graphviz.rb

@@ -322,12 +322,7 @@ module Lutaml
         end
 
         def generate_from_dot(input)
-          # https://github.com/glejeune/Ruby-Graphviz/issues/78
-          # Ruby-Graphviz has an old bug when html labels was not displayed
-          #  property because of `<` and `>` characters escape, add additional
-          #   `<` and `>` symbols to workaround it
-          escaped_dot = input.gsub("<<", "<<<").gsub(">>", ">>>")
-          Lutaml::Layout::GraphVizEngine.new(input: escaped_dot).render(@type)
+          Lutaml::Layout::GraphVizEngine.new(input: input).render(@type)
         end
 
         def generate_graph_name(name)

data/lib/lutaml/uml/parsers/dsl.rb

@@ -53,6 +53,7 @@ module Lutaml
           realizes
           static
           title
+          caption
         ].freeze
 
         KEYWORDS.each do |keyword|
@@ -132,7 +133,8 @@ module Lutaml
             attribute_name >>
             match['"\''].maybe >>
             attribute_type? >>
-            cardinality?)
+            cardinality? >>
+            class_body?)
             .as(:attributes)
         end
 
@@ -143,6 +145,13 @@ module Lutaml
             match['"\''].maybe
         end
         rule(:title_definition) { title_keyword >> title_text }
+        rule(:caption_keyword) { kw_caption >> spaces }
+        rule(:caption_text) do
+          match['"\''].maybe >>
+            match['a-zA-Z0-9_\- '].repeat(1).as(:caption) >>
+            match['"\''].maybe
+        end
+        rule(:caption_definition) { caption_keyword >> caption_text }
 
         rule(:fontname_keyword) { kw_fontname >> spaces }
         rule(:fontname_text) do
@@ -252,7 +261,8 @@ module Lutaml
         end
         rule(:class_keyword) { kw_class >> spaces }
         rule(:class_inner_definitions) do
-          attribute_definition |
+          definition_body |
+            attribute_definition |
             comment_definition |
             comment_multiline_definition
         end
@@ -276,10 +286,23 @@ module Lutaml
             class_body?
         end
 
+        # -- Definition
+        rule(:definition_body) do
+          spaces? >>
+            str("definition") >>
+            whitespace? >>
+            str("{") >>
+            whitespace? >>
+            (str("}").absent? >> any).repeat.as(:definition) >>
+            whitespace? >>
+            str("}")
+        end
+
         # -- Enum
         rule(:enum_keyword) { kw_enum >> spaces }
         rule(:enum_inner_definitions) do
-          attribute_definition |
+          definition_body |
+            attribute_definition |
             comment_definition |
             comment_multiline_definition
         end
@@ -339,6 +362,7 @@ module Lutaml
         rule(:diagram_keyword) { kw_diagram >> spaces? }
         rule(:diagram_inner_definitions) do
           title_definition |
+            caption_definition |
             fontname_definition |
             class_definition.as(:classes) |
             enum_definition.as(:enums) |

data/lib/lutaml/uml/parsers/dsl_preprocessor.rb

@@ -27,7 +27,7 @@ module Lutaml
         end
 
         def process_include_line(include_root, line)
-          include_path_match = line.match(/\s*include\s+(.+)/)
+          include_path_match = line.match(/^\s*include\s+(.+)/)
           return line if include_path_match.nil?
 
           path_to_file = include_path_match[1].strip

data/lib/lutaml/uml/primitive_type.rb

@@ -3,8 +3,11 @@
 module Lutaml
   module Uml
     class PrimitiveType < DataType
-      def keyword
-        "primitive"
+      attr_reader :keyword
+
+      def initialize(attributes = {})
+        super
+        @keyword = "primitive"
       end
     end
   end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -4,6 +4,7 @@ module Lutaml
   module Uml
     class TopElementAttribute
       include HasAttributes
+      include HasMembers
 
       attr_accessor :name,
                     :visibility,

data/lib/lutaml/uml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Uml
-    VERSION = "0.2.2"
+    VERSION = "0.2.7"
   end
 end

data/lutaml-uml.gemspec

@@ -24,17 +24,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.executables   = %w[lutaml-uml]
 
-  spec.add_runtime_dependency "activesupport", "~> 5.0"
   spec.add_runtime_dependency "hashie", "~> 4.1.0"
   spec.add_runtime_dependency "parslet", "~> 1.7.1"
   spec.add_runtime_dependency "ruby-graphviz", "~> 1.2"
   spec.add_runtime_dependency "thor", "~> 1.0"
 
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "nokogiri", "~> 1.10"
-  spec.add_development_dependency "rubocop", "~> 0.54.0"
-  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "~> 0.54.0"
 end

data/spec/fixtures/dsl/diagram_definitions.lutaml

@@ -0,0 +1,23 @@
+diagram MyView {
+  title "my diagram"
+
+  class AddressClassProfile {
+    definition {
+      this is multiline with `ascidoc`
+      comments
+      and list
+    }
+    +addressClassProfile: CharacterString [0..1]
+  }
+
+  class AttributeProfile {
+    imlicistAttributeProfile: CharacterString [0..1] {
+      definition
+      {
+        this is attribute definition
+        with multiply lines
+        end definition
+      }
+    }
+  }
+}

data/spec/lutaml/uml/parsers/dsl_spec.rb

@@ -248,5 +248,29 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
 
       it_behaves_like "the correct graphviz formatting"
     end
+
+    context "when defninition directives included" do
+      let(:content) do
+        File.new(fixtures_path("dsl/diagram_definitions.lutaml"))
+      end
+      let(:class_definition) do
+        "this is multiline with `ascidoc`\n      comments\n      and list"
+      end
+      let(:attribute_definition) do
+        "this is attribute definition\n        with multiply lines\n        end definition"
+      end
+
+      it "create comments for document and classes" do
+        expect(by_name(parse.classes, "AddressClassProfile").definition)
+          .to(eq(class_definition))
+        expect(by_name(parse.classes, "AttributeProfile")
+                .attributes
+                .first
+                .definition)
+          .to(eq(attribute_definition))
+      end
+
+      it_behaves_like "the correct graphviz formatting"
+    end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -81,61 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.54.0
 description: UML model module for LutaML.
 email:
 - open.source@ribose.com'
@@ -297,6 +283,7 @@ files:
 - spec/fixtures/dsl/diagram_comments.lutaml
 - spec/fixtures/dsl/diagram_concept_model.lutaml
 - spec/fixtures/dsl/diagram_data_types.lutaml
+- spec/fixtures/dsl/diagram_definitions.lutaml
 - spec/fixtures/dsl/diagram_includes.lutaml
 - spec/fixtures/dsl/diagram_multiply_classes.lutaml
 - spec/fixtures/dsl/shared.lutaml