bel_parser 1.0.0.alpha.51 → 1.0.0.alpha.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7ed1e38515df703152be71136d20446d344d9f
-  data.tar.gz: 3d98624b6c65fa781a23020ec81680429a876809
+  metadata.gz: 68e620f8895f6b8be4df45467a13f33e57f168fc
+  data.tar.gz: 8d67c1b607f68ae3880c79d8b54a9d539629732d
 SHA512:
-  metadata.gz: 339a699110491f75d3e664fbfa003f22317fc6c04206376306d8e180a505b66214ac265eb77c4b4ae3956f077843d5f0d3cd68c8613acc3a861cc159011b2cc8
-  data.tar.gz: 65009fbf18a0751b1754d5338335e022f8194796e34ffa7f0e6de119e5be342cf8734a58cc60844fb2cfcdf6599b593f612b01f2888460bf56c4179233d7df6c
+  metadata.gz: bba997f00707795fa7714410760754cd5284f4bc99acf135428c5ee47c5faba2910ae0e1654d3fb78974a8a4099c06fed35aeb7ca2d511c39cb36adcf217ef2a
+  data.tar.gz: 8e8ae79cf8d6ddfe720231107671b83cbc5116b40f695d7b1e4f3e8389908240c4fd5a4e0290ca20261efa51596ecb48935436fc54defa104441584affa35846

data/.gemspec

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

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.51
+1.0.0.alpha.52

data/bin/bel_script_reader

@@ -79,9 +79,8 @@ url_reader = options[:url_reader]
 
 namespaces = Hash[
   ARGV.map do |ns|
-    prefix, identifier = ns.split('=')
-    dataset            = uri_reader.retrieve_resource(identifier)
-    dataset ? [prefix, dataset] : nil
+    keyword, identifier = ns.split('=')
+    [keyword, BELParser::Expression::Model::Namespace.new(keyword, identifier, nil)]
   end.compact
 ]
 

data/lib/bel_parser/script/state/bel_version.rb

@@ -12,7 +12,7 @@ module BELParser
         extend Keyword
 
         TARGET_NODE         = BELParser::Parsers::AST::DocumentProperty
-        DEFAULT_BEL_VERSION = '2.0'
+        DEFAULT_BEL_VERSION = '1.0'
 
         def self.consume(ast_node, script_context)
           return unless ast_node.is_a?(TARGET_NODE)

data/lib/bel_parser/script/state/namespace_definition.rb

@@ -1,6 +1,7 @@
 require 'bel_parser/language'
-require 'bel_parser/parsers/ast/node'
-require 'concurrent/hash'
+require          'concurrent/hash'
+require          'bel_parser/parsers/ast/node'
+require          'bel_parser/expression/model/namespace'
 require_relative '../state_function'
 require_relative '../apply_resource_uri'
 
@@ -18,25 +19,37 @@ module BELParser
           url_reader = script_context[:url_reader]
 
           keyword, domain = ast_node.children
-          prefix          = keyword.identifier.string_literal
+          keyword_s       = keyword.identifier.string_literal
 
           case
           when domain.uri?
             uri     = domain.child.string.string_literal
             dataset = uri_reader.retrieve_resource(uri)
             script_context[:namespace_definitions] ||= Concurrent::Hash.new
-            script_context[:namespace_definitions][prefix] = [:uri, dataset]
+            script_context[:namespace_definitions][keyword_s] =
+              BELParser::Expression::Model::Namespace.new(
+                keyword_s,
+                uri,
+                nil)
           when domain.url?
             ApplyResourceURI.new.process(ast_node)
             if ast_node.uri
               dataset = uri_reader.retrieve_resource(ast_node.uri)
               script_context[:namespace_definitions] ||= Concurrent::Hash.new
-              script_context[:namespace_definitions][prefix] = [:uri, dataset]
+              script_context[:namespace_definitions][keyword_s] =
+                BELParser::Expression::Model::Namespace.new(
+                  keyword_s,
+                  ast_node.uri,
+                  domain.child.string.string_literal)
             else
               url     = domain.child.string.string_literal
               dataset = url_reader.retrieve_resource(url)
               script_context[:namespace_definitions] ||= Concurrent::Hash.new
-              script_context[:namespace_definitions][prefix] = [:url, dataset]
+              script_context[:namespace_definitions][keyword_s] =
+                BELParser::Expression::Model::Namespace.new(
+                  keyword_s,
+                  nil,
+                  url)
             end
           end
         end

data/lib/bel_parser/script/syntax/expression_validation.rb

@@ -23,7 +23,7 @@ module BELParser
           return nil unless script_context.key?(:specification)
 
           validator = expression_validator(script_context)
-          validator.validate(ast_node).select(&:failure?)
+          validator.validate(ast_node)
         end
 
         def self.expression_validator(script_context)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.51
+  version: 1.0.0.alpha.52
 platform: ruby
 authors:
 - Anthony Bargnesi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparql-client