expressir 0.2.7-arm64-darwin → 0.2.8-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f06cf6d275b07b0037d366838343e1e4140d38a335e31dbb53d180bcb002193
-  data.tar.gz: 98cc1e29f51c30d125e46ec2077bc0d0feb6796156bea394b666892e7f6d060d
+  metadata.gz: 689296d67b7c8fa88ae284bc4136dfd4ce03a6454f82ba3c362b106f4be6a370
+  data.tar.gz: 3ceb78b54abf69886996439038c1fdcc73572e09d4c0914cc05113dd390f8694
 SHA512:
-  metadata.gz: 377b9e9c0db29523e8f5268b9c017ecb0922f5265f4c42145e18b0be255b87a5fd42b6ace8743ee2879daa80b2ced0097c9919b7c3738d42442b89b27ed97749
-  data.tar.gz: 9eb836a51ab50b80eb0b84bcfd0968659b788396a2fa1fafd45947aefc57b2a67b2c77171e939e34e10f3b87097647ebf3bc20f668409ceb8ad265961162802e
+  metadata.gz: f9884e1516f29543597c5e59fe548c8024ce6c4464a96d85da95fc8e9354586998c6688ecb8df3ca7d661781a104fda6e26da0549e1a1cf879956fa006b4beeb
+  data.tar.gz: daa15c6e7881cc714e098e59602595c2650a741f1950aaceeff4edbdac2d0f815f638ab98f2a7faa519bfe774b7780a0c16290ff56915b654dbff578cc20a88a

data/.github/workflows/release.yml

@@ -71,14 +71,19 @@ jobs:
 
       - name: Publish to rubygems.org
         env:
-          RUBYGEMS_API_KEY: ${{secrets.LUTAML_CI_RUBYGEMS_API_KEY}}
+          RUBYGEMS_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
         run: |
           mkdir -p ~/.gem
-          cat <<'EOF' > ~/.gem/credentials
+          echo "---"
+          cat > ~/.gem/credentials << EOF
           ---
           :rubygems_api_key: ${RUBYGEMS_API_KEY}
           EOF
+          echo "---"
           chmod 0600 ~/.gem/credentials
