lutaml-uml 0.2.12 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405ff7c4bd2b9ebdde4a00c00c0c5e21188f0632206a64379a3e294fcad91cf0
-  data.tar.gz: 4f4ce9d31b300185e52ddf44375bc5a6597fc16c72e047963a283ab618205b83
+  metadata.gz: 3436e32ef66aba3d38cf8418de2ecef7bd475a1379e62e787aaddb0701397b55
+  data.tar.gz: da160c6b5ffaa013cb0d4bc4df8a23175acdff14da402c15b883c96a424cbd83
 SHA512:
-  metadata.gz: 738287fadf7e75d576dc85bb3dce7f1781b3307770b8ad05b994101d421c73bc81450d49af5cd88e10b7466924591c504590ffbfdf405bf4f2ca1bec6d12ddfa
-  data.tar.gz: a7b87af376643a4db9c7d700ef3fae74d45c4a70ecf09e85667640cca55c4083afde0eba1ce2f7a4e18d7b1a3351ce3f89574aa2917b543413677836928f941a
+  metadata.gz: f76a00663fa9a4a8167930d4114ef4995ce7b488034336dd1134953ca9ed09ab4fd2da6e32a425082b6cf212b97bf47493e0b3f45c4b181fa93966f581ad7265
+  data.tar.gz: 85f1fd71d5df7d0e673a5c4994f7d524dbaa915afca26bdacd483e384889003114e3f91ac1d7c0a28bc9a649b675036458c4fcc685b9e8534b6a49c346bb269d

data/lib/lutaml/uml/document.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require "lutaml/uml/class"
-require "lutaml/uml/enum"
 require "lutaml/uml/data_type"
+require "lutaml/uml/enum"
+require "lutaml/uml/package"
 require "lutaml/uml/primitive_type"
 
 module Lutaml
@@ -18,23 +19,27 @@ module Lutaml
                     :fidelity,
                     :fontname,
                     :comments
+      attr_reader :packages
 
       # rubocop:disable Rails/ActiveRecordAliases
       def initialize(attributes = {})
         update_attributes(attributes)
       end
       # rubocop:enable Rails/ActiveRecordAliases
-
       def classes=(value)
         @classes = value.to_a.map { |attributes| Class.new(attributes) }
       end
 
+      def data_types=(value)
+        @data_types = value.to_a.map { |attributes| DataType.new(attributes) }
+      end
+
       def enums=(value)
         @enums = value.to_a.map { |attributes| Enum.new(attributes) }
       end
 
-      def data_types=(value)
-        @data_types = value.to_a.map { |attributes| DataType.new(attributes) }
+      def packages=(value)
+        @packages = value.to_a.map { |attributes| Package.new(attributes) }
       end
 
       def primitives=(value)
@@ -59,6 +64,10 @@ module Lutaml
         @data_types || []
       end
 
+      def packages
+        @packages || []
+      end
+
       def primitives
         @primitives || []
       end

data/lib/lutaml/uml/package.rb

@@ -3,16 +3,37 @@
 module Lutaml
   module Uml
     class Package < TopElement
+      include HasAttributes
+
       attr_accessor :imports, :contents
+      attr_reader :classes, :enums
+
+      def initialize(attributes)
+        update_attributes(attributes)
+      end
+
+      def classes=(value)
+        @classes = value.to_a.map { |attributes| Class.new(attributes) }
+      end
+
+      def enums=(value)
+        @enums = value.to_a.map { |attributes| Enum.new(attributes) }
+      end
+
+      def packages=(value)
+        @packages = value.to_a.map { |attributes| Package.new(attributes) }
+      end
+
+      def classes
+        @classes || []
+      end
+
+      def enums
+        @enums || []
+      end
 
-      def initialize
-        @imports = []
-        @contents = []
-        @name = nil
-        @xmi_id = nil
-        @xmi_uuid = nil
-        @namespace = nil
-        @href = nil
+      def packages
+        @packages || []
       end
     end
   end

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

@@ -117,7 +117,7 @@ module Lutaml
             attribute_keyword? >>
             spaces? >>
             match['"\''].maybe >>
-            match['a-zA-Z0-9_\- \/'].repeat(1).as(:type) >>
+            match['a-zA-Z0-9_\- \/\+'].repeat(1).as(:type) >>
             match['"\''].maybe >>
             spaces?
           )
@@ -126,7 +126,7 @@ module Lutaml
           attribute_type.maybe
         end
 
-        rule(:attribute_name) { match['a-zA-Z0-9_\- \/'].repeat(1).as(:name) }
+        rule(:attribute_name) { match['a-zA-Z0-9_\- \/\+'].repeat(1).as(:name) }
         rule(:attribute_definition) do
           (visibility?.as(:visibility) >>
             match['"\''].maybe >>

data/lib/lutaml/uml/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Uml
-    VERSION = "0.2.12"
+    VERSION = "0.3.0"
   end
 end

data/spec/fixtures/dsl/diagram_class_fields.lutaml

@@ -17,5 +17,9 @@ diagram MyView {
     #protectedAttributeProfile: CharacterString
     type/text: String
     slashType: slash/type
+    application/docbook+xml
+    application/tei+xml
+    text/x-asciidoc
+    application/x-isodoc+xml
   }
 }

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

@@ -68,7 +68,7 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
         expect(by_name(classes, "AddressClassProfile")
                 .attributes.length).to eq(1)
         expect(by_name(classes, "AttributeProfile")
-                .attributes.length).to eq(9)
+                .attributes.length).to eq(13)
         expect(by_name(classes, "AttributeProfile")
                 .attributes.map(&:name))
               .to(eq(["imlicistAttributeProfile",
@@ -79,7 +79,11 @@ RSpec.describe Lutaml::Uml::Parsers::Dsl do
                 "friendlyAttributeProfile1",
                 "protectedAttributeProfile",
                 "type/text",
-                "slashType"]))
+                "slashType",
+                "application/docbook+xml",
+                "application/tei+xml",
+                "text/x-asciidoc",
+                "application/x-isodoc+xml"]))
       end
 
       it "creates the correct attributes with the correct visibility" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-uml
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie