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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bee9bb5548e37c4791fb17862924577964a6aba
-  data.tar.gz: a101322192c6e9d5a9d540282a48809b2797c058
+  metadata.gz: 884938828857d7148f04245c1d0aa36cb98d9fdb
+  data.tar.gz: 2f33f84994e1e492db710394e0cd7b77b189cd2c
 SHA512:
-  metadata.gz: 85bae47ad26722aa889ea30cc4cdced771a8a875e49df767bd7109bd79f909b72e7ee003539fe01a63ed8040fc4b85c66b717f3935419b5dd7f6fcff8752c68f
-  data.tar.gz: e24ffb234ed915b63b8d02c20ea417da6fc8a250ab602b52817bc37c793073ba307dac61880737125c50075f5f9e888ff084875e504f86e6794b9b3e737abfb5
+  metadata.gz: 9ec5bf16855b3db4198d53a92628f13a4bf5cf0655dd49093f2f9698152e01ee84c7d599f97228fbc059b20a2e40393ee50ec305cb57b43ffc51d28efbb31f8a
+  data.tar.gz: 0036e9e4d089b197ee71d483b1ef89fd6fb89cc5293e72e28c6a6e68c091ae6d078fc337b144549e5cb6288e1fff1bce9f49cf1ed8071b4a13d84d5788a37cb6

data/VERSION

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

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

@@ -141,17 +141,18 @@ module BEL::Translator::Plugins
         return bel unless annotation_references
 
         annotation_references.reduce(bel) { |bel, ref|
-          keyword, type, domain = ref.values_at(:keyword, :type, :domain)
-          bel << "DEFINE ANNOTATION #{keyword} AS "
+          bel << "DEFINE ANNOTATION #{ref.keyword} AS "
 
-          case type.to_sym
+          case ref.type.to_sym
+          when :url
+            bel << %Q{URL "#{ref.domain}"\n}
           when :uri
-            bel << %Q{URL "#{domain}"\n}
+            bel << %Q{URI "#{ref.domain}"\n}
           when :pattern
-            regex = domain.respond_to?(:source) ? domain.source : domain
+            regex = ref.domain.respond_to?(:source) ? ref.domain.source : ref.domain
             bel << %Q{PATTERN "#{regex}"\n}
           when :list
-            bel << %Q|LIST {#{domain.inspect[1...-1]}}\n|
+            bel << %Q|LIST {#{ref.domain.inspect[1...-1]}}\n|
           end
           bel
         }
@@ -168,8 +169,7 @@ module BEL::Translator::Plugins
         return bel unless namespace_references
 
         namespace_references.reduce(bel) { |bel, ref|
-          keyword, url = ref.values_at(:keyword, :uri)
-          bel << %Q{DEFINE NAMESPACE #{keyword} AS URL "#{url}"\n}
+          bel << %Q{DEFINE NAMESPACE #{ref.keyword} AS URL "#{ref.uri}"\n}
           bel
         }
         bel << "\n"

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

@@ -5,9 +5,11 @@ module BELParser
       class Annotation
         include Enumerable
 
-        attr_reader :keyword
-        attr_reader :type
-        attr_reader :domain
+        attr_accessor :keyword
+        attr_accessor :type
+        attr_accessor :domain
+        attr_reader :uri_reader
+        attr_reader :url_reader
 
         def initialize(keyword, type, domain, options = {})
           raise(ArgumentError, 'keyword is nil') unless keyword
@@ -18,13 +20,26 @@ module BELParser
           @type    = type.to_sym
           @domain  = domain
 
-          # configure reader for URIs (RDF).
-          @uri_reader = options.fetch(:uri_reader, nil)
+          uri_reader = options.fetch(:uri_reader, nil)
+          url_reader = options.fetch(:url_reader, nil)
+        end
+
+        def initialize_copy(original)
+          @keyword    = original.keyword
+          @type       = original.type
+          @domain     = original.domain
+          @uri_reader = original.uri_reader
+          @url_reader = original.url_reader
+        end
+
+        def uri_reader=(uri_reader)
           BELParser::Resource::Reader.assert_reader(@uri_reader, 'uri_reader')
+          @uri_reader = uri_reader
+        end
 
-          # configure reader for URLs (Resource files).
-          @url_reader = options.fetch(:url_reader, nil)
+        def url_reader=(url_reader)
           BELParser::Resource::Reader.assert_reader(@url_reader, 'url_reader')
+          @url_reader = url_reader
         end
 
         def uri?
@@ -37,9 +52,9 @@ module BELParser
 
         def [](value)
           if uri?
-            @uri_reader.retrieve_value_from_resource(@uri, value)
+            @uri_reader.retrieve_value_from_resource(@domain, value)
           elsif url?
-            @url_reader.retrieve_value_from_resource(@url, value)
+            @url_reader.retrieve_value_from_resource(@domain, value)
           else
             nil
           end
@@ -49,9 +64,9 @@ module BELParser
           if block_given?
             values =
               if uri?
-                @uri_reader.retrieve_values_from_resource(@uri)
+                @uri_reader.retrieve_values_from_resource(@domain)
               elsif url?
-                @url_reader.retrieve_values_from_resource(@url)
+                @url_reader.retrieve_values_from_resource(@domain)
               else
                 []
               end
@@ -64,15 +79,22 @@ module BELParser
         end
 
         def hash
-          [@keyword, @uri, @url].hash
+          [@keyword, @type, @domain].hash
         end
 
         def ==(other)
           return false if other.nil?
-          @keyword == other.keyword && @uri == other.uri && @url == other.url
+          @keyword == other.keyword &&
+            @type == other.type &&
+            @domain == other.domain
         end
         alias :eql? :'=='
 
+        def domain_equal?(other)
+          return false if other.nil?
+          @type == other.type && @domain == other.domain
+        end
+
         def to_s
           @keyword.to_s
         end

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

@@ -13,6 +13,8 @@ module BELParser
         attr_accessor :keyword
         attr_accessor :uri
         attr_accessor :url
+        attr_reader   :uri_reader
+        attr_reader   :url_reader
 
         def initialize(keyword, uri = nil, url = nil, options = {})
           raise(ArgumentError, 'keyword is nil') unless keyword
@@ -29,6 +31,14 @@ module BELParser
           BELParser::Resource::Reader.assert_reader(@url_reader, 'url_reader')
         end
 
+        def initialize_copy(original)
+          @keyword    = original.keyword
+          @uri        = original.uri
+          @uri_reader = original.uri_reader
+          @url        = original.url
+          @url_reader = original.url_reader
+        end
+
         def uri?
           !@uri.nil?
         end
@@ -75,6 +85,11 @@ module BELParser
         end
         alias :eql? :'=='
 
+        def domain_equal?(other)
+          return false if other.nil?
+          @uri == other.uri && @url == other.url
+        end
+
         def to_s
           @keyword.to_s
         end

metadata

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