datomic-client 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.0
+* query endpoint takes query arg first to match endpoint syntax
+* query endpoint can a take user's args
+
 ## 0.3.0
 * Update to work for 0.8.3520 - makes breaking changes for previous APIs
 * Remove monitor method

data/README.md

@@ -56,8 +56,9 @@ Please report them [on github](http://github.com/cldwalker/datomic-client/issues
 
 ## Credits
 
-* @crnixon for adding edn support
+* @crnixon for adding edn support and improving #query
 * @flyingmachine for starting this with me
+* @relevance for fridays to work on this
 
 ## Links
 

data/datomic-client.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 2.11'
   s.add_development_dependency 'rake', '~> 0.9.2.2'
   s.add_dependency 'rest-client', '~> 1.6.7'
-  s.add_dependency 'edn', '~> 0.9.1'
+  s.add_dependency 'edn', '~> 0.9.4'
 end

data/lib/datomic/client.rb

@@ -1,7 +1,6 @@
 require 'datomic/client/version'
 require 'datomic/client/response'
 require 'rest-client'
-require 'set' # Remove when fixed upstream
 require 'edn'
 
 module Datomic
@@ -54,9 +53,14 @@ module Datomic
     end
 
     # Query can be a ruby data structure or a string representing clojure data
-    def query(dbname, query, params = {})
+    # If the args_or_dbname is a String, it will be converted into one arg
+    # pointing to that database.
+    def query(query, args_or_dbname, params = {})
       query = transmute_data(query)
-      args = [{:"db/alias" => [@storage, dbname].join('/')}].to_edn
+      args = args_or_dbname.is_a?(String) ?
+        [{:"db/alias" => [@storage, args_or_dbname].join('/')}] :
+        args_or_dbname
+      args = transmute_data(args)
       get root_url("api/query"), params.merge(:q => query, :args => args)
     end
 

data/lib/datomic/client/version.rb

@@ -1,5 +1,5 @@
 module Datomic
   class Client
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/spec/datomic_client_spec.rb

@@ -4,8 +4,9 @@ require 'datomic/client'
 #   bin/rest 9000 socrates datomic:mem://
 describe Datomic::Client do
   let(:datomic_uri) { ENV['DATOMIC_URI'] || 'http://localhost:9000' }
+  let(:storage) { ENV['DATOMIC_STORAGE'] || 'socrates' }
   let(:client) do
-    Datomic::Client.new datomic_uri, ENV['DATOMIC_STORAGE'] || 'socrates'
+    Datomic::Client.new datomic_uri, storage
   end
   let(:schema) { File.read(File.expand_path('../fixtures/seattle-schema.dtm', __FILE__)) }
 
@@ -125,34 +126,53 @@ describe Datomic::Client do
   end
 
   describe "#query" do
+    let(:db_id) { 1 }
+
     before {
       client.create_database('test-query')
       client.transact('test-query', schema)
-      client.transact('test-query', [[:"db/add", 1, :"community/name", "Some Community"]])
+      client.transact('test-query', [{:"db/id" => db_id, :"community/name" => "Some Community"}])
     }
 
-    it "returns a correct response with a string query" do
-      resp = client.query('test-query', '[:find ?c :where [?c :community/name]]')
-      resp.code.should == 200
-      resp.data.should be_a(Array)
-      resp.data.should == [[1]]
-    end
+    context "with a dbname passed in for args" do
+      it "returns a correct response with a string query" do
+        resp = client.query('[:find ?e :where [?e :community/name "Some Community"]]', 'test-query')
+        resp.code.should == 200
+        resp.data.should be_a(Array)
+      end
 
-    it "returns a correct response with limit param" do
-      resp = client.query('test-query', '[:find ?c :where [?c :community/name]]', :limit => 0)
-      resp.code.should == 200
-      resp.data.should be_a(Array)
-      resp.data.should == []
-    end
+      it "returns a correct response with limit param" do
+        resp = client.query('[:find ?c :where [?c :community/name]]', 'test-query', :limit => 0)
+        resp.code.should == 200
+        resp.data.should be_a(Array)
+        resp.data.should == []
+      end
 
-    it "returns a correct response with a data query" do
-      resp = client.query('test-query',
-                    [:find, EDN::Type::Symbol.new('?c'), :where,
-                          [EDN::Type::Symbol.new('?c'), :"community/name"]])
-      resp.code.should == 200
-      resp.data.should be_a(Array)
+      it "returns a correct response with a data query" do
+        resp = client.query([:find, EDN::Type::Symbol.new('?c'), :where,
+                              [EDN::Type::Symbol.new('?c'), :"community/name"]],
+                      'test-query')
+        resp.code.should == 200
+        resp.data.should be_a(Array)
+      end
     end
 
+    context "with an array passed in for args" do
+      it "returns a correct response" do
+        client.transact('test-query', [{
+                            :"db/id" => db_id,
+                            :"community/name" => "Some Community Again"}])
+        query = [:find, ~'?e', ~'?v', :where, [~'?e', :"community/name", ~'?v']]
+
+        resp_without_history = client.query(query, 'test-query')
+        resp_with_history = client.query(query, [{
+                                             :"db/alias" => "#{storage}/test-query",
+                                             :history => true}])
+        resp_with_history.code.should == 200
+        resp_with_history.data.should be_a(Array)
+        resp_with_history.data.count.should > resp_without_history.data.count
+      end
+    end
   end
 
   describe "#events" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datomic-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.4
 description: This gem provides a simple way to use datomic's http API - http://docs.datomic.com/rest.html.
 email: gabriel.horner@gmail.com
 executables: []
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2191169239501310737
+      hash: -555568115578253090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2191169239501310737
+      hash: -555568115578253090
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24