expressir 0.2.15-x64-mingw32 → 0.2.16-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f40d5af0bb6f8d9d71a15fe4bf060933440af50eabfde86b4f397aa8d516bc
-  data.tar.gz: f9133c2173e7f8d03c8f605f8f0841173c1e4e00e4f5b6203016543d569a5c1e
+  metadata.gz: 404006a617df67e0eac8847c70fc8e1705a435727e0db5e71cd547471c337117
+  data.tar.gz: 746be9cf9403a56861f5ee87b2d3abb52ad0f4e4419c286be977571dffe2ead5
 SHA512:
-  metadata.gz: 51da2d73670e7e68124c40b205ee0bdaee73d40ff2be2d13422cf7edb1365df5778e27a5db5adeb9f2290273493a0dbd26be4aba19b670374453c6bc06d0141b
-  data.tar.gz: c3e247487bcf77e138bd8ab9d53fac9582f6a15073af5c059f3a941c0bf3aabd85314b453c83308fc7ef930652bb71fde1ff1a70ad8ea2de47a99e1e481fbeca
+  metadata.gz: 59fb06d93b723e3a69a6428a0a61a943a5fe492e036c98359854c11dbaf61138d84c57d707f16d8ec8d051e75643f1385bd5c85d49d4e1ac773df70f40fc33cc
+  data.tar.gz: 73ac0793929ee667f86c5bc1c6ec2b00b4f0bf99a78ac899608f9cc83a78ed1335dfa5a59a8b5853966a1c949ed9dbe7fb0a71810f6d850a753731ef31403419

data/lib/expressir/express_exp/hyperlink_formatter.rb

@@ -1,8 +1,6 @@
-require "expressir/express_exp/formatter"
-
 module Expressir
   module ExpressExp
-    class HyperlinkFormatter < Formatter
+    module HyperlinkFormatter
       def format_expressions_simple_reference(node)
         return node.id if node.parent.is_a? Model::Expressions::AttributeReference
 

data/lib/expressir/express_exp/schema_head_formatter.rb

@@ -1,8 +1,6 @@
-require "expressir/express_exp/formatter"
-
 module Expressir
   module ExpressExp
-    class SchemaHeadFormatter < Formatter
+    module SchemaHeadFormatter
       def format_schema(node)
         [
           "SCHEMA #{node.id}#{node.version ? " #{format(node.version)}" : ""};",

data/lib/expressir/express_exp/visitor.rb

@@ -92,35 +92,11 @@ module Expressir
         @tokens[start_index..stop_index]
       end
 
-      def get_head_tokens(ctx)
-        start_index, stop_index = if ctx.is_a? ::ExpressParser::SchemaDeclContext
-          start_index = ctx.start.token_index
-          stop_index = if ctx.schema_body.interface_specification.length > 0
-            ctx.schema_body.interface_specification.last.stop.token_index
-          elsif ctx.schema_version_id
-            ctx.schema_version_id.stop.token_index + 1
-          else
-            ctx.schema_id.stop.token_index + 1
-          end
-
-          [start_index, stop_index]
-        end
-
-        if start_index and stop_index
-          @tokens[start_index..stop_index]
-        end
-      end
-
       def attach_source(ctx, node)
         if node.class.method_defined? :source
           tokens = get_tokens(ctx)
           node.source = get_tokens_source(tokens)
         end
-
-        if node.class.method_defined? :head_source
-          tokens = get_head_tokens(ctx)
-          node.head_source = get_tokens_source(tokens)
-        end
       end
 
       def find_remark_target(node, path)

data/lib/expressir/model/schema.rb

@@ -5,8 +5,6 @@ module Expressir
 
       include Identifier
 
-      attr_accessor :head_source
-
       attr_accessor :version
       attr_accessor :interfaces
       attr_accessor :constants
@@ -23,7 +21,6 @@ module Expressir
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
         @source = options[:source]
-        @head_source = options[:head_source]
 
         @version = options[:version]
         @interfaces = options.fetch(:interfaces, [])

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.15".freeze
+  VERSION = "0.2.16".freeze
 end

data/spec/expressir/express_exp/hyperlink_formatter_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
 require "expressir/express_exp/hyperlink_formatter"
 
 RSpec.describe Expressir::ExpressExp::HyperlinkFormatter do
@@ -7,7 +8,10 @@ RSpec.describe Expressir::ExpressExp::HyperlinkFormatter do
     it "formats hyperlink" do
       repo = Expressir::ExpressExp::Parser.from_file(input_file)
 
-      result = Expressir::ExpressExp::HyperlinkFormatter.format(repo)
+      class CustomFormatter < Expressir::ExpressExp::Formatter
+        include Expressir::ExpressExp::HyperlinkFormatter
+      end
+      result = CustomFormatter.format(repo)
       expected_result = File.read(output_file)
 
       expect(result).to eq(expected_result)

data/spec/expressir/express_exp/schema_head_formatter_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
 require "expressir/express_exp/schema_head_formatter"
 
 RSpec.describe Expressir::ExpressExp::SchemaHeadFormatter do
@@ -7,7 +8,10 @@ RSpec.describe Expressir::ExpressExp::SchemaHeadFormatter do
     it "formats schema head" do
       repo = Expressir::ExpressExp::Parser.from_file(sample_file)
 
-      result = Expressir::ExpressExp::SchemaHeadFormatter.format(repo)
+      class CustomFormatter < Expressir::ExpressExp::Formatter
+        include Expressir::ExpressExp::SchemaHeadFormatter
+      end
+      result = CustomFormatter.format(repo)
 
       expect(result).to eq(<<~EXP.strip
         SCHEMA syntax_schema 'version';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -342,7 +342,6 @@ files:
 - spec/expressir/express_exp/formatter/remark_spec.rb
 - spec/expressir/express_exp/formatter/syntax_spec.rb
 - spec/expressir/express_exp/hyperlink_formatter_spec.rb
-- spec/expressir/express_exp/parser/head_source_spec.rb
 - spec/expressir/express_exp/parser/multiple_spec.rb
 - spec/expressir/express_exp/parser/remark_spec.rb
 - spec/expressir/express_exp/parser/source_spec.rb

data/spec/expressir/express_exp/parser/head_source_spec.rb

@@ -1,38 +0,0 @@
-require "spec_helper"
-require "expressir/express_exp/parser"
-
-RSpec.describe Expressir::ExpressExp::Parser do
-  describe ".head_source" do
-    it "contains original head source" do
-      input = File.read(sample_file)
-      repo = Expressir::ExpressExp::Parser.from_file(sample_file)
-
-      repo.schemas[0].tap do |x|
-        start_index = x.source.index("SCHEMA")
-        stop_index = x.source.index(";") + ";".length - 1
-        expected_result = x.source[start_index..stop_index]
-        expect(x.head_source).to eq(expected_result)
-      end
-
-      repo.schemas[1].tap do |x|
-        start_index = x.source.index("SCHEMA")
-        stop_index = x.source.index(";") + ";".length - 1
-        expected_result = x.source[start_index..stop_index]
-        expect(x.head_source).to eq(expected_result)
-      end
-
-      repo.schemas[2].tap do |x|
-        start_index = x.source.index("SCHEMA")
-        stop_index = x.source.index("REFERENCE FROM contract_schema;") + "REFERENCE FROM contract_schema;".length - 1
-        expected_result = x.source[start_index..stop_index]
-        expect(x.head_source).to eq(expected_result)
-      end
-    end
-  end
-
-  def sample_file
-    @sample_file ||= Expressir.root_path.join(
-      "original", "examples", "syntax", "source.exp"
-    )
-  end
-end