bel_parser 1.0.0.alpha.47 → 1.0.0.alpha.48

data/lib/bel_parser/resource/dataset.rb

@@ -29,6 +29,30 @@ module BELParser
       def types
         raise NotImplementedError, "#{__method__} is not implemented."
       end
+
+      def uri?
+        raise NotImplementedError, "#{__method__} is not implemented."
+      end
+
+      def url?
+        raise NotImplementedError, "#{__method__} is not implemented."
+      end
+
+      def <=>(another_dataset)
+        keyword <=> another_dataset.keyword
+      end
+
+      def hash
+        [types, identifier, keyword].hash
+      end
+
+      def ==(another_dataset)
+        return false if another_dataset == nil
+        types      == another_dataset.types &&
+        identifier == another_dataset.identifier &&
+        keyword    == another_dataset.keyword
+      end
+      alias :eql? :'=='
     end
   end
 end

data/lib/bel_parser/resource/file_resource.rb

@@ -16,6 +16,14 @@ module BELParser
         @name       = name.to_s
         @types      = [type]
       end
+
+      def uri?
+        false
+      end
+
+      def url?
+        true
+      end
     end
   end
 end

data/lib/bel_parser/resource/file_resource_value.rb

@@ -19,6 +19,7 @@ module BELParser
             encodings.chars.map(&:to_sym)
           end
       end
+
     end
   end
 end

data/lib/bel_parser/resource/sparql_reader.rb

@@ -122,9 +122,11 @@ module BELParser
         where {
             <<%= uri %>> rdf:type       skos:ConceptScheme .
             <<%= uri %>> rdf:type       ?type .
-            <<%= uri %>> belv:domain    ?domain .
             <<%= uri %>> belv:prefix    ?prefix .
             <<%= uri %>> skos:prefLabel ?prefLabel .
+            optional {
+              <<%= uri %>> belv:domain    ?domain .
+            }
         }
         group by ?domain ?prefix ?prefLabel
       SPARQL

data/lib/bel_parser/resource/value.rb

@@ -26,6 +26,26 @@ module BELParser
       def encodings
         raise NotImplementedError, "#{__method__} is not implemented."
       end
+
+      def <=>(another_value)
+        name <=> another_value.name
+      end
+
+      def hash
+        [dataset, name, encodings].hash
+      end
+
+      def ==(another_value)
+        return false if another_value == nil
+        dataset   == another_value.dataset &&
+        name      == another_value.name &&
+        encodings == another_value.encodings
+      end
+      alias :eql? :'=='
+
+      def to_s
+        name
+      end
     end
   end
 end

data/lib/bel_parser/resource.rb

@@ -5,8 +5,7 @@ require_relative 'resource/resource_url_reader'
 module BELParser
   module Resource
 
-    DEFAULT_SPARQL_ENDPOINT = 'http://build.openbel.org/sparql'
-    #DEFAULT_SPARQL_ENDPOINT = 'http://localhost:3030/identifiers/sparql'
+    DEFAULT_SPARQL_ENDPOINT = 'http://resources.openbel.org/sparql'
 
     READER_LOCK       = Mutex.new
     private_constant :READER_LOCK
@@ -15,27 +14,30 @@ module BELParser
     URISTRING_PATTERN = /^URIString *= *(.*)$/
     private_constant :URISTRING_PATTERN
 
+    @default_uri_reader = SPARQLReader.new(DEFAULT_SPARQL_ENDPOINT, false)
+    @default_url_reader = ResourceURLReader.new
+
     def self.default_uri_reader
       READER_LOCK.synchronize do
-        @default_uri_reader ||= SPARQLReader.new(DEFAULT_SPARQL_ENDPOINT)
+        @default_uri_reader
       end
     end
 
     def self.default_uri_reader=(uri_reader)
       READER_LOCK.synchronize do
-        @default_uri_reader ||= uri_reader
+        @default_uri_reader = uri_reader
       end
     end
 
     def self.default_url_reader
       READER_LOCK.synchronize do
-        @default_url_reader ||= ResourceURLReader.new
+        @default_url_reader
       end
     end
 
     def self.default_url_reader=(url_reader)
       READER_LOCK.synchronize do
-        @default_url_reader ||= url_reader
+        @default_url_reader = url_reader
       end
     end
 

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.47
+  version: 1.0.0.alpha.48
 platform: ruby
 authors:
 - Anthony Bargnesi
 - Nick Bargnesi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: sparql-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: sparql-client
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -380,7 +380,7 @@ homepage: https://github.com/OpenBEL/bel_parser
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -395,9 +395,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Parser for Biolgical Expression Language.
 test_files: []
+has_rdoc: