expressir 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b9d48b15ce85744e4c19cbe55752d22744388f738367cd486f2afa2ac10835
-  data.tar.gz: 44fbef691d15a6c0feee280e86aabda10401f6b5d344fc3596cbc7315e816c76
+  metadata.gz: 47487a0a54ea6a8564ad87e6ac763fd7afd9110fb3cb4580462ca13c77c78aa5
+  data.tar.gz: cfea2dad62fc18754207e704204d79867a3090bee07a9fb89b7c033a2630845e
 SHA512:
-  metadata.gz: 8049d49a9c11790c0fb45a3d37e5d8574b18aaf7d3de92b9dd870668bf6131005ff2ce1630d391962dbd6c936ea80d9d6cf95cdca0f6926358640b1ca46e9312
-  data.tar.gz: d90065bbfda420df3dce91ad2b016e14a145d751f70914823f0d5db8b86ff212c0c4ebce20f77d2a6fa85a343d91e172c3094a66a851db6af64d95af9495aa84
+  metadata.gz: e0afc309ae992b8fdb501a77db6073aa9a569af0822e25d295ea2b15bd579088d5c7c15877364a58db0bee9ce4feae95b785cf47816df12f66dd72b792ddb685
+  data.tar.gz: 05e78f10274be40d47bad5d5bfac785c4d5aecd027d06fec1421c5ba1623c8f69aa5dcdfc53c13c39cd766b45302dfcc87c521ec74d2847f941db65d9f094646

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: ruby
 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
@@ -695,7 +695,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