lutaml 0.1.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7f00bf561618a5ec3d7b20029bad9a13d7ab890a2e68e913f240400a4883721
-  data.tar.gz: bbd6aadab7e336af89b560596b5f4f9424c8888b1c9a6e4149ceced4ea4b247f
+  metadata.gz: a4cf5092c3121c8b3c2e3caa93d8b5fb9b041eb1bdd563e2ad7d5b803f16685f
+  data.tar.gz: 0e7e102b348acc3b3b7506ec8403f7e598611297c8fe0a3ba82fc4855686d0af
 SHA512:
-  metadata.gz: 996c1f4909adcbc85713ca109bea104371d4c2f87a9c37171f93b8a01d0ea2e29091f0b4838fd06b6a2ec07eacb3bc735c4c991fdf5ee0804a676794db42532c
-  data.tar.gz: cd43ed7577632c89afcad888c46c38392f4fb827fc248225ba5d6d2d997ab97a5afc672ceca8543caff29ad34d700b42f1e27ebf9fa4eed98aca854c1bf39b66
+  metadata.gz: f5ee064152d5f79c6f1e37ea3fa9f81fdd494b03108868396839d7c09200d5757a3303d187776d3bdfd8bb895b17e9a73720bdea1bd2d919f4ff1c276375b269
+  data.tar.gz: 50fef95d71aa35883365b2e5fd7889dafc2ba4a7b6bed62333f8e4ba8ebe281ec45550f0a8b08871573b4c8757f8cbdc94488a08fc0df3df490b8f74f5d4dbd2

data/.github/workflows/macos.yml

@@ -0,0 +1,39 @@
+name: macos
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths-ignore:
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
+
+jobs:
+  test-macos:
+    name: Test on Ruby ${{ matrix.ruby }} macOS
+    runs-on: macos-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.5' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+      - name: Install build tools
+        run: |
+          brew install automake libtool
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Update gems
+        run: |
+          sudo gem install bundler --force
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,38 @@
+name: ubuntu
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+      - '*'
+  pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/windows.yml
+
+jobs:
+  test-linux:
+    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.5' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Update gems
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.github/workflows/windows.yml

@@ -0,0 +1,41 @@
+name: windows
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
+
+jobs:
+  test-windows:
+    name: Test on Ruby ${{ matrix.ruby }} Windows
+    runs-on: windows-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.5' ]
+        experimental: [false]
+        # Does not supported yet:
+        # Ruby (< 2.7.dev, >= 2.3), which is required by gem 'nokogiri (~> 1.10)', is not
+        #   available in the local ruby installation
+        # include:
+        #   - ruby: '2.7'
+        #     experimental: true
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Update gems
+        shell: pwsh
+        run: |
+          gem install bundler
+          bundle config --local path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Run specs
+        run: |
+          bundle exec rake

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/Gemfile

@@ -2,6 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in lutaml.gemspec
 gemspec
-
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"

data/{README.md → README.adoc}

