expressir 0.2.15-x86-mingw32 → 0.2.16-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4fda0250639af57e9e232c6392d40dfa764167cd9b3bad055ba078533363570
-  data.tar.gz: 29fcd0e8595848c721e28bde6244568fb3a71217a7786769e015e909c354f63a
+  metadata.gz: 03cb884d25b3c6258ba4de5103b834369d81c57afed35505afd8113d3d122a77
+  data.tar.gz: f901319bff19f5163f2716e8770f6165007663fea182dfa4f282378a304820d4
 SHA512:
-  metadata.gz: 690948907c347988f02e5ea21a07371b75d41b06be51a443bf26a493aefa8dcfd42d17b65cf6d88de1318c76ef8f9156e8a6e7472b534aaf534cc7b4d46ec4f8
-  data.tar.gz: e28cec090fe2f6d1251efea669ccb446458d7e259c581c8ad0c6be4597e39f3faf7d54c82b12aea48143637d15d12d82611512bc6d6af40828a416ce2fc3414a
+  metadata.gz: 202e644ede9056d1dbf38674e0d384908e0fd880c1cd0f1e2ebfb7eb33b29c84464c7fbc1eb38adf9f99de514b1d4bae2817905154f7b92933ba97707f9a85de
+  data.tar.gz: 39c82b2bda51e638ca394234f0075823251e01add99b3551518f06cc942958b1707dc30c781fd4c2e8827d788ea331a27a8b6657d55f258a09725d9eabfd4b4c

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: x86-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