bel_parser 1.0.0.alpha.26 → 1.0.0.alpha.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df1f9b77e3d50d1fbc4f3e1d7ec078ac080ad8ff
-  data.tar.gz: 19f2384635d650ddab69298083097c4b50cb180d
+  metadata.gz: 14fda40968c24d90cd1cfa3ea7d07709f6319ab0
+  data.tar.gz: 1285d3eb7fbfdf1ba027557002531d60581bcd1d
 SHA512:
-  metadata.gz: 3d8f1151e39925b828ea0da44ebd3a295c6efd260f4e16ce81505035ea9dc7ebdebd6093d2f8d79089dc74579a32288bd466361492612a53ee64bbf5de84db8a
-  data.tar.gz: b31046eaee38798816cdccdff33b429ac35a9e9b1257830679c9826959993ed948a3aa15fb4b2bbcded6ea8ac1e5988146e530d4892d88e8da614acf2367239a
+  metadata.gz: c8050d7c6c61eb227b44818518716df1ba9189d848650b7a37f5f8a8eb26b664f0dbec0b6ad3448006d73c031897e4effca36e8ca2f4b28f43a9776aac04ba3f
+  data.tar.gz: bc3a9ba66774a2dedc2ccb1fad3a3e3abce361444587cc16d404aded69a2fba4bf46ee56707844748a16b5e1f11b4c21a9883f7363275c3f4a447269a665f43d

data/.gemspec

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

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.26
+1.0.0.alpha.27

data/lib/bel_parser/expression/filter.rb

@@ -0,0 +1,31 @@
+require_relative '../ast_filter'
+
+module BELParser
+  module Expression
+    # Filter will enumerate {BELParser::Parsers::AST::Node AST nodes} that make
+    # up BEL expressions. It selects the relevant nodes
+    # from an {BELParser::Parsers::AST::Node AST node} enumerator.
+    class Filter
+      # Represents BEL expression node types.
+      TYPES = [
+        :simple_statement,
+        :observed_term,
+        :nested_statement,
+        :term,
+        :parameter
+      ]
+
+      def initialize(ast_enum)
+        @ast_filter = BELParser::ASTFilter.new(ast_enum, *TYPES)
+      end
+
+      def each(&block)
+        if block_given?
+          @ast_filter.each(&block)
+        else
+          enum_for(:each)
+        end
+      end
+    end
+  end
+end

data/lib/bel_parser/expression/parser.rb

@@ -1,34 +1,61 @@
-require_relative '../ast_filter'
 require_relative '../ast_generator'
 require_relative '../parsers/common'
 require_relative '../parsers/expression'
-require_relative '../mixin/line_mapping'
 
 module BELParser
   module Expression
     # Parser for BEL Expression.
     class Parser
-      include BELParser::Parsers::Common
-      include BELParser::Parsers::Expression
+      def parse(input, &block)
+        case input
+        when String
+          parse_string(input, &block)
+        when Array
+          parse_array(input, &block)
+        when IO, StringIO
+          parse_io(input, &block)
+        else
+          raise ArgumentError,
+            %(expected "input" to be one of String, Array, IO: #{input.class})
+        end
+      end
+
+      protected
 
-      TYPES = [
-        :parameter,
-        :term,
-        :simple_statement,
-        :observed_term,
-        :nested_statement
-      ]
+      def parse_string(string)
+        filter = Filter.new(
+          BELParser::ASTGenerator.new(StringIO.new(string)))
+        num, line, results = filter.each.first
+        if block_given?
+          yield results
+          nil
+        else
+          results
+        end
+      end
+
+      def parse_array(array)
+        if block_given?
+          array.each do |expression|
+            yield parse_string(expression.to_s)
+          end
+          nil
+        else
+          array.map do |expression|
+            parse_string(expression.to_s)
+          end
+        end
+      end
 
-      def each(io)
+      def parse_io(io)
         if block_given?
-          filter = BELParser::ASTFilter.new(
-            BELParser::ASTGenerator.new(io),
-            *TYPES)
-          filter.each do |results|
+          filter = Filter.new(BELParser::ASTGenerator.new(io))
+          filter.each do |(num, line, results)|
             yield results
           end
+          nil
         else
-          enum_for(:each, io)
+          enum_for(:parse_io, io)
         end
       end
     end

data/lib/bel_parser/expression.rb

@@ -0,0 +1,3 @@
+require_relative 'expression/filter'
+require_relative 'expression/parser'
+require_relative 'expression/validator'

data/lib/bel_parser/resource/resource_url_reader.rb

@@ -1,6 +1,6 @@
 require          'base64'
 require          'digest'
-require          'gdbm'
+require          'dbm'
 require          'net/http'
 require          'tempfile'
 require          'uri'
@@ -12,26 +12,34 @@ module BELParser
   module Resource
     # ResourceURLReader retrieves {Dataset datasets} and {Value values} from
     # Annotation (i.e. belanno extension) and Namespace (i.e. belns extension)
-    # files. Value and encoding are stored in GDBM database files to reduce the
+    # files. Value and encoding are stored in DBM database files to reduce the
     # runtime memory usage (22 resources loaded, totaling 100MB memory usage).
     #
     # Only supports resource identifiers with an HTTP or HTTPS scheme.
     class ResourceURLReader
       include Reader
 
-      # Class ivars for tracking open {GDBM} databases.
+      # Class ivars for tracking open {DBM} databases.
       @dataset_file   = nil
       @resource_files = {}
 
       DEFAULT_RESOURCE_VALUE_DELIMITER = '|'
       private_constant :DEFAULT_RESOURCE_VALUE_DELIMITER
 
+      # Initializes a {ResourceURLReader}.
+      #
+      # @param [Boolean] reuse_database_files specify +true+ to reuse database
+      #        files; +false+ to create new database files (default)
       def initialize(reuse_database_files = false)
         @resources = {}
         @datasets  = ResourceURLReader.open_datasets_file
         @reuse     = reuse_database_files
       end
 
+      # Retrieve the resource identified by +resource_identifier+.
+      #
+      # @param  [String] resource_identifier the resource identifier
+      # @return [FileResource] the file resource
       def retrieve_resource(resource_identifier)
         read_resource(resource_identifier)[:dataset]
       end
@@ -134,11 +142,11 @@ module BELParser
       end
 
       def self.open_datasets_file
-        @dataset_file ||= ::GDBM.new(_temporary_datasets_file)
+        @dataset_file ||= ::DBM.open(_temporary_datasets_file)
       end
 
       def self.open_resource_file(url)
-        @resource_files[url] ||= ::GDBM.new(_temporary_resource_file(url))
+        @resource_files[url] ||= ::DBM.open(_temporary_resource_file(url))
       end
 
       def self._temporary_datasets_file

data/lib/bel_parser.rb

@@ -16,5 +16,8 @@ require 'bel_parser/ast_filter'
 # Language; version-independent classes
 require 'bel_parser/language'
 
+# BEL expression support
+require 'bel_parser/expression'
+
 # BEL Script support
 require 'bel_parser/script'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.26
+  version: 1.0.0.alpha.27
 platform: ruby
 authors:
 - Anthony Bargnesi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Implements language versions 1.0 and 2.0.
 email: abargnesi@selventa.com
@@ -37,6 +37,8 @@ files:
 - lib/bel_parser.rb
 - lib/bel_parser/ast_filter.rb
 - lib/bel_parser/ast_generator.rb
+- lib/bel_parser/expression.rb
+- lib/bel_parser/expression/filter.rb
 - lib/bel_parser/expression/parser.rb
 - lib/bel_parser/expression/validator.rb
 - lib/bel_parser/language.rb