@@ -1,30 +1,44 @@
-# Lutaml
+= Lutaml
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/lutaml`. To experiment with that code, run `bin/console` for an interactive prompt.
+== Functionality
 
-TODO: Delete this and the text above, and describe your gem
+Entry point for lutaml extensions.
 
-## Installation
+=== Installation
 
-Add this line to your application's Gemfile:
+With bundler:
 
-```ruby
-gem 'lutaml'
-```
+[source,ruby]
+----
+# Gemfile
+gem "lutaml"
+----
 
-And then execute:
+Then in console:
 
-    $ bundle install
+[source,console]
+----
+$ bundle
+----
 
-Or install it yourself as:
+With RubyGems:
 
-    $ gem install lutaml
+[source,console]
+----
+$ gem install lutaml
+----
 
-## Usage
+=== Usage
 
-TODO: Write usage instructions here
+In order to parse files supported by lutaml extensions, use Lutaml::Parser.parse method(currently only .exp are supported):
 
-## Development
+[source,ruby]
+----
+# example.exp is an EXPRESS repository file
+Lutaml::Parser.parse(File.new("example.exp")) # will produce Lutaml::LutamlPath::DocumentWrapper object with serialized express repository
+----
+
+== Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
@@ -35,6 +49,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/lutaml. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/lutaml/blob/master/CODE_OF_CONDUCT.md).
 
 
-## Code of Conduct
+== Code of Conduct
 
-Everyone interacting in the Lutaml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Lutaml::Uml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/lutaml.rb

@@ -1,6 +1,5 @@
 require "lutaml/version"
+require "lutaml/parser"
 
 module Lutaml
-  class Error < StandardError; end
-  # Your code goes here...
 end

data/lib/lutaml/express/lutaml_path/document_wrapper.rb

@@ -0,0 +1,59 @@
+require "lutaml/lutaml_path/document_wrapper"
+require "expressir/express_exp/formatter"
+
+module Lutaml
+  module Express
+    module LutamlPath
+      class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
+        SCHEMA_ATTRIBUTES = %w[
+          id
+          constants
+          declarations
+          entities
+          functions
+          interfaces
+          procedures
+          remarks
+          rules
+          subtype_constraints
+          types
+          version
+        ].freeze
+        SOURCE_CODE_ATTRIBUTE_NAME = "sourcecode".freeze
+
+        protected
+
+        def serialize_document(repository)
+          repository.schemas.each_with_object({}) do |schema, res|
+            res["schemas"] ||= []
+            serialized_schema = SCHEMA_ATTRIBUTES
+              .each_with_object({}) do |name, nested_res|
+              attr_value = schema.send(name)
+              nested_res[name] = serialize_value(attr_value)
+              if name == "entities"
+                nested_res[name] = merge_source_code_attr(nested_res[name],
+                                                          attr_value)
+              end
+            end
+            res[schema.id] = serialized_schema
+            serialized_schema = serialized_schema
+              .merge(SOURCE_CODE_ATTRIBUTE_NAME =>
+                                          entity_source_code(schema))
+            res["schemas"].push(serialized_schema)
+          end
+        end
+
+        def merge_source_code_attr(serialized_entries, entities)
+          serialized_entries.map do |serialized|
+            entity = entities.detect { |n| n.id == serialized["id"] }
+            serialized.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(entity))
+          end
+        end
+
+        def entity_source_code(entity)
+          Expressir::ExpressExp::Formatter.format(entity)
+        end
+      end
+    end
+  end
+end

data/lib/lutaml/lutaml_path/document_wrapper.rb

@@ -0,0 +1,42 @@
+module Lutaml
+  module LutamlPath
+    class DocumentWrapper
+      attr_reader :serialized_document
+
+      def initialize(document)
+        @serialized_document = serialize_document(document)
+      end
+
+      def to_liquid
+        serialized_document
+      end
+
+      protected
+
+      def serialize_document(_path)
+        raise ArgumentError, "implement #serialize_document!"
+      end
+
+      def serialize_value(attr_value)
+        if attr_value.is_a?(Array)
+          return attr_value.map(&method(:serialize_to_hash))
+        end
+
+        attr_value
+      end
+
+      def serialize_to_hash(object)
+        return object if [String, Integer, Float].include?(object.class)
+
+        object.instance_variables.each_with_object({}) do |var, res|
+          variable = object.instance_variable_get(var)
+          res[var.to_s.gsub("@", "")] = if variable.is_a?(Array)
+                                          variable.map { |n| serialize_to_hash(n) }
+                                        else
+                                          variable
+                                        end
+        end
+      end
+    end
+  end
+end

data/lib/lutaml/parser.rb

@@ -0,0 +1,23 @@
+# require "lutaml/express"
+require "lutaml/uml"
+require "lutaml/uml/lutaml_path/document_wrapper"
+# require "lutaml/express/lutaml_path/document_wrapper"
+
+module Lutaml
+  module Parser
+    module_function
+
+    def parse(file)
+      case File.extname(file.path)[1..-1]
+      # when "exp"
+      #   Lutaml::Express::LutamlPath::DocumentWrapper
+      #     .new(Lutaml::Express::Parsers::Exp.parse(file))
+      when "lutaml"
+        Lutaml::Uml::LutamlPath::DocumentWrapper
+          .new(Lutaml::Uml::Parsers::Dsl.parse(file))
+      else
+        raise ArgumentError, "Unsupported file format"
+      end
+    end
+  end
+end

data/lib/lutaml/uml/lutaml_path/document_wrapper.rb

@@ -0,0 +1,15 @@
+require "lutaml/lutaml_path/document_wrapper"
+
+module Lutaml
+  module Uml
+    module LutamlPath
+      class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
+        protected
+
+        def serialize_document(document)
+          serialize_to_hash(document)
+        end
+      end
+    end
+  end
+end

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.1.0"
+  VERSION = "0.3.3".freeze
 end

data/lutaml.gemspec

@@ -1,4 +1,4 @@
-require_relative 'lib/lutaml/version'
+require_relative "lib/lutaml/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "lutaml"
@@ -17,21 +17,22 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  # spec.add_runtime_dependency "lutaml-express", "~> 0.1.3"
+  spec.add_runtime_dependency "lutaml-uml", "~> 0.2.5"
   spec.add_runtime_dependency "thor", "~> 1.0"
-  # spec.add_runtime_dependency "activesupport", "~> 5.0"
-  # spec.add_runtime_dependency "lutaml-uml"
-  # spec.add_runtime_dependency "lutaml-sysml"
   spec.add_development_dependency "nokogiri", "~> 1.10"
 
   spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "byebug"
   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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-20 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lutaml-uml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,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: 'LutaML: data models in textual form'
 email:
 - open.source@ribose.com'
@@ -101,16 +143,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- README.md
+- README.adoc
 - Rakefile
 - bin/console
 - bin/setup
 - lib/lutaml.rb
+- lib/lutaml/express/lutaml_path/document_wrapper.rb
+- lib/lutaml/lutaml_path/document_wrapper.rb
+- lib/lutaml/parser.rb
+- lib/lutaml/uml/lutaml_path/document_wrapper.rb
 - lib/lutaml/version.rb
 - lutaml.gemspec
 homepage: https://github.com/lutaml/lutaml
@@ -120,7 +169,7 @@ metadata:
   homepage_uri: https://github.com/lutaml/lutaml
   source_code_uri: https://github.com/lutaml/lutaml
   changelog_uri: https://github.com/lutaml/lutaml/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'LutaML: data models in textual form'
 test_files: []