From d85cacc0312901d8fbe62c5ef40ea5e3ee8f0c85 Mon Sep 17 00:00:00 2001 From: Mike Bell Date: Thu, 24 Mar 2016 16:41:01 -0400 Subject: [PATCH 1/5] Assume semantic versioning for some gems --- datomic-client.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datomic-client.gemspec b/datomic-client.gemspec index c2511a7..ed7390c 100644 --- a/datomic-client.gemspec +++ b/datomic-client.gemspec @@ -18,6 +18,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'bundler' 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', '~> 1.0.0' + s.add_dependency 'rest-client', '~> 1.6' + s.add_dependency 'edn', '~> 1.0' end From 53325281a4c9ceee37fa4b4f69d1beff18a640a5 Mon Sep 17 00:00:00 2001 From: Mike Bell Date: Thu, 24 Mar 2016 16:50:32 -0400 Subject: [PATCH 2/5] Allow RestClient options to be passed through (e.g. timeout) --- README.md | 10 ++++++++++ datomic-client-0.5.0.gem | Bin 0 -> 10240 bytes lib/datomic/client.rb | 32 ++++++++++++++++++++++++++------ lib/datomic/client/version.rb | 2 +- 4 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 datomic-client-0.5.0.gem diff --git a/README.md b/README.md index 3f4d7f5..bee6b08 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,16 @@ $ irb -rdatomic/client >> datomic.events(dbname) {|r| puts "Received: #{r.inspect}" } ``` +## Additional Options + +This gem uses the [rest-client gem](https://rubygems.org/gems/rest-client/versions/1.8.0) for its +network connection. When creating a client, you can add a hash of options which will be +passed to the underlying gem. These can be used to extend timeouts etc. e.g. +```ruby +>> datomic = Datomic::Client.new 'http://localhost:9000', 'socrates', read_timeout: 600, open_timeout: 10 +``` + + ## Issues Please report them [on github](http://github.com/cldwalker/datomic-client/issues). diff --git a/datomic-client-0.5.0.gem b/datomic-client-0.5.0.gem new file mode 100644 index 0000000000000000000000000000000000000000..7db8dd72e3ac3695c150f073274efe2d2513d753 GIT binary patch literal 10240 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 PkAGL--xc^DR)PNjBgpk9 literal 0 HcmV?d00001 diff --git a/lib/datomic/client.rb b/lib/datomic/client.rb index 3b8fd2d..f09b227 100644 --- a/lib/datomic/client.rb +++ b/lib/datomic/client.rb @@ -9,12 +9,16 @@ class Client Response.new body, response, request end - def initialize(url, storage = nil) + # rest_options is anything acceptable sa an argument to RestClient::Request.new() + def initialize(url, storage = nil, rest_options = {}) @url = url @storage = storage + @rest_options = rest_options end def create_database(dbname) + #RestClient.post root_url('data', @storage) + "/", {"db-name" => dbname}, + # :content_type => 'application/x-www-form-urlencoded', &HANDLE_RESPONSE RestClient.post root_url('data', @storage) + "/", {"db-name" => dbname}, :content_type => 'application/x-www-form-urlencoded', &HANDLE_RESPONSE end @@ -29,10 +33,13 @@ def database_info(dbname, options = {}) # Data can be a ruby data structure or a string representing clojure data def transact(dbname, data) data = transmute_data(data) - RestClient.post(db_url(dbname) + "/", {"tx-data" => data}, + #RestClient.post(db_url(dbname) + "/", {"tx-data" => data}, + # :Accept => 'application/edn', &HANDLE_RESPONSE) + post(db_url(dbname) + "/", {"tx-data" => data}, :Accept => 'application/edn', &HANDLE_RESPONSE) end + # This endpoint hits both datoms and index-range APIs. # params take any param in addition to following options: # @@ -66,7 +73,7 @@ def query(query, args_or_dbname, params = {}) # response from event def events(dbname, &block) # can't use RestClient.get b/c of :block_response - RestClient::Request.execute(:method => :get, + execute(:method => :get, :url => root_url('events', @storage, dbname), :headers => {:accept => "text/event-stream"}, :block_response => block, &HANDLE_RESPONSE) @@ -76,13 +83,26 @@ def db_alias(dbname) {:"db/alias" => "#@storage/#{dbname}"} end - private + private + # Execute a Rest operation with extra defaults + def execute( args, &block ) + RestClient::Request.execute(@rest_options.merge(args), &block) + end def get(url, params = {}) - RestClient.get(url, :params => params, :Accept => 'application/edn', - &HANDLE_RESPONSE) + #RestClient.get(url, :params => params, :Accept => 'application/edn', + # &HANDLE_RESPONSE) + execute(:method => :get, + :url => url, + headers: {:params => params, :Accept => 'application/edn'}, + &HANDLE_RESPONSE) end + def post(url, payload, headers={}, &block ) + execute(:method => :post, :url => url, :payload => payload, :headers => headers, &block) + end + + def root_url(*parts) [@url].concat(parts).join('/') end diff --git a/lib/datomic/client/version.rb b/lib/datomic/client/version.rb index 64ce490..4afb8ad 100644 --- a/lib/datomic/client/version.rb +++ b/lib/datomic/client/version.rb @@ -1,5 +1,5 @@ module Datomic class Client - VERSION = '0.4.1' + VERSION = '0.5.0' end end From ca7a1be3917217cb209f196c28b2d6976eff5c17 Mon Sep 17 00:00:00 2001 From: Mike Bell Date: Thu, 24 Mar 2016 16:54:50 -0400 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7d643e..3cad295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0 +* Make restclient gem options available (e.g. for timeouts) +* weaken the version restrictinons in the gem file. + ## 0.4.1 * Make #db_alias available * Upgrade edn From a4167ecd99b52d98530a48ba7dff4378898b58e0 Mon Sep 17 00:00:00 2001 From: Mike Bell Date: Wed, 30 Mar 2016 11:59:02 -0400 Subject: [PATCH 4/5] Add *.gem to .gitignore --- .gitignore | 2 ++ datomic-client-0.5.0.gem | Bin 10240 -> 0 bytes 2 files changed, 2 insertions(+) delete mode 100644 datomic-client-0.5.0.gem diff --git a/.gitignore b/.gitignore index 80f3713..5de0504 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ Gemfile.lock pkg .bundle +*.gem + diff --git a/datomic-client-0.5.0.gem b/datomic-client-0.5.0.gem deleted file mode 100644 index 7db8dd72e3ac3695c150f073274efe2d2513d753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10240 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 PkAGL--xc^DR)PNjBgpk9 From 480d136f8abab1be0482a4c54968ae9542560c12 Mon Sep 17 00:00:00 2001 From: Mike Bell Date: Wed, 30 Mar 2016 12:00:42 -0400 Subject: [PATCH 5/5] Change required version of rest-client to an old one --- datomic-client.gemspec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/datomic-client.gemspec b/datomic-client.gemspec index ed7390c..1b2c43f 100644 --- a/datomic-client.gemspec +++ b/datomic-client.gemspec @@ -18,6 +18,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'bundler' s.add_development_dependency 'rspec', '~> 2.11' s.add_development_dependency 'rake', '~> 0.9.2.2' - s.add_dependency 'rest-client', '~> 1.6' - s.add_dependency 'edn', '~> 1.0' + # Breaking changes in rest-client 1.8.0 for us + s.add_dependency 'rest-client', '~> 1.6.7' + s.add_dependency 'edn', '~> 1.0.0' end