lutaml-uml 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9fee04e0d3f8bf1a741dcce56ebfac843c1207d5f9f4dc8b9f42869db728f6
-  data.tar.gz: 58b0ed6fb1e66d0a34aed9fefcf6d4625f52234bf100c93ad06f62297ec3e2cb
+  metadata.gz: 5d7db5a90a481773906ffcd2985d36777ba62f2c79a1de83390c7890a4c9f7c4
+  data.tar.gz: 7d9229702c7b58d2a2d0c8f2261230eb941f7fd76a0f17c784d48da01a22c5c0
 SHA512:
-  metadata.gz: df205676bcafcb09265a81491fbca4b78b2a1dfc59d18f080e20e4ddf633a3aed9601d09cd78b32fbd297c283027681b94276e5ceb68e1613dc8cb8dcd036243
-  data.tar.gz: 9191a9ba6db3db78aa785a685e4c75c4cd69f84441cb3420dde4fbc02dec885ddcaf18c12f263aa5852439721609bb3e11930b7cbfcaf8c20b461b517a1bc84c
+  metadata.gz: ec111d11c2354621c95c3708296356906977f9c949f96a07c8e1ee71928733ff68089b5339bb2017f824fa76274fe2e043693ca48b7cbd1305c85756791097a0
+  data.tar.gz: 81de391a9fc9a1d546d82dcfde50b802a67e4bc28ffee88f08699faa6f54b3e7052107e2824c77dfd2b5cd40f3c78518757e7e1955c2715584225508f543389d

data/LUTAML.adoc

@@ -21,7 +21,9 @@ where:
 
 == DataTypes
 
-Lutaml supports 3 types of data_types: `data_type`, `primitive` and `enum`. Example of data types declaration:
+Lutaml supports 3 types of data_types: `data_type`, `primitive` and `enum`.
+
+Example of data types declaration:
 
 [source,java]
 ----
