expressir 1.2.3-x86_64-linux → 1.2.4-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037a9a73ba0528e09b6c5816dcb3f8c904abc5d2f45c68bda99d3298df1373c1
-  data.tar.gz: 79372b6d8f8e25d5a1fd624489bd48d7c0b07b2b0c71885fc5bbe028676dd1df
+  metadata.gz: f36da625d56d39c449e6bc7f4d88e196ec188806cd1e29a36ea12f3ae656f119
+  data.tar.gz: b8a0f3367ec4bc552dd92ea3026b0879176a57a48dac16516643fab892a2c0ce
 SHA512:
-  metadata.gz: 33f793fbd4c77a1d8c323a4eb5459fe1e3550974e527b01a76967938d641527d9d5087d0c9637438a35fb86a2eaeaefcbf952d15d718b40bc690ca8272becf72
-  data.tar.gz: fdd55bf4485a696ad4acec92ec4dcc8220397b9c146ccc4950c756e60b12fe8ad66a4e3823a5d788d83a603c63265f1d722e79b664eee1a6ef814ccd0e3aa049
+  metadata.gz: 8ebc31547c503980b41710fe0e6ffc5557e0697b277c61b914c8b52111e337d74e05a5b79857f674cae8bd08f48dde758dd9df207659ca685a9cfade560235ac
+  data.tar.gz: '0995fa5a25d434bdc535ed3ddfbd5e031b2ae02df3b26ca2609992dda1943e288180b8dcf05af139c113a72619ed8a7a9eb7a585c98fe7f59a692f566bb08068'

data/.github/workflows/rake.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   rake:
     name: test on ruby-${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}   
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
@@ -28,52 +28,64 @@ jobs:
             experimental: true
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - if: matrix.os == 'macos-latest'
+      - name: Setup packages
+        if: startsWith(matrix.os, 'macos')
         run: brew install autoconf automake libtool
 
-      - uses: ruby/setup-ruby@v1
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - uses: actions/cache@v2
+      - name: Process cache
+        uses: actions/cache@v2
+        id: cache
         with:
           path: lib/expressir/express/express_parser.*
           key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
-      - if: hashFiles('lib/expressir/express/express_parser.*') == ''
+      - name: Build native extension
+        if: steps.cache.outputs.cache-hit != 'true'
         run: bundle exec rake compile
 
-      - run: bundle exec rake
+      - name: Run tests
+        run: bundle exec rake
 
   # test release workflow
   pack:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         host: [ linux, windows, darwin ]
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
-      - uses: ruby/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.0'
           # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
           # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
 
-      - run: bundle install --jobs 4 --retry 3
+      - name: Bundle
+        run: bundle install --jobs 4 --retry 3
 
-      # build gem WITHOUT pre-built native extension
-      - run: gem build expressir.gemspec
+      - name: Build gem without native extension
+        if: matrix.host == 'linux'
+        run: gem build expressir.gemspec
 
-      - if: matrix.host == 'linux'
+      - name: Package gem without native extension
+        if: matrix.host == 'linux'
         uses: actions/upload-artifact@v2
         with:
           name: pkg-ruby
@@ -87,10 +99,11 @@ jobs:
           sudo swapon /compile.swap
           sudo swapon --all --verbose
 
-      # build gem WITH pre-built native extension
-      - run: bundle exec rake gem:${{ matrix.host }}
+      - name: Build gem with native extension
+        run: bundle exec rake gem:${{ matrix.host }}
 
-      - uses: actions/upload-artifact@v2
+      - name: Package gem with native extension
+        uses: actions/upload-artifact@v2
         with:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem

data/.gitignore

@@ -15,3 +15,4 @@
 .rspec_status
 
 /ext/express-parser/rice-embed
+/lib/expressir/express/express_parser.so

data/lib/expressir/express/parser.rb

@@ -33,23 +33,26 @@ module Expressir
       def self.from_file(file, skip_references: nil, include_source: nil)
         input = File.read(file)
 
-        parser = ::ExpressParser::Parser.parse(input)
+      # An important note re memory management
+      # parse, syntax, visitor methods return complex tree structures created in netive (C++) extension
+      # visit method references nodes and leaves of this structures but it is totally untransparent for Ruby GarbageCllector
+      # so in this class we keep those C++ structure marked for GC so theu are not freed 
+        @parser = ::ExpressParser::Parser.parse(input)
+        @parse_tree = @parser.syntax()
 
-        parse_tree = parser.syntax()
+        @visitor = Visitor.new(@parser.tokens, include_source: include_source)
+        @repository = @visitor.visit(@parse_tree)
 
-        visitor = Visitor.new(parser.tokens, include_source: include_source)
-        repository = visitor.visit(parse_tree)
-
-        repository.schemas.each do |schema|
+        @repository.schemas.each do |schema|
           schema.file = file.to_s
         end
 
         unless skip_references
-          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
-          resolve_references_model_visitor.visit(repository)
+          @resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          @resolve_references_model_visitor.visit(@repository)
         end
 
-        repository
+        @repository
       end
 
       # Parses Express files into an Express model
@@ -65,16 +68,16 @@ module Expressir
           repository.schemas
         end.flatten
 
-        repository = Model::Repository.new(
+        @repository = Model::Repository.new(
           schemas: schemas
         )
 
-        unless skip_references
-          resolve_references_model_visitor = ResolveReferencesModelVisitor.new
-          resolve_references_model_visitor.visit(repository)
+        unless @skip_references
+          @resolve_references_model_visitor = ResolveReferencesModelVisitor.new
+          @resolve_references_model_visitor.visit(@repository)
         end
 
-        repository
+        @repository
       end
     end
   end

data/lib/expressir/express/visitor.rb

@@ -138,7 +138,9 @@ module Expressir
       end
 
       def attach_remarks(ctx, node)
-        remark_tokens = get_tokens(ctx).select{|x| x.channel == REMARK_CHANNEL}
+        remark_tokens = get_tokens(ctx)
+        remark_tokens = remark_tokens.select{ |x| x.channel == REMARK_CHANNEL
+      }
 
         # skip already attached remarks
         remark_tokens = remark_tokens.select{|x| !@attached_remark_tokens.include?(x)}

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.2.3".freeze
+  VERSION = "1.2.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: x86_64-linux
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor