lutaml 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd52cb5d4a4e29687299339e3cd9af05720f81348d5a307ae1d07bf2514bd022
-  data.tar.gz: 373158747e92e76c14efd7bbfc6d42a9ecebe164ebb5d14f035840a85666ce5d
+  metadata.gz: 7354339d27eea082d413223752e3937abef47f1ecc9fde7a72608b1a665577c0
+  data.tar.gz: 79c2ba8775508bcf5936a533c63ee7fa525295e6424fb25049806bfc2c3cdd92
 SHA512:
-  metadata.gz: ad0a113798e024375f25c0f580c09b8e17f1b8d8ea60ab1edc67dbfb5250ae9cb6151b44a4f6cd090159d177d08c40361c7b536a1832053f01a5784d580f91da
-  data.tar.gz: 6f0e0043a0c0a240763c95d0041ff6ccb462fb81773ecc1f4c5d4dc376942fdebe39f6c9fc5c30df96e8a95a061147cfa2b139dda968aabd6161abeb216f7a66
+  metadata.gz: 655622623e88e8ce43318a7df0d2538b66e3cd3bcb13f3b2d8b6f596df095b500dd5fe3896d54efc758a47d086dbf250b4f70ae46c1157cc2ee5342f4e61d20c
+  data.tar.gz: edb8143e8237d40c814f4490c121fb234142b2109eef0200955bd495a06543982b9b3618f55ab1187c47fa50c32620979389dd0e45e9c5bf19abc03c6fa1ceb1

data/.github/workflows/macos.yml

@@ -0,0 +1,36 @@
+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', '2.4' ]
+        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: |
+          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', '2.4' ]
+        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', '2.4' ]
+        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/{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/lib/lutaml.rb

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

data/lib/lutaml/lutaml_path/document_wrapper.rb

@@ -1,5 +1,3 @@
-require "jmespath"
-
 module Lutaml
   module LutamlPath
     class DocumentWrapper
@@ -9,11 +7,8 @@ module Lutaml
         @serialized_document = serialize_document(document)
       end
 
-      # Method for traversing document` structure
-      # example for lutaml: wrapper.find('//#main-doc/main-class/nested-class')
-      # Need to return descendant of Lutaml::LutamlPath::EntryWrapper
-      def find(path)
-        JMESPath.search(path, serialized_document)
+      def to_liquid
+        serialized_document
       end
 
       protected
@@ -21,6 +16,25 @@ module Lutaml
       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)
+        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,17 @@
+require "lutaml/express"
+
+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))
+      else
+        raise ArgumentError, "Unsupported file format"
+      end
+    end
+  end
+end

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

data/lutaml.gemspec

@@ -28,10 +28,12 @@ Gem::Specification.new do |spec|
   # spec.add_runtime_dependency "activesupport", "~> 5.0"
   # spec.add_runtime_dependency "lutaml-uml"
   # spec.add_runtime_dependency "lutaml-sysml"
+  spec.add_runtime_dependency "lutaml-express", "~> 0.1.0"
   spec.add_development_dependency "jmespath", "~> 1.4"
   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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: lutaml-express
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: jmespath
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,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
@@ -129,17 +157,21 @@ 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/lutaml_path/document_wrapper.rb
+- lib/lutaml/parser.rb
 - lib/lutaml/version.rb
 - lutaml.gemspec
 homepage: https://github.com/lutaml/lutaml