bel_parser 1.0.8-java → 1.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e17eed384f00ecf44db62442bd890db389ff37
-  data.tar.gz: 05bc31a364cd462b9f9302fdbc9381a54b8681fd
+  metadata.gz: a17fcac70824801862008244e63511f2818c7c25
+  data.tar.gz: 9b75fc330bc14548130fefee3f2e374a7b3b61be
 SHA512:
-  metadata.gz: ce0a5a89ef0b17df2f3714f5698fa9ebe588d9cdfc897e8b30422131efb537b3b855129d064f997299c942e4b84e9f7998666d5e1fe1794c27ae5efd306c8f28
-  data.tar.gz: 535c629ca1bd344eda4147a97e40b4c62c63b429f59b757b03c90d3e5064120f0471a8de3f267556b3503c0ed00051efa22b2de1d468353fbca7ec5beaa1ac22
+  metadata.gz: 339e98c13500e442006feb3e7cb929197affcf17c23d24e89e4d09a1c74ea7581821907df4a66445d5f306453755d426a3cd99797adb623fb691d31f350fa65a
+  data.tar.gz: deb11d3e785b69bbfb4f072ed7647275fd7f0be3f029357459ec68ba9a066148d4ef05cd026253378efbd2855a10c2d8a707e376b97c8ce10654066f006d3047

data/{.gemspec-java → .gemspec}

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
                                  'Anthony Bargnesi',
                                  'Nick Bargnesi',
                                ]
-  spec.date                  = %q{2016-06-17}
+  spec.date                  = %q{2017-01-13}
   spec.email                 = %q{abargnesi@selventa.com}
   spec.files                 = [
                                  Dir.glob('lib/**/*.{rb,rl}'),
@@ -26,8 +26,15 @@ Gem::Specification.new do |spec|
   spec.require_paths         = ['lib']
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.platform              = 'java'
-  spec.add_runtime_dependency  'sparql-client', '~> 2.0.0'
-  spec.add_runtime_dependency  'dbm-mapdb3',    '~> 0.6.0.beta'
+  if RUBY_ENGINE =~ /jruby/
+    spec.platform               = 'java'
+    spec.add_runtime_dependency   'sparql-client',       '~> 2.0.0'
+    spec.add_runtime_dependency   'dbm-mapdb3',          '~> 0.6.0.beta'
+    spec.add_runtime_dependency   'levenshtein-jruby',   '0.1.0'
+  else
+    spec.platform               = 'ruby'
+    spec.add_runtime_dependency   'sparql-client',       '~> 2.0.0'
+    spec.add_runtime_dependency   'damerau-levenshtein', '1.2.0'
+  end
 end
 # vim: ft=ruby

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.1.1

data/bin/bel2_compatibility

@@ -15,6 +15,18 @@ OptionParser.new do |opts|
   opts.banner = <<-USAGE.gsub(/^ {4}/, '')
     Confirm compatibility with BEL 2.0 expressions.
   USAGE
+
+  if RUBY_ENGINE =~ /^jruby/i
+    opts.on(
+      '-t',
+      '--read-jena-tdb DIRECTORY',
+      'Jena TDB directory containing BEL RDF resources.') do |tdb|
+
+        require 'bel_parser/resource/jena_tdb_reader'
+        options[:uri_reader] = BELParser::Resource::JenaTDBReader.new(tdb)
+        BELParser::Resource.default_uri_reader = options[:uri_reader]
+      end
+  end
 end.parse!
 
 def syntax_results(results)
@@ -32,15 +44,6 @@ end
 require 'bel_parser/expression/validator'
 require 'bel_parser/resource/resource_url_reader'
 
-uri_reader, url_reader = options.values_at(:uri_reader, :url_reader)
-
-namespaces = Hash[
-  ARGV.map do |ns|
-    keyword, identifier = ns.split('=')
-    [keyword, BELParser::Expression::Model::Namespace.new(keyword, identifier, nil)]
-  end.compact
-]
-
 def validate(expression)
   v2 = BELParser::Language.specification('2.0')
   ns = {

data/bin/bel2_upgrade

@@ -20,6 +20,18 @@ OptionParser.new do |opts|
   opts.on('-f', '--file FILE', 'BEL script file to read.') do |bel|
     options[:file] = bel
   end
+
+  if RUBY_ENGINE =~ /^jruby/i
+    opts.on(
+      '-t',
+      '--read-jena-tdb DIRECTORY',
+      'Jena TDB directory containing BEL RDF resources.') do |tdb|
+
+        require 'bel_parser/resource/jena_tdb_reader'
+        options[:uri_reader] = BELParser::Resource::JenaTDBReader.new(tdb)
+        BELParser::Resource.default_uri_reader = options[:uri_reader]
+      end
+  end
 end.parse!
 
 file = options[:file]
@@ -49,7 +61,7 @@ puts serialize(
     value(
       string('"2.0"'))))
 BELParser::ASTGenerator.new(io).each do |result|
-  line_number, line, asts = result
+  _, line, asts = result
 
   document_property =
     asts.find { |ast|
@@ -57,17 +69,17 @@ BELParser::ASTGenerator.new(io).each do |result|
     }
   next if document_property && document_property.name.identifier.string_literal.downcase == 'belversion'
 
-  ast =
+  convert_ast =
     asts.find do |ast|
       ast && CONVERSION_TYPES.include?(ast.type)
     end
 
-  if ast
-    ast =
-      upgrades.reduce(ast) do |ast, upgrade|
+  if convert_ast
+    puts serialize(
+      upgrades.reduce(convert_ast) do |ast, upgrade|
         upgrade.process(ast)
       end
-    puts serialize(ast)
+    )
   else
     puts line
   end

data/bin/bel2_validator

@@ -62,6 +62,7 @@ OptionParser.new do |opts|
 
         require 'bel_parser/resource/jena_tdb_reader'
         options[:uri_reader] = BELParser::Resource::JenaTDBReader.new(tdb)
+        BELParser::Resource.default_uri_reader = options[:uri_reader]
       end
   end
 end.parse!
@@ -104,14 +105,16 @@ BELParser::Expression::Validator
 
     puts "  Semantics results:"
     results.semantics_results.each do |res|
-      if res.is_a?(BELParser::Language::Semantics::SignatureMappingSuccess)
+      case res
+      when BELParser::Language::Semantics::SignatureMappingSuccess
         puts "    Matched signature: #{res.signature.string_form}"
-      end
-      if res.is_a?(BELParser::Language::Semantics::SignatureMappingWarning)
+      when BELParser::Language::Semantics::SignatureMappingWarning
         puts "    Failed signature: #{res.signature.string_form}"
         res.results.select(&:failure?).each do |warning|
           puts "      #{warning}"
         end
+      when BELParser::Language::Semantics::SemanticsWarning
+        puts "    Warning: #{res}"
       end
     end
   end

data/bin/bel_script_reader

@@ -62,6 +62,7 @@ OptionParser.new do |opts|
 
         require 'bel_parser/resource/jena_tdb_reader'
         options[:uri_reader] = BELParser::Resource::JenaTDBReader.new(tdb)
+        BELParser::Resource.default_uri_reader = options[:uri_reader]
       end
   end
 end.parse!