bel_parser 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cee37750129d98c6ebb23306cf320d2c3d487fd
-  data.tar.gz: 5cb260daec5153b1ee13609d36f77061c63ecd31
+  metadata.gz: 513eae8d0ebb67c8ec75d95fb0ee13eee0054fce
+  data.tar.gz: 0a0f0c71191a88b2e62877432e5ba3c2d32145ea
 SHA512:
-  metadata.gz: 55ea0d27228e94075296bc69f20cb9cb134f7d2fd0d310f427b0b8736fadbc44f708cbfb0191254869d4c6051f1d45053b8313d9f4df406bc4dc2195a06df78a
-  data.tar.gz: 1f002cbf2704df4fc4db3df20db58ff3841bab479a7b6efa5c52ad037cc2ae1c24d31ea372226efa6232dd6483f3e0ab0b7eb60e188148591fdc9d5c246e2c9d
+  metadata.gz: 33575d0f1331c413be12086f273ad7e8d3c36a036b920efe241a0aa4f9daefb1a606ad5b23c1b833c26c51744a7567b9cdbe60c2f25ba05de57aae2f8fdba8f6
+  data.tar.gz: 28fd953bce3403c2b49104c177bc178cb64af60da1f2894afc94e4b2484725fad6f4ed7324dc3d60882474b4d7438f51d7f10fdf7aa8c653e6201b6218b82bf6

data/.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
                                  'Anthony Bargnesi',
                                  'Nick Bargnesi',
                                ]
-  spec.date                  = %q{2016-06-07}
+  spec.date                  = %q{2016-06-17}
   spec.email                 = %q{abargnesi@selventa.com}
   spec.files                 = [
                                  Dir.glob('lib/**/*.{rb,rl}'),

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/bel_parser/ast_generator.rb

@@ -2,14 +2,12 @@ require_relative 'parsers/common'
 require_relative 'parsers/expression'
 require_relative 'parsers/bel_script'
 require_relative 'mixin/line_mapping'
-require_relative 'mixin/line_continuator'
 
 module BELParser
   # ASTGenerator yields AST results for each line in some {IO}.
   # See #{ASTGenerator#each}.
   class ASTGenerator
     include LineMapping
-    include LineContinuator
 
     map_const = ->(x) { x.constants.map { |c| x.const_get(c) } }
     PARSERS = [
@@ -17,6 +15,7 @@ module BELParser
       map_const.call(BELParser::Parsers::Expression),
       map_const.call(BELParser::Parsers::BELScript)
     ].flatten!
+    LINE_CONTINUATOR = "\\\n".freeze
 
     def initialize(io)
       @io = io
@@ -48,21 +47,23 @@ module BELParser
     #         {Enumerator#each}
     def each # rubocop:disable MethodLength
       if block_given?
-        line_enumerator = map_lines(@io.each_line.lazy)
-
-        line_number = 1
-        loop do
-          begin
-            line = expand_line_continuator(line_enumerator)
+        line_number   = 1
+        expanded_line = nil
+        map_lines(@io.each_line.lazy).each do |line|
+          if line.end_with?(LINE_CONTINUATOR)
+            expanded_line = "#{expanded_line}#{line.chomp(LINE_CONTINUATOR)}"
+          else
+            expanded_line = "#{expanded_line}#{line}"
 
             ast_results = []
             PARSERS.map do |parser|
-              parser.parse(line) { |ast| ast_results << ast }
+              parser.parse(expanded_line) { |ast| ast_results << ast }
             end
-            yield [line_number, line, ast_results]
+
+            yield [line_number, expanded_line, ast_results]
+
             line_number += 1
-          rescue StopIteration
-            return
+            expanded_line = nil
           end
         end
       else
@@ -77,7 +78,7 @@ if __FILE__ == $PROGRAM_NAME
     line_number, line, ast_results = line_results
     puts "#{line_number}: #{line}"
     ast_results.each do |ast|
-      puts ast.to_s(1)
+      puts ast.to_s
     end
   end
 end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Anthony Bargnesi
 - Nick Bargnesi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: sparql-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: sparql-client
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -294,7 +294,6 @@ files:
 - lib/bel_parser/language/version2_0/value_encodings/protein_abundance.rb
 - lib/bel_parser/language/version2_0/value_encodings/protein_modification.rb
 - lib/bel_parser/language/version2_0/value_encodings/rna_abundance.rb
-- lib/bel_parser/mixin/line_continuator.rb
 - lib/bel_parser/mixin/line_mapping.rb
 - lib/bel_parser/parsers/ast/node.rb
 - lib/bel_parser/parsers/ast/sexp.rb
@@ -392,7 +391,7 @@ homepage: https://github.com/OpenBEL/bel_parser
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -407,9 +406,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Parser for Biolgical Expression Language.
 test_files: []
+has_rdoc: 

data/lib/bel_parser/mixin/line_continuator.rb

@@ -1,15 +0,0 @@
-module BELParser
-  # LineContinuator is a mixin for line expansions for BEL Script.
-  module LineContinuator
-    LINE_CONTINUATOR = "\\\n".freeze
-
-    def expand_line_continuator(line_enumerator)
-      line = line_enumerator.next
-      while line.end_with?(LINE_CONTINUATOR)
-        line.chomp!(LINE_CONTINUATOR)
-        line += line_enumerator.next
-      end
-      line
-    end
-  end
-end