diametric 0.1.2-java → 0.1.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003a4465b11cc5367d54854afa10ee49174009da
-  data.tar.gz: e18bf5c1010b430be842eb4761ae266c9c7c320c
+  metadata.gz: e33d2c190cf89818d0e623f7dedffd139c273549
+  data.tar.gz: 77fcb0a54f756308a0dd808d77893e62e4a5f432
 SHA512:
-  metadata.gz: 01275e6f3572c97559ca8a1592f87dea5b9494d455b64fc1131f1e57fd649542ee2b09590121d4b64cec89791009852951559712e23d5a62e61637df2dbb385d
-  data.tar.gz: 6af0a5a63dc06d64ee2c7c5f44330bd261def83c770d696822000cd94b19b2fe776dcc6b9a0909033c988bdb64971e7e55a03bdea91665a8b0c4b37a70f629f3
+  metadata.gz: cf5983349bf0b1306888758d9e4ae2159a7cb2e6f5fc48383efd14c8c884be66072c586b92f92c6a3cbaf8d25944f70e58d48038973fc5d903055b2db4965768
+  data.tar.gz: dba8bf24716e7aff49b44d4fb65d325a604ace446fb190d57d239ab4c74f55e1cec2b3b2f93e46a6c83c6ef220ece06c5043e1d6893888a5c02d23f184ff7710

data/Gemfile

@@ -3,13 +3,13 @@
 source 'https://rubygems.org'
 
 gem 'edn', '~> 1.0.2'
-gem 'activesupport', '~> 3.2.14'
-gem 'activemodel', '~> 3.2.14'
+gem 'activesupport', '~> 3.2.16'
+gem 'activemodel', '~> 3.2.16'
 gem 'datomic-client', '~> 0.4.1'
 gem 'rubyzip', '~> 0.9.9'
 
 gem 'lock_jar', '~> 0.7.5', :platform => :jruby
-gem 'jruby-openssl', '~> 0.8.8', :platform => :jruby
+gem 'jruby-openssl', :platform => :jruby
 gem 'uuid', '~> 2.3.7'
 
 gem 'rspec', '~> 2.14.1'

data/Jarfile

@@ -1,20 +1,27 @@
+# -*- ruby -*-
 repository 'http://clojars.org/repo/'
 repository 'https://repository.jboss.org/nexus/content/groups/public/'
 repository 'http://files.couchbase.com/maven2/'
 
-datomic_names = File.read(File.join(File.dirname(__FILE__), "datomic_version.yml"))
+if ENV["DATOMIC_VERSION_PATH"] &&
+   !ENV["DATOMIC_VERSION_PATH"].empty?
+   File.exists?(ENV["DATOMIC_VERSION_PATH"])
+   datomic_version_path = ENV["DATOMIC_VERSION_PATH"]
+else
+   datomic_version_path = File.join(File.dirname(__FILE__), "datomic_version.yml")
+end
+
 require 'yaml'
-datomic_versions = YAML.load(datomic_names)
+datomic_versions = YAML.load(File.read(datomic_version_path))
 
 if ENV['DIAMETRIC_ENV'] && (ENV['DIAMETRIC_ENV'] == "pro")
+  artifactId = "datomic-pro"
   datomic_version = datomic_versions["pro"]
 else
+  artifactId = "datomic-free"
   datomic_version = datomic_versions["free"]
 end
-version = /(\d|\.)+/.match(datomic_version)[0]
-datomic_version.slice!(version)
-artifactId = datomic_version.chop
 
 group :default, :runtime do
-  jar "com.datomic:#{artifactId}:#{version}"
+  jar "com.datomic:#{artifactId}:#{datomic_version}"
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Clinton N. Dreisbach
+Copyright (c) 2012-2014 Clinton N. Dreisbach
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -9,38 +9,27 @@ as entities into a Datomic database.
 
 
 Diametric supports both CRuby and JRuby.
