expressir 0.2.15-arm64-darwin → 0.2.16-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 208d83cf0aee5461042d62fc1c42ca4b214fe99940d11e73f923014c378cc211
-  data.tar.gz: 73f0554790b85512af8e50427cbd018952369e70a0ea0fa41cd100c62657ba0f
+  metadata.gz: 4434e8950479964d24b92001471b18b255280bff72bde3b884694d531e978340
+  data.tar.gz: 9ea6ecaffa01cd72aae09b6c26fb35356bd930609523fe665d0b8646a70f3af9
 SHA512:
-  metadata.gz: 2cb92ced284a85576cb9969f9fc420d1ab29657b78884a47373b1533fdfc5879dfd99f4e8d6132d44b85cd3e91de02d9a3a4d71eecd84ce9545083e41e9bef7c
-  data.tar.gz: d66e291200114f68200b95e2844b99d8fb95c874e8de88601b954682f39b4d11fb2b0f9cfe449d0dda43b79f5177f055db410a3ec63e8139f49aca98d9df7add
+  metadata.gz: 6d758cecab5718d38be4c4699d070af1f295c882ce69812c75360ba0aea67d501accc91228c01721b26254a3493f4048789f47bb7750c76969c10d0986eee2fc
+  data.tar.gz: aa436fdd2e147002268af92851fcdebb34014698a3ba62488a245d00721fbd69a9cc4f683010f38df298c9781429d3960b2eafed56d62568df5ed50eb3dc6073

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: arm64-darwin
 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