bel_parser 1.0.0.alpha.34-java → 1.0.0.alpha.35-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996f6947dea38645e71e33efaebcead06ee5bab2
-  data.tar.gz: 09735f4b89e359c1a9c1a1b6e3d8b064ac451e33
+  metadata.gz: 1bee9bb5548e37c4791fb17862924577964a6aba
+  data.tar.gz: a101322192c6e9d5a9d540282a48809b2797c058
 SHA512:
-  metadata.gz: 41199f5fed91e227ad6d61d7b1b1d5d45cba45ee1b7424766e69f720510a1af09162898e96ed5be1d38f53c3befc0ba738491adcc4b9002d7319b0709e3b08ce
-  data.tar.gz: ef610f25771dcc034027b84099f40e0470b7529d858d068db7347864a93b58bc14aaca118e873a998c5b9eba83c8bff86fa175689b0476d24519bdf81cfd9716
+  metadata.gz: 85bae47ad26722aa889ea30cc4cdced771a8a875e49df767bd7109bd79f909b72e7ee003539fe01a63ed8040fc4b85c66b717f3935419b5dd7f6fcff8752c68f
+  data.tar.gz: e24ffb234ed915b63b8d02c20ea417da6fc8a250ab602b52817bc37c793073ba307dac61880737125c50075f5f9e888ff084875e504f86e6794b9b3e737abfb5

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.34
+1.0.0.alpha.35

data/lib/bel/translator/plugins/bel_script/reader.rb

@@ -24,9 +24,7 @@ module BEL::Translator::Plugins
             Validator.new(
               StateAggregator.new(
                 FirstNode.new(Filter.new(BELParser::ASTGenerator.new(@io))),
-                @state)),
-            true,
-            false
+                @state))
           ).each do |(num, line, ast_node, nanopub_hash)|
             yield ::BEL::Nanopub::Nanopub.create(nanopub_hash)
           end

data/lib/bel_parser/expression/model/annotation.rb

@@ -6,36 +6,33 @@ module BELParser
         include Enumerable
 
         attr_reader :keyword
-        attr_reader :uri
-        attr_reader :url
+        attr_reader :type
+        attr_reader :domain
 
-        def initialize(keyword, uri = nil, url = nil, options = {})
+        def initialize(keyword, type, domain, options = {})
           raise(ArgumentError, 'keyword is nil') unless keyword
+          raise(ArgumentError, 'type is nil') unless type
+          raise(ArgumentError, 'domain is nil') unless domain
+
           @keyword = keyword
-          @uri     = uri
-          @url     = url
+          @type    = type.to_sym
+          @domain  = domain
 
           # configure reader for URIs (RDF).
-          @uri_reader =
-            options.fetch(:uri_reader) {
-              BELParser::Resource.default_uri_reader
-            }
+          @uri_reader = options.fetch(:uri_reader, nil)
           BELParser::Resource::Reader.assert_reader(@uri_reader, 'uri_reader')
 
           # configure reader for URLs (Resource files).
-          @url_reader =
-            options.fetch(:url_reader) {
-              BELParser::Resource.default_url_reader
-            }
+          @url_reader = options.fetch(:url_reader, nil)
           BELParser::Resource::Reader.assert_reader(@url_reader, 'url_reader')
         end
 
         def uri?
-          !@uri.nil?
+          @type == :uri
         end
 
         def url?
-          !@url.nil?
+          @type == :url
         end
 
         def [](value)

data/lib/bel_parser/script/nanopub_mapper.rb

@@ -127,7 +127,7 @@ module BELParser
 
       def domain_value(type, domain)
         case type
-        when :uri
+        when :url, :uri
           domain.identifier
         when :list
           domain

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

@@ -53,7 +53,7 @@ module BELParser
           url     = unquote(url_node.string.string_literal)
           dataset = script_context[:resource_reader].retrieve_resource(url)
           script_context[:annotation_definitions] ||= Concurrent::Hash.new
-          script_context[:annotation_definitions][prefix] = [:uri, dataset]
+          script_context[:annotation_definitions][prefix] = [:url, dataset]
         end
         private_class_method :handle_url
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.34
+  version: 1.0.0.alpha.35
 platform: java
 authors:
 - Anthony Bargnesi