-When you are on CRuby, you can use Datomic's REST service.
-While you are creating data and making queries, Diametric is poking around Datomic's REST API.
-When you are on JRuby, you can use Datomic's REST and Peer services.
-If you are using Peer service, Diametric is poking Datomic's clojure API and some clojure functions.
+When Diametric is used on CRuby, Diametric connects to Datomic's REST service.
+Using Datomic's REST API, Diametric creates scheam/data and makes a queries to Datomic.
+When Diametric is used on JRuby, both Datomic's REST and Peer services are supported.
+The core parts of Peer service are implemented using Datomic API.
 
 
 For Rubyists who are familiar with object oriented programming, Diametric converts:
 - Ruby model definition to Datomic schema
 - Creating, saving and updating model data to Datomic transaction data
 - Ruby query to Datomic's datalog query
+- Datomic's dbid to model object (depends on the value of resolve option)
 
 
 The biggest difference between REST and Peer services is available database types.
-REST service can use memory database only, which means you can't save data in any file.
+REST service can use memory database only, which means we can't save data in any file
+as long as using free version.
 While Peer service can use memory and free version of transactor,
-which means you can save data in a file through Datomic's transactor.
+which means we can save data in a file through Datomic's transactor.
 Other than that, Peer service has excellent API to use Datomic's various features.
 
 
-## Documents
-
-Other than highlights below, there are documents on Wiki.
-
-- [Entity API](https://github.com/relevance/diametric/wiki/Entity-API)
-- [Query API](https://github.com/relevance/diametric/wiki/Query-API)
-- [Persistence API](https://github.com/relevance/diametric/wiki/Persistence-API)
-- [Rails Integration](https://github.com/relevance/diametric/wiki/Rails-Integration-%28Experimental%29)
-- [Seattle Example](https://github.com/relevance/diametric/wiki/Seattle-Example)
-
-
-This document shows how to use Diametric with simple examples.
-
 ## Installation
 
 ```bash
@@ -48,7 +37,7 @@ gem install diametric
 ```
 
 Diametric is a multi-platoform gem. On CRuby, above installs CRuby version of gem.
-On JRuby, it is JRuby version of gem with Java extension.
+On JRuby, above installed JRuby version of gem with Java extension.
 
 
 [note]
@@ -78,14 +67,14 @@ To learn more about the options in the above command, please go to [http://docs.
 Once the REST server starts running, go to [localhost:9000](localhost:9000) on your browser.
 You can see Datomic's REST service is running.
 
-Alternatively, you can download Datomic archive from [http://downloads.datomic.com/free.htm](http://downloads.datomic.com/free.html),
+Alternatively, you can download Datomic archive from [https://my.datomic.com/downloads/free](https://my.datomic.com/downloads/free),
 and start REST server using Datomic command, `script/datomic-rest -p 9000 free datomic:mem://`
 
 
 ## Preparation for JRuby
 
-You have 2 choices on JRuby, Peer and REST service.
-Peer service works on the same JVM as JRuby and is just a Java library for JRuby.
+You have 2 choices on JRuby, Peer and REST services.
+Peer service works on the same JVM as JRuby and looks like just a Java library for JRuby.
 
 
 When you choose REST service, follow *Preparation for CRuby* section.
@@ -612,7 +601,7 @@ Breeze likes #<Set: {"chocolate", "afternoon", "biking"}>
 ```
 The order is not guaranteed.
 
-## Association (Peer only)
+## Association
 
 On Datomic, association is fairly easy even though it is one to many or many to many.
 Association is defined by `Ref` type.
@@ -678,6 +667,45 @@ Somebody.reify(me.kids.first.mom).name
  => "Alice Wonderland"
 ```
 
+## Datomic Verion
+
+Diametric sets up the default Datomic version.
+On that version, all Daimetric's tests passes.
+However, Datomic team frequently releases a new version.
+Just to update Datomic version, Diametric won't make a new release.
+From version 0.1.3, Diametric supports user defined Datomic version.
+
+Here is how a user can use a newer version of Datomic.
+
+
+Specify a datomic version file by `ENV["DATOMIC_VERSION_PATH"]` *before* `require 'diametric'`.
+
+For example:
+```ruby
+ENV["DATOMIC_VERSION_PATH"] = File.expand_path(File.join(File.dirname(__FILE__), "..", "datomic_version.yml"))
+require 'diametric'
+```
+
+The format of datomic version file is simple yaml. For example:
+```ruby
+free:
+  0.9.4532
+pro:
+  0.9.4470
+```
+
+## Other Documents
+
+More than highlights above, there are documents on Wiki.
+
+- [Entity API](https://github.com/relevance/diametric/wiki/Entity-API)
+- [Query API](https://github.com/relevance/diametric/wiki/Query-API)
+- [Persistence API](https://github.com/relevance/diametric/wiki/Persistence-API)
+- [Rails Integration](https://github.com/relevance/diametric/wiki/Rails-Integration-%28Experimental%29)
+- [Seattle Example](https://github.com/relevance/diametric/wiki/Seattle-Example)
+
+
+
 ## Thanks
 
 Development of Diametric was sponsored by [Relevance][]. They are the
@@ -696,7 +724,9 @@ Special thanks to Mongoid for writing some solid ORM code that was liberally bor
 
 ## License
 
-This project uses the [BSD License][].
+This project uses the [MIT License][].
+
+When this project is used, a user is considered agreed to the [Datomic Free Edition License][].
 
 Copyright (c) 2012, Clinton Dreisbach & Relevance Inc. All rights reserved.
 
@@ -709,4 +739,5 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 [Datomic]: http://www.datomic.com
 [Relevance]: http://www.thinkrelevance.com
-[BSD License]: http://opensource.org/licenses/BSD-2-Clause
+[MIT License]: http://opensource.org/licenses/MIT
+[Datomic Free Edition License]: https://my.datomic.com/downloads/free

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- ruby -*-
 begin
   require 'rake'
   require 'rspec/core/rake_task'

data/bin/datomic-rest

@@ -23,7 +23,7 @@ opts = OptionParser.new do |opts|
 end
 opts.parse!
 
-DATOMIC_NAME = File.read(File.join(File.dirname(__FILE__), "..", "datomic_version.cnf"))
+DATOMIC_NAME = File.read(File.join(File.dirname(__FILE__), "..", "datomic_version.yml"))
 
 require 'diametric/rest_service'
 

data/bin/download-datomic

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-DATOMIC_NAME = File.read(File.join(File.dirname(__FILE__), "..", "datomic_version.cnf"))
+DATOMIC_NAME = File.read(File.join(File.dirname(__FILE__), "..", "datomic_version.yml"))
 
 require 'diametric/rest_service'
 

data/datomic_version.yml

@@ -1,4 +1,4 @@
 free:
-  datomic-free-0.8.4122
+  0.9.4532
 pro:
-  datomic-pro-0.8.4122
+  0.8.4532

data/diametric-java.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |gem|
   gem.name          = "diametric"
   gem.version       = Diametric::VERSION
   gem.authors       = ["Clinton N. Dreisbach", "Ryan K. Neufeld", "Yoko Harada"]
+  gem.license       = 'MIT'
   gem.email         = ["crnixon@gmail.com", "ryan@thinkrelevance.com", "yoko@thinkrelevance.com"]
   gem.summary       = %q{ActiveModel for Datomic (JRuby)}
   gem.description   = <<EOF
@@ -24,16 +25,16 @@ EOF
   gem.require_paths = ["lib"]
   gem.executables = ["datomic-rest", "download-datomic"]
 
-  gem.add_dependency 'edn', '~> 1.0.2'
-  gem.add_dependency 'activesupport', '~> 3.2.14'
-  gem.add_dependency 'activemodel', '~> 3.2.14'
-  gem.add_dependency 'datomic-client', '~> 0.4.1'
-  gem.add_dependency 'rubyzip', '~> 0.9.9'
-  gem.add_dependency 'lock_jar', '~> 0.7.5'
-  gem.add_dependency 'jruby-openssl', '~> 0.8.8'
-  gem.add_dependency 'uuid', '~> 2.3.7'
-  gem.add_dependency 'rspec', '~> 2.14.1'
-  gem.add_dependency 'rake-compiler', '~> 0.9.1'
+  gem.add_dependency 'edn', '~> 1.0', '>= 1.0.2'
+  gem.add_dependency 'activesupport', '~> 3.2', '>= 3.2.16'
+  gem.add_dependency 'activemodel', '~> 3.2', '>= 3.2.16'
+  gem.add_dependency 'datomic-client', '~> 0.4', '>= 0.4.1'
+  gem.add_dependency 'rubyzip', '~> 0.9', '>= 0.9.9'
+  gem.add_dependency 'lock_jar', '~> 0.7', '>= 0.7.5'
+  gem.add_dependency 'jruby-openssl', '~> 0.8', '>= 0.8.8'
+  gem.add_dependency 'uuid', '~> 2.3', '>= 2.3.7'
+  gem.add_dependency 'rspec', '~> 2.14', '>= 2.14.1'
+  gem.add_dependency 'rake-compiler', '~> 0.9', '>= 0.9.1'
 
   gem.extensions = ['Rakefile']
 end

data/ext/diametric/DiametricCollection.java

@@ -32,6 +32,13 @@ public class DiametricCollection extends RubyObject {
     private Integer count = null;  // unable to count the vector size that exceeds Integer
     private DiametricCommon common = null;
 
+    static IRubyObject getDiametricCollection(ThreadContext context, List value) {
+        RubyClass clazz = (RubyClass)context.getRuntime().getClassFromPath("Diametric::Persistence::Collection");
+        DiametricCollection diametric_collection = (DiametricCollection)clazz.allocate();
+        diametric_collection.init((List)value);
+        return diametric_collection;
+    }
+
     public DiametricCollection(Ruby runtime, RubyClass klazz) {
         super(runtime, klazz);
     }
@@ -56,7 +63,7 @@ public class DiametricCollection extends RubyObject {
         try {
             clojure.lang.PersistentVector value =
                     (clojure.lang.PersistentVector)arg.toJava(clojure.lang.PersistentVector.class);
-            return DiametricUtils.getDiametricCollection(context, (List)value);
+            return DiametricCollection.getDiametricCollection(context, (List)value);
         } catch (Throwable t) {
             throw context.getRuntime().newRuntimeError(t.getMessage());
         }
@@ -69,7 +76,7 @@ public class DiametricCollection extends RubyObject {
                     (clojure.lang.PersistentVector)arg.toJava(clojure.lang.PersistentVector.class);
             Var var = DiametricService.getFn("clojure.core", "take");
             Object value = var.invoke(100, v);
-            return DiametricUtils.getDiametricCollection(context, (List)value);
+            return DiametricCollection.getDiametricCollection(context, (List)value);
         } catch (Throwable t) {
             throw context.getRuntime().newRuntimeError(t.getMessage());
         }
@@ -91,21 +98,21 @@ public class DiametricCollection extends RubyObject {
             throw context.getRuntime().newRuntimeError("argument should be array");
         }
         List other = (List)arg;
-        Var two_arrays_diff_fn = null;
-        if (DiametricService.fnMap.containsKey("two-arrays-diff")) {
-            two_arrays_diff_fn = DiametricService.fnMap.get("two-arrays-diff");
-        } else {
-            Var var = DiametricService.getFn("clojure.core", "load-string");
-            String fn =
-                    "(defn two-arrays-diff [this other]\n" +
-                    "  (let [f (fn [ary n] (remove (partial = n) ary))]\n"+
-                    "    (reduce f this other)))";
-            two_arrays_diff_fn = (Var)var.invoke(fn);
-            DiametricService.fnMap.put("two-arrays-diff", two_arrays_diff_fn);
-        }
         try {
+            Var two_arrays_diff_fn = null;
+            if (DiametricService.fnMap.containsKey("two-arrays-diff")) {
+                two_arrays_diff_fn = DiametricService.fnMap.get("two-arrays-diff");
+            } else {
+                Var var = DiametricService.getFn("clojure.core", "load-string");
+                String fn =
+                        "(defn two-arrays-diff [this other]\n" +
+                        "  (let [f (fn [ary n] (remove (partial = n) ary))]\n"+
+                        "    (reduce f this other)))";
+                two_arrays_diff_fn = (Var)var.invoke(fn);
+                DiametricService.fnMap.put("two-arrays-diff", two_arrays_diff_fn);
+            }
             Object value = two_arrays_diff_fn.invoke(vector_or_seq, other);
-            return DiametricUtils.getDiametricCollection(context, (List)value);
+            return DiametricCollection.getDiametricCollection(context, (List)value);
         } catch (Throwable t) {
             throw context.getRuntime().newRuntimeError(t.getMessage());
         }
@@ -114,18 +121,18 @@ public class DiametricCollection extends RubyObject {
     @JRubyMethod(name="*")
     public IRubyObject op_times(ThreadContext context, IRubyObject arg) {
         if (arg instanceof RubyFixnum) {
-            Var append_n_times_fn = null;
-            if (DiametricService.fnMap.containsKey("append-n-times")) {
-                append_n_times_fn = DiametricService.fnMap.get("append-n-times");
-            } else {
-                Var var = DiametricService.getFn("clojure.core", "load-string");
-                append_n_times_fn = (Var)var.invoke("(defn append-n-times [n array] (reduce concat (replicate n array)))");
-                DiametricService.fnMap.put("append-n-times", append_n_times_fn);
-            }
-            Integer n = (Integer)arg.toJava(Integer.class);
             try {
+                Var append_n_times_fn = null;
+                if (DiametricService.fnMap.containsKey("append-n-times")) {
+                    append_n_times_fn = DiametricService.fnMap.get("append-n-times");
+                } else {
+                    Var var = DiametricService.getFn("clojure.core", "load-string");
+                    append_n_times_fn = (Var)var.invoke("(defn append-n-times [n array] (reduce concat (replicate n array)))");
+                    DiametricService.fnMap.put("append-n-times", append_n_times_fn);
+                }
+                Integer n = (Integer)arg.toJava(Integer.class);
                 Object value = append_n_times_fn.invoke(n, vector_or_seq);
-                return DiametricUtils.getDiametricCollection(context, (List)value);
+                return DiametricCollection.getDiametricCollection(context, (List)value);
             } catch (Throwable t) {
                 throw context.getRuntime().newRuntimeError(t.getMessage());
             }
@@ -145,7 +152,7 @@ public class DiametricCollection extends RubyObject {
         try {
             Var var = DiametricService.getFn("clojure.core", "concat");
             Object value = var.invoke(vector_or_seq, other);
-            return DiametricUtils.getDiametricCollection(context, (List)value);
+            return DiametricCollection.getDiametricCollection(context, (List)value);
         } catch (Throwable t) {
             throw context.getRuntime().newRuntimeError(t.getMessage());
         }
@@ -196,8 +203,8 @@ public class DiametricCollection extends RubyObject {
             return commonArefIndex(context, index);
         } else if (index_or_range instanceof RubyRange) {
             RubyRange range = (RubyRange)index_or_range;
-            Long start = (Long)range.first().toJava(Long.class);
-            Long last = (Long)range.last().toJava(Long.class);
+            Long start = (Long)range.first(context).toJava(Long.class);
+            Long last = (Long)range.last(context).toJava(Long.class);
             // subvec returns from 'start' to element (- end 1)
             if (range.exclude_end_p().isTrue()) {
                 return commonAref(context, start, null, last);
@@ -255,7 +262,7 @@ public class DiametricCollection extends RubyObject {
                 if (length == null) length = last - start;
                 value = commonArefByDropTake(start, length);
             }
-            return DiametricUtils.getDiametricCollection(context, (List)value);
+            return DiametricCollection.getDiametricCollection(context, (List)value);
         } catch (Throwable t) {
             if (t instanceof IndexOutOfBoundsException) {
                 return retryAref(context, start, length, last);
@@ -621,16 +628,16 @@ public class DiametricCollection extends RubyObject {
 
     @JRubyMethod(name="include?")
     public IRubyObject include_p(ThreadContext context, IRubyObject arg) {
-        Var include_p_fn = null;
-        if (DiametricService.fnMap.containsKey("include?")) {
-            include_p_fn = DiametricService.fnMap.get("include?");
-        } else {
-            Var var = DiametricService.getFn("clojure.core", "load-string");
-            include_p_fn = (Var)var.invoke("(defn include? [v array] (some (partial = v) array))");
-            DiametricService.fnMap.put("include?", include_p_fn);
-        }
-        Object java_object = DiametricUtils.convertRubyToJava(context, arg);
         try {
+            Var include_p_fn = null;
+            if (DiametricService.fnMap.containsKey("include?")) {
+                include_p_fn = DiametricService.fnMap.get("include?");
+            } else {
+                Var var = DiametricService.getFn("clojure.core", "load-string");
+                include_p_fn = (Var)var.invoke("(defn include? [v array] (some (partial = v) array))");
+                DiametricService.fnMap.put("include?", include_p_fn);
+            }
+            Object java_object = DiametricUtils.convertRubyToJava(context, arg);
             Object result = include_p_fn.invoke(java_object, vector_or_seq);
             if ((result instanceof Boolean) && (Boolean)result) {
                 return context.getRuntime().getTrue();

data/ext/diametric/DiametricConnection.java

@@ -40,7 +40,7 @@ public class DiametricConnection extends RubyObject {
     @JRubyMethod
     public IRubyObject db(ThreadContext context) {
         try {
-            Object database = clojure.lang.RT.var("datomic.api", "db").invoke(conn);
+            Object database = DiametricService.getFn("datomic.api", "db").invoke(conn);
             RubyClass clazz = (RubyClass)context.getRuntime().getClassFromPath("Diametric::Persistence::Database");
             DiametricDatabase diametric_database = (DiametricDatabase)clazz.allocate();
             diametric_database.init(database);
@@ -52,13 +52,14 @@ public class DiametricConnection extends RubyObject {
 
     @JRubyMethod
     public IRubyObject transact(ThreadContext context, IRubyObject arg) {
-        List<Object> tx_data = DiametricUtils.convertRubyTxDataToJava(context, arg);
-        if (tx_data == null) {
-            throw context.getRuntime().newArgumentError("Argument should be Array or clojure.lang.PersistentVector");
-        }
-
         try {
-            Object future = clojure.lang.RT.var("datomic.api", "transact").invoke(conn, tx_data);
+            List<Object> tx_data = DiametricUtils.convertRubyTxDataToJava(context, arg); // may raise exception
+            if (tx_data == null) {
+                throw context.getRuntime().newArgumentError("Argument should be Array or clojure.lang.PersistentVector");
+            }
+
+            //System.out.println("tx_data: " + tx_data.toString() + " class: " + tx_data.getClass().getCanonicalName());
+            Object future = DiametricService.getFn("datomic.api", "transact").invoke(conn, tx_data);
             RubyClass clazz = (RubyClass)context.getRuntime().getClassFromPath("Diametric::Persistence::ListenableFuture");
             DiametricListenableFuture diametric_listenable = (DiametricListenableFuture)clazz.allocate();
             diametric_listenable.init(future);
@@ -70,13 +71,13 @@ public class DiametricConnection extends RubyObject {
 
     @JRubyMethod
     public IRubyObject transact_async(ThreadContext context, IRubyObject arg) {
-        List<Object> tx_data = DiametricUtils.convertRubyTxDataToJava(context, arg);
-        if (tx_data == null) {
-            throw context.getRuntime().newArgumentError("Argument should be Array or clojure.lang.PersistentVector");
-        }
-
         try {
-            Object future = clojure.lang.RT.var("datomic.api", "transact-async").invoke(conn, tx_data);
+            List<Object> tx_data = DiametricUtils.convertRubyTxDataToJava(context, arg); // my raise exception
+            if (tx_data == null) {
+                throw context.getRuntime().newArgumentError("Argument should be Array or clojure.lang.PersistentVector");
+            }
+
+            Object future = DiametricService.getFn("datomic.api", "transact-async").invoke(conn, tx_data);
             RubyClass clazz = (RubyClass)context.getRuntime().getClassFromPath("Diametric::Persistence::ListenableFuture");
             DiametricListenableFuture diametric_listenable = (DiametricListenableFuture)clazz.allocate();
             diametric_listenable.init(future);
@@ -94,7 +95,7 @@ public class DiametricConnection extends RubyObject {
         RubyTime rubyTime = (RubyTime) RuntimeHelpers.invoke(context, arg, "to_time");
         Date olderThan = rubyTime.getJavaDate();
         try {
-            clojure.lang.RT.var("datomic.api", "gc-strage").invoke(conn, olderThan);
+            DiametricService.getFn("datomic.api", "gc-strage").invoke(conn, olderThan);
         } catch (Throwable t) {
             throw context.getRuntime().newRuntimeError("Datomic error: " + t.getMessage());
         }
@@ -104,7 +105,7 @@ public class DiametricConnection extends RubyObject {
     @JRubyMethod
     public IRubyObject release(ThreadContext context) {
         try {
-            clojure.lang.RT.var("datomic.api", "release").invoke(conn);
+            DiametricService.getFn("datomic.api", "release").invoke(conn);
         } catch (Throwable t) {
             throw context.getRuntime().newRuntimeError(t.getMessage());
         }