jena-jruby 0.4.0-java → 0.4.1-java

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 .buildpath
 rdoc
 pkg
+*~

data/bin/update_jars_maven

@@ -25,8 +25,8 @@ cp $tdb_root/target/dependency/*.jar javalib
 cp $tdb_root/target/jena-tdb-*SNAPSHOT.jar $tdb_root/target/tdb-*{0,1,2,3,4,5,6,7,8,9}.jar javalib  2>/dev/null
 rm -f javalib/*test*.jar
 
-#echo "Creating log4j config"
-#jar -cf javalib/log4j-config.jar log4j.xml
+echo "Creating log4j config"
+jar -cf javalib/log4j-config.jar log4j.xml
 
 
 

data/jena-jruby.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform.new("java")
   s.authors     = ["Ian Dickinson"]
   s.email       = ["ian@epimorphics.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/ephemerian/jena-jruby"
   s.summary     = %q{JRuby wrapper for Apache Jena}
   s.description = %q{A simple packaging of Apache Jena for JRuby}
 

data/lib/jena_jruby/jars.rb

@@ -2,18 +2,21 @@
 # Use mvn dependency:tree to show deps from the pom.xml
 
 %w[
-log4j-1.2.16.jar
-slf4j-api-1.6.4.jar
-slf4j-log4j12-1.6.4.jar
+log4j-config.jar
 commons-codec-1.5.jar
+hamcrest-core-1.1.jar
 httpclient-4.1.2.jar
 httpcore-4.1.3.jar
-jena-iri-0.9.1-SNAPSHOT.jar
+junit-4.9.jar
+log4j-1.2.16.jar
+slf4j-api-1.6.4.jar
+slf4j-log4j12-1.6.4.jar
 xercesImpl-2.10.0.jar
 xml-apis-1.4.01.jar
-jena-core-2.7.1-SNAPSHOT.jar
-jena-arq-2.9.1-SNAPSHOT.jar
-jena-tdb-0.9.1-SNAPSHOT.jar
+jena-iri-0.9.2-SNAPSHOT.jar
+jena-core-2.7.2-SNAPSHOT.jar
+jena-arq-2.9.2-SNAPSHOT.jar
+jena-tdb-0.9.2-SNAPSHOT.jar
 ].each do |jar|
   require jar
 end

data/lib/jena_jruby/query_utils.rb

@@ -71,8 +71,12 @@ module Jena
     # @param options [Hash] Options (see above)
     # @return [Array] Non-empty array of hashes, one per result
     def self.describe( m, query, options = nil )
-      qexec = setup_query_execution( m, query, options )
+      describe_qe( setup_query_execution( m, query, options ) )
+    end
 
+    # Perform a describe query using the given query execution object, and
+    # return the resulting model
+    def self.describe_qe( qexec )
       begin
         return qexec.execDescribe
       ensure
@@ -146,6 +150,32 @@ module Jena
       select_each_qe( sparql_service( url, query ), *vars, &block )
     end
 
+    # Return a model from a describe query against a remote SPARQL endpoint
+    def self.service_describe( url, query )
+      describe_qe( sparql_service( url, query ) )
+    end
+
+    # Format a given value in a manner suitable for inclusion in a SPARQL query
+    def self.sparql_format( value )
+      if value.is_a? Core::Resource
+        value.is_anon ? "_:#{value.get_id.to_string.gsub(/[^[[:alnum:]]]/, '_')}" : "<#{value.get_uri}>"
+      elsif value.is_a? Core::Literal
+        if dt = value.get_datatype_uri
+          "\"#{value.get_lexical_form}\"^^<#{dt}>"
+        else
+          "\"#{value.to_string}\""
+        end
+      elsif value.to_s =~ /\A(file|http):\/\//
+        "<#{value}>"
+      elsif value.to_s =~ /\A[-_[[:alnum:]]]*:/
+        # looks like a qname
+        value.to_s
+      else
+        # guess
+        "\"#{value.to_s}\""
+      end
+    end
+
     :private
 
     def self.option( options, opt, default )

data/lib/jena_jruby/utils.rb

@@ -12,9 +12,9 @@ module Jena
       pm
     end
 
-    # Return a new resource URN made from a UUID
-    def self.uuid_resource
-      Core::ResourceFactory.createResource( Util::JenaUUID.factory.generate.asURN )
+    # Return a new resource URN made from a UUID. If the given
+    def self.uuid_resource( model = nil )
+      (model || Core::ResourceFactory).createResource( Util::JenaUUID.factory.generate.asURN )
     end
 
     # Return the current time as a literal

data/lib/jena_jruby/version.rb

@@ -1,5 +1,5 @@
 module Jena
   JENA_VERSION='2.7.1-SNAPSHOT'
   TDB_VERSION='0.9.1-SNAPSHOT'
-  JENA_JRUBY_GEM_VERSION='0.4.0'
+  JENA_JRUBY_GEM_VERSION='0.4.1'
 end

data/lib/jena_jruby.rb

@@ -91,19 +91,29 @@ module Jena
 
   module Query
     java_import com.hp.hpl.jena.query.ARQ
-    java_import com.hp.hpl.jena.query.DatasetFactory
+    java_import com.hp.hpl.jena.query.BIOInput
     java_import com.hp.hpl.jena.query.Dataset
+    java_import com.hp.hpl.jena.query.DatasetFactory
     java_import com.hp.hpl.jena.query.DataSource
-    java_import com.hp.hpl.jena.query.QueryExecutionFactory
+    java_import com.hp.hpl.jena.query.LabelExistsException
+    java_import com.hp.hpl.jena.query.ParameterizedSparqlString
+    java_import com.hp.hpl.jena.query.Query
+    java_import com.hp.hpl.jena.query.QueryBuildException
+    java_import com.hp.hpl.jena.query.QueryCancelledException
+    java_import com.hp.hpl.jena.query.QueryException
+    java_import com.hp.hpl.jena.query.QueryExecException
     java_import com.hp.hpl.jena.query.QueryExecution
+    java_import com.hp.hpl.jena.query.QueryExecutionFactory
     java_import com.hp.hpl.jena.query.QueryFactory
-    java_import com.hp.hpl.jena.query.Query
+    java_import com.hp.hpl.jena.query.QueryFatalException
+    java_import com.hp.hpl.jena.query.QueryParseException
     java_import com.hp.hpl.jena.query.QuerySolution
     java_import com.hp.hpl.jena.query.QuerySolutionMap
     java_import com.hp.hpl.jena.query.QueryVisitor
+    java_import com.hp.hpl.jena.query.ReadWrite
+    java_import com.hp.hpl.jena.query.ResultSet
     java_import com.hp.hpl.jena.query.ResultSetFactory
     java_import com.hp.hpl.jena.query.ResultSetFormatter
-    java_import com.hp.hpl.jena.query.ResultSet
     java_import com.hp.hpl.jena.query.ResultSetRewindable
     java_import com.hp.hpl.jena.query.SortCondition
     java_import com.hp.hpl.jena.query.Syntax
@@ -153,6 +163,17 @@ module Jena
     java_import com.hp.hpl.jena.tdb.TDBLoader
     java_import com.hp.hpl.jena.tdb.TDBFactory
   end
+
+  module Assembler
+    java_import com.hp.hpl.jena.assembler.Assembler
+    java_import com.hp.hpl.jena.assembler.Content
+    java_import com.hp.hpl.jena.assembler.AssemblerHelp
+    java_import com.hp.hpl.jena.assembler.JA
+    java_import com.hp.hpl.jena.assembler.Mode
+    java_import com.hp.hpl.jena.assembler.ModelExpansion
+    java_import com.hp.hpl.jena.assembler.ImportManager
+    java_import com.hp.hpl.jena.assembler.RuleSet
+  end
 end
 
 %w[

data/test/query_utils_test.rb

@@ -103,4 +103,14 @@ class QueryUtilsTest < Test::Unit::TestCase
     result = Jena::Query.select_first @m, "select * {?s ?p 42}"
     assert_nil result
   end
+
+  # SPARQL formatting tests
+  def test_sparql_format
+    assert_equal "<http://foo.bar>", Jena::Query.sparql_format( @m.create_resource( "http://foo.bar" ))
+    assert_equal '"foo"', Jena::Query.sparql_format( @m.create_literal( "foo" ))
+    assert_equal '"42"^^<http://www.w3.org/2001/XMLSchema#long>', Jena::Query.sparql_format( @m.create_typed_literal( 42 ))
+    assert_equal "foo:bar", Jena::Query.sparql_format( "foo:bar" )
+    assert_equal "<http://foo.bar>", Jena::Query.sparql_format( "http://foo.bar" )
+    assert Jena::Query.sparql_format( @m.create_resource ).match( /_:([[:alnum:]]*)/ )
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jena-jruby
 version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease:
-  version: 0.4.0
 platform: java
 authors:
 - Ian Dickinson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -72,19 +72,20 @@ files:
 - test/query_utils_test.rb
 - javalib/httpclient-4.1.2.jar
 - javalib/hamcrest-core-1.1.jar
-- javalib/jena-tdb-0.9.1-SNAPSHOT.jar
-- javalib/jena-core-2.7.1-SNAPSHOT.jar
+- javalib/jena-iri-0.9.2-SNAPSHOT.jar
+- javalib/jena-arq-2.9.2-SNAPSHOT.jar
 - javalib/xml-apis-1.4.01.jar
 - javalib/xercesImpl-2.10.0.jar
+- javalib/jena-tdb-0.9.2-SNAPSHOT.jar
 - javalib/slf4j-api-1.6.4.jar
+- javalib/log4j-config.jar
 - javalib/httpcore-4.1.3.jar
+- javalib/jena-core-2.7.2-SNAPSHOT.jar
 - javalib/log4j-1.2.16.jar
-- javalib/jena-arq-2.9.1-SNAPSHOT.jar
-- javalib/jena-iri-0.9.1-SNAPSHOT.jar
 - javalib/junit-4.9.jar
 - javalib/commons-codec-1.5.jar
 - javalib/slf4j-log4j12-1.6.4.jar
-homepage: ''
+homepage: https://github.com/ephemerian/jena-jruby
 licenses: []
 post_install_message:
 rdoc_options: []