@@ -67,8 +69,8 @@ association name {
 
 where:
 
-* `owned_type` - optional, use to define bidirectional association(association|composition|aggregation|generalization|uses)
-* `member_type` - association type(association|composition|aggregation|generalization|uses)
+* `owned_type` - optional, use to define a bidirectional association (`association`|`composition`|`aggregation`|`generalization`|`uses`)
+* `member_type` - association type (`association`|`composition`|`aggregation`|`generalization`|`uses`)
 * `owned|member` - end of association, use `\#attribute_name` to set a role name
 * `property_string` - property string for attibutes associations
 * `cardinality` - examples: '1..*', '*'
@@ -142,7 +144,12 @@ Full syntax:
 
 where:
 
-* `visibility` can be equal to `-` - private, `+` - public, `#` - protected, `~` - friendly
+* `visibility` can be equal to
+** `-`: private
+** `+`: public
+** `#`: protected
+** `~`: friendly
+
 * `attribute` - attrbute keyword
 * `/` - symbolizes a derived attribute.
 * `multiplicity` -  Multiplicity is in square brackets (e.g. [1..*]).
@@ -178,14 +185,17 @@ enum A {
 }
 ----
 
+[[attribute-visibility]]
 === Attribute visibility
 
-Syntax for defining visibility: [+|-|#|~] [attribute] attribute_name. LutaML uses these modificators to define attribute(entry) visbility:
+Syntax for defining visibility: `[+|-|#|~] [attribute] attribute_name`.
 
-+ => public
-- => private
-# => protected
-~ => package
+LutaML uses these modificators to define attribute (entry) visbility:
+
+`+`:: public
+`-`:: private
+`#`:: protected
+`~`:: package
 
 example:
 
@@ -226,9 +236,20 @@ Syntax for defining methods:
 ----
 
 where:
-- `visibility` can be equal to `-` - private, `+` - public, `#` - protected, `~` - friendly
-- `parameter-list` - parameter list
-- `property-modifier` - can be equal to `redefines`, `query`, `ordered`(`unordered`), `unique`(`nonunique`)
+
+* `visibility` can be equal to
+** `-`: private
+** `+`: public
+** `#`: protected
+** `~`: friendly
+
+* `parameter-list`: parameter list
+
+* `property-modifier`: can be equal to
+** `redefines`
+** `query`
+** `ordered` (defaults to `unordered`)
+** `unique`(defaults to `nonunique`)
 
 Syntax for a `parameter-list`:
 
@@ -238,7 +259,12 @@ Syntax for a `parameter-list`:
 ----
 
 where:
-- `direction` - can be equal to `in`, `out`, `inout` or `return`
+
+* `direction` can be equal to
+** `in`
+** `out`
+** `inout`
+** `return`
 
 == import files
 
@@ -252,7 +278,8 @@ include path/to/file
 == Package syntax
 
 Namespaces
-Def.-A named element is an element that can have a name and a defined visibility (public, private, protected, package):
+
+A named element is an element that can have a name and a defined visibility (public, private, protected, package):
 
 [source,java]
 ----
@@ -286,7 +313,8 @@ abstract class Pet {}
 == Comment objects diagram
 
 Use `\**`(one line comment) or `*| |*`(multiline comment) to create comment object for diagram entry.
-If this syntax used inside class/enum/association block it will be created for owner of this block.
+
+If this syntax is used inside a `class`/`enum`/`association` block, it will be created for owner of this block.
 
 [source,java]
 ----
@@ -313,7 +341,7 @@ enum B {
 
 == Syntax comments
 
-Use `//` to create syntax comment, chars after // will be ignored during processing
+Use `//` to create syntax comment, chars after `//` will be ignored during processing.
 
 [source,java]
 ----
@@ -328,7 +356,7 @@ enum B {
 
 == Value specification
 
-A value specification indicates one or several values in a model. Examples for value specifications include simple, mathematical expressions, such as 4+2, and expressions with values from the object model, Integer::MAX_INT-1
+A value specification indicates one or several values in a model. Examples for value specifications include simple, mathematical expressions, such as `4+2`, and expressions with values from the object model, `Integer::MAX_INT-1`
 
 [source,java]
 ----
@@ -341,4 +369,4 @@ instance :{Class name, if any} {as ref name, optional} {
   {attribute name} = {attribute value}
   {attribute name}:{attribute class} = {attribute value}
 }
-----
+----

data/lib/lutaml/uml/association.rb

@@ -9,8 +9,10 @@ module Lutaml
                     :owner_end_attribute_name,
                     :owner_end_cardinality,
                     :owner_end_type,
+                    :owner_end_xmi_id,
                     :member_end,
                     :member_end_attribute_name,
+                    :member_end_xmi_id,
                     :member_end_cardinality,
                     :member_end_type,
                     :static,

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

@@ -151,14 +151,14 @@ module Lutaml
         rule(:title_keyword) { kw_title >> spaces }
         rule(:title_text) do
           match['"\''].maybe >>
-            match['a-zA-Z0-9_\- '].repeat(1).as(:title) >>
+            match['a-zA-Z0-9_\- ,.:;'].repeat(1).as(:title) >>
             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['a-zA-Z0-9_\- ,.:;'].repeat(1).as(:caption) >>
             match['"\''].maybe
         end
         rule(:caption_definition) { caption_keyword >> caption_text }

data/lib/lutaml/uml/top_element_attribute.rb

@@ -9,6 +9,7 @@ module Lutaml
       attr_accessor :name,
                     :visibility,
                     :type,
+                    :xmi_id,
                     :definition,
                     :contain,
                     :static,

data/lib/lutaml/uml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Uml
-    VERSION = "0.4.1"
+    VERSION = "0.4.3"
   end
 end

data/spec/fixtures/dsl/diagram_attributes.lutaml

@@ -1,5 +1,6 @@
 diagram MyView {
   fontname "Arial"
-  title "my diagram"
+  title "my diagram, another symbols: text."
   class Foo {}
+  caption "Block elements of StandardDocument, adapted from BasicDocument. Another - symbol"
 }

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

@@ -34,7 +34,9 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
 
       it "creates Lutaml::Uml::Document object and sets its attributes" do
         expect(parse).to be_instance_of(Lutaml::Uml::Document)
-        expect(parse.title).to eq("my diagram")
+        expect(parse.title).to eq("my diagram, another symbols: text.")
+        expect(parse.caption)
+          .to(eq("Block elements of StandardDocument, adapted from BasicDocument. Another - symbol"))
         expect(parse.fontname).to eq("Arial")
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie