lutaml-uml 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba839d8caa2f9221a6b0464da0a92d8598bdb2390924725852b57b9be76ad29
-  data.tar.gz: 881666eb3a5069ab5895b062a305fbd042110ac1371fd94683bd697ae41df1d1
+  metadata.gz: caa272840dbf2e26c09465e9fc43ce87e27264d1304f3e517177e1c2aeb5ddd5
+  data.tar.gz: 63accfb7dc6651f7df5a2fa16e1f3049efeac98f2b7c45ab33797e5589955011
 SHA512:
-  metadata.gz: d088c3842b978978adc82074ba4fe9a0fe722bc5435f8879f33400f2a2e2bb25733381af7e888d3fd564e0870c727e7a6dbb85bc5847c986820093a97c0a102f
-  data.tar.gz: 5b456a84cc38d6fdc6e9f685ef4b6b2b135a000f83e7c620d95d5246f87b25ddf2b23da2c9d39fe76b69e6231423a995325a47d4e927d8518c7d7ff82a0e2394
+  metadata.gz: 60f0496d0d68e7ec42f96d2dea4e28b2f48be4ff46f079afc0a0041a31e9a0a32d6353f8a208a7194585c4e95a31a7fdaeb5e8bc21e94752b9ce8953d8b4655e
+  data.tar.gz: f1c58b701b5eff18c42c4fb8a38c9beab572663a345ea048abc112993f671b38e17ff8af9852951cc7650969715130996639bb4cb1eb517ba3cae83a023ee30e

data/LUTAML.adoc

@@ -118,9 +118,9 @@ Full syntax:
 
 [source,java]
 ----
-definition
+definition {
   inner text
-end definition
+}
 ----
 
 
@@ -204,9 +204,9 @@ example:
 ----
 class Figure {
   + radius {
-    definition
+    definition {
       Radius of the Figure
-    end definition
+    }
   }
 }
 ----

data/bin/yaml2lutaml

@@ -89,9 +89,9 @@ view_yaml["imports"].keys.each do |entry|
   sync_puts("#{import['modelType']} #{import_name} {", 2)
   if import["definition"]
     definition = <<~TEXT
-      definition
+      definition {
         #{import['definition']}
-      end definition
+      }
     TEXT
     sync_puts(definition, 4)
   end

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

@@ -291,9 +291,11 @@ module Lutaml
           spaces? >>
             str("definition") >>
             whitespace? >>
-            (str("end definition").absent? >> any).repeat.as(:definition) >>
+            str("{") >>
+            whitespace? >>
+            (str("}").absent? >> any).repeat.as(:definition) >>
             whitespace? >>
-            str("end definition")
+            str("}")
         end
 
         # -- Enum

data/lib/lutaml/uml/version.rb

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

data/spec/fixtures/dsl/diagram_definitions.lutaml

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

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

@@ -257,7 +257,7 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
         "this is multiline with `ascidoc`\n      comments\n      and list"
       end
       let(:attribute_definition) do
-        "this is attribute definition\n      with multiply lines"
+        "this is attribute definition\n        with multiply lines\n        end definition"
       end
 
       it "create comments for document and classes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie