bel_parser 1.0.0.alpha.51-java → 1.0.0.alpha.52-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac73988228b7a8ad17fc167a1538beea9fdd6267
-  data.tar.gz: f9f27782b9791b99d315465363f3608a0c6016d1
+  metadata.gz: 0b78b639cb7c7eec3a5faacdfe2ff843b78a1fe7
+  data.tar.gz: 4a618714c2b20209ff175460bbf5bf1187b0b7e2
 SHA512:
-  metadata.gz: d28a74c92a301cddd0910bd7ae8b2348ccb74a1066c78ec1c5b0f5744ceb3f090e9230ecb9ba271e2db45b6a3bf9db9155a24fb08264a46e626d6b7a9ebfc4bf
-  data.tar.gz: 59f3d31887b6a7b36e5e5016db68596917933bcc79055777c48d8fb680873f08c658cc1d2c33196316b02b7ec4c7e15b4b83f3e568840bfcc934a0d7ef69ed53
+  metadata.gz: a1bb96198f5a6a85124fbdc582553736b3e86bcdead32f596694a62a69c5042803a2efbe2988aa7589ba8864420dc07ede98c64b2a0fba7d76333fa0ebb18ff1
+  data.tar.gz: 81522df31b1d3c28b99e9001d0d1e8bab96b33abfc1482f80f4929a1c3074848850baec687bbb86bbc49d42982ba418bf3829e05cc277cd0d222cb977f79f7e7

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: java
 authors:
 - Anthony Bargnesi