lutaml-uml 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa272840dbf2e26c09465e9fc43ce87e27264d1304f3e517177e1c2aeb5ddd5
-  data.tar.gz: 63accfb7dc6651f7df5a2fa16e1f3049efeac98f2b7c45ab33797e5589955011
+  metadata.gz: ef28b2562bcae4b385b3be898a71d6c326c59d5167c94ee1231932df060d5eee
+  data.tar.gz: 39519359dc16f9532379b5ce15aef7e8ed6d37a1ae5afa2e22253c025505d0ab
 SHA512:
-  metadata.gz: 60f0496d0d68e7ec42f96d2dea4e28b2f48be4ff46f079afc0a0041a31e9a0a32d6353f8a208a7194585c4e95a31a7fdaeb5e8bc21e94752b9ce8953d8b4655e
-  data.tar.gz: f1c58b701b5eff18c42c4fb8a38c9beab572663a345ea048abc112993f671b38e17ff8af9852951cc7650969715130996639bb4cb1eb517ba3cae83a023ee30e
+  metadata.gz: 8b2464f9bc2d0f95a3baf5025ca2853537e6abd175a62be6f4f427e7f5f3e13f75f7ec9d2f7c9a675bd17be67b913da3a0b690c806e63a12f0633187471a6ec6
+  data.tar.gz: 72a944718bd7c57c8146197f10810b40a4026cf71150f65b0ce7c17158bf046815ce71da1845c8b9d6d720521fa693fb006a50c8e02fac31b44ad8ae2b521fc3

data/bin/yaml2lutaml

@@ -100,9 +100,9 @@ view_yaml["imports"].keys.each do |entry|
     if values["definition"]
       result_string += <<~TEXT
         {
-          definition
+          definition {
           #{values['definition']}
-          end definition
+          }
         }
       TEXT
     end

data/lib/lutaml/uml/class.rb

@@ -16,7 +16,6 @@ module Lutaml
 
       attr_reader :associations,
                   :attributes,
-                  :definition,
                   :members,
                   :modifier
 
@@ -32,10 +31,6 @@ 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/enum.rb

@@ -27,10 +27,6 @@ module Lutaml
         end
       end
 
-      def definition=(value)
-        @definition = value.to_s
-      end
-
       # TODO: reserved name, change
       def methods
         []

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

@@ -82,9 +82,9 @@ module Lutaml
               str(")")).maybe
         end
         rule(:cardinality_body_definition) do
-          match['0-9\*'].as(:min) >>
+          match['0-9\*'].as('min') >>
             str("..").maybe >>
-            match['0-9\*'].as(:max).maybe
+            match['0-9\*'].as('max').maybe
         end
         rule(:cardinality) do
           str("[") >>
@@ -293,9 +293,9 @@ module Lutaml
             whitespace? >>
             str("{") >>
             whitespace? >>
-            (str("}").absent? >> any).repeat.as(:definition) >>
+            (match("[\n\s]}").absent? >> any).repeat.as(:definition) >>
             whitespace? >>
-            str("}")
+            str('}')
         end
 
         # -- Enum

data/lib/lutaml/uml/top_element.rb

@@ -6,6 +6,7 @@ module Lutaml
       include HasAttributes
 
       attr_accessor :name,
+                    :definition,
                     :xmi_id,
                     :xmi_uuid,
                     :namespace,
@@ -42,6 +43,16 @@ module Lutaml
 
         the_name
       end
+
+      def definition=(value)
+        @definition = value
+                        .to_s
+                        .gsub(/\\}/, '}')
+                        .gsub(/\\{/, '{')
+                        .split("\n")
+                        .map(&:strip)
+                        .join("\n")
+      end
     end
   end
 end

data/lib/lutaml/uml/top_element_attribute.rb

@@ -21,6 +21,16 @@ module Lutaml
         update_attributes(attributes)
       end
       # rubocop:enable Rails/ActiveRecordAliases
+
+      def definition=(value)
+        @definition = value
+                        .to_s
+                        .gsub(/\\}/, '}')
+                        .gsub(/\\{/, '{')
+                        .split("\n")
+                        .map(&:strip)
+                        .join("\n")
+      end
     end
   end
 end

data/lib/lutaml/uml/version.rb

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

data/spec/fixtures/dsl/diagram_definitions.lutaml

@@ -6,6 +6,7 @@ diagram MyView {
       this is multiline with `ascidoc`
       comments
       and list
+      \{foo\} \{name\}
     }
     +addressClassProfile: CharacterString [0..1]
   }
@@ -16,6 +17,7 @@ diagram MyView {
       {
         this is attribute definition
         with multiply lines
+        \{foo\} \{name\}
         end definition
       }
     }

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

@@ -121,7 +121,7 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
           expect(association.member_end).to(eq("AttributeProfile"))
           expect(association.member_end_attribute_name)
             .to(eq("attributeProfile"))
-          expect(association.member_end_cardinality).to(eq(min: "0", max: "*"))
+          expect(association.member_end_cardinality).to(eq("min" => "0", "max" => "*"))
         end
       end
 
@@ -254,10 +254,10 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
         File.new(fixtures_path("dsl/diagram_definitions.lutaml"))
       end
       let(:class_definition) do
-        "this is multiline with `ascidoc`\n      comments\n      and list"
+        "this is multiline with `ascidoc`\ncomments\nand list\n{foo} {name}"
       end
       let(:attribute_definition) do
-        "this is attribute definition\n        with multiply lines\n        end definition"
+        "this is attribute definition\nwith multiply lines\n{foo} {name}\nend 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.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie