bel_parser 1.0.0.alpha.34 → 1.0.0.alpha.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e1e76aac6cddc28a72044c48817cd06f64fbb46
-  data.tar.gz: 7f94685c8bea050f62113df06eff30289fe7b23a
+  metadata.gz: 2146335395f5a41bb0344d6c9318fa282a992717
+  data.tar.gz: c9d8cb3623c5bee85f8a82a70c3f5db762229a03
 SHA512:
-  metadata.gz: 25c0e44cc23e2713315123438330356a8730a263ef513f8948610732f2932f095d65cad1d13b2aa55ce1ae7fd7c65eaf30eed56d1027b5c46fc0aaa556f5a6f7
-  data.tar.gz: ac99e19b7d99d34ef9309675debf385d0c4391f28614192c3307896fa866b33189b6a945eaa233cc7b8aed5091980999cabfc6b404552a86ca9d47902c692097
+  metadata.gz: 44d14c01868f3c034077f1c6d33b58dc2f5b9a145a6cd79223e353c014045cd088c6a69bbba5ad2983296b896ca303d8d1a573dc48129dd8b3e92fe766fcf618
+  data.tar.gz: 01440f40494138c891264c19c41ebe0c31074fe1657fde659a9f7259165fee2f66620e7b42e9eb5691b215491da51995d633ae97f6f60df121b4ff095f219af0

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