-          gem -v
-          gem signin
-          for gem in pkg/*.gem; do gem push $gem -V -k rubygems ; done
+          echo "---"
+          ls -la ~/.gem
+          echo "---"
+          gem signin --debug
+          echo "---"
+          for gem in pkg/*.gem; do gem push $gem -V; done

data/.gitignore

@@ -8,7 +8,7 @@
 /tmp/
 /Gemfile.lock
 /.idea
-/lib/express_parser.bundle
+/lib/expressir/express_exp/express_parser.bundle
 /original/examples/syntax/*-pretty.exp
 
 # rspec failure tracking

data/lib/expressir/express_exp/visitor.rb

@@ -58,10 +58,20 @@ module Expressir
         ctx.map{|ctx2| visit(ctx2)}.flatten if ctx
       end
 
+      def get_tokens(ctx)
+        start_index, stop_index = if ctx.instance_of? ::ExpressParser::SyntaxContext
+          [0, @tokens.size - 1]
+        else
+          [ctx.start.token_index, ctx.stop.token_index]
+        end
+
+        @tokens[start_index..stop_index]
+      end
+
       def attach_source(ctx, node)
         if node.class.method_defined? :source
-          start_index, stop_index = [ctx.start.token_index, ctx.stop.token_index]
-          node.source = @tokens[start_index..stop_index].map{|x| x.text}.join('').force_encoding('UTF-8')
+          source_tokens = get_tokens(ctx).select{|x| x.text != '<EOF>'}
+          node.source = source_tokens.map{|x| x.text}.join('').force_encoding('UTF-8')
         end
       end
 
@@ -76,15 +86,7 @@ module Expressir
       end
 
       def attach_remarks(ctx, node)
-        # get remark tokens
-        start_index, stop_index = if ctx.instance_of? ::ExpressParser::SyntaxContext
-          [0, @tokens.size - 1]
-        else
-          [ctx.start.token_index, ctx.stop.token_index]
-        end
-        # puts [start_index, stop_index, ctx.class].inspect
-
-        remark_tokens = @tokens[start_index..stop_index].select{|x| x.channel == REMARK_CHANNEL}
+        remark_tokens = get_tokens(ctx).select{|x| x.channel == REMARK_CHANNEL}
         if remark_tokens
           remark_tokens.each do |remark_token|
             remark_text = remark_token.text

data/lib/expressir/model/identifier.rb

@@ -1,10 +1,11 @@
 module Expressir
   module Model
     module Identifier
+      attr_accessor :source
+
       attr_accessor :id
       attr_accessor :parent
       attr_accessor :remarks
-      attr_accessor :source
     end
   end
 end

data/lib/expressir/model/scope.rb

@@ -1,11 +1,26 @@
 module Expressir
   module Model
     module Scope
+      attr_accessor :source
+
       def find(path)
-        path.downcase.split(".").reduce(self) do |acc, curr|
-          if acc and acc.class.method_defined? :children
-            acc.children.find{|x| x.id.downcase == curr}
+        current, rest = path.downcase.split(".", 2)
+
+        # ignore `wr:`, `ip:` part
+        if current.include? ":"
+          _, current = current.split(":", 2)
+        end
+
+        child = children.find{|x| x.id.downcase == current}
+
+        if rest
+          if child.class.method_defined? :find
+            child.find(rest)
+          else
+            nil
           end
+        else
+          child
         end
       end
 

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.7".freeze
+  VERSION = "0.2.8".freeze
 end

data/original/examples/syntax/syntax.exp

@@ -1,3 +1,4 @@
+-- schema
 SCHEMA syntax_schema 'version';
 
 -- interfaces

data/spec/expressir/express_exp/find_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model::Scope do
+  describe ".find" do
+    it "finds an item" do
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      schema = repo.find("syntax_schema")
+      expect(schema).to be_instance_of(Expressir::Model::Schema)
+
+      entity = repo.find("syntax_schema.empty_entity")
+      expect(entity).to be_instance_of(Expressir::Model::Entity)
+
+      attribute = repo.find("syntax_schema.attribute_entity.test")
+      expect(attribute).to be_instance_of(Expressir::Model::Attribute)
+
+      where = repo.find("syntax_schema.where_label_entity.wr:WR1")
+      expect(where).to be_instance_of(Expressir::Model::Where)
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "syntax.exp"
+    )
+  end
+end

data/spec/expressir/express_exp/source_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::Model::Scope do
+  describe ".source" do
+    it "contains original source" do
+      input = File.read(sample_file)
+      repo = Expressir::ExpressExp::Parser.from_exp(sample_file)
+
+      expected_result = input
+      expect(repo.source).to eq(expected_result)
+
+      schema = repo.schemas.first
+      start_index = input.index("SCHEMA")
+      stop_index = input.index("END_SCHEMA;") + "END_SCHEMA;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(schema.source).to eq(expected_result)
+
+      entity = schema.entities.first
+      start_index = input.index("ENTITY")
+      stop_index = input.index("END_ENTITY;") + "END_ENTITY;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(entity.source).to eq(expected_result)
+    end
+  end
+
+  def sample_file
+    @sample_file ||= Expressir.root_path.join(
+      "original", "examples", "syntax", "syntax.exp"
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: arm64-darwin
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -317,10 +317,12 @@ files:
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
 - spec/expressir/express_exp/ap233_spec.rb
+- spec/expressir/express_exp/find_spec.rb
 - spec/expressir/express_exp/format_remark_spec.rb
 - spec/expressir/express_exp/format_syntax_spec.rb
 - spec/expressir/express_exp/parse_remark_spec.rb
 - spec/expressir/express_exp/parse_syntax_spec.rb
+- spec/expressir/express_exp/source_spec.rb
 - spec/expressir/model/find_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb