orientdb_client 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03bbffcac337c8b24baa097e7f55f3d4350cea44
-  data.tar.gz: a2074ddd31091c8aaae2af2fb49f2d94633d370d
+  metadata.gz: 8c427444c46d0f4c5beecc6e0f6bfaf47e094dd6
+  data.tar.gz: d9573d4f5bca08e707fe550d0d5422e7c686b331
 SHA512:
-  metadata.gz: a4191890669fe5a9fe9ff44e986b355adaf9a4c7182783e9d47df3ce9f4ec64d2f4f91a8050544b5509b16d4166a92a9c1cbf7a46af6fbc13103d3a2a03cce8c
-  data.tar.gz: 896fc166ca48be6faef0729eb14cd4fda54a894460d3270b78389e0a480dcd129b6d06b3c00cb3216c42449b671599aeeef8920bf973eafa06b4d5c5308b29f7
+  metadata.gz: 05f99c6bf186824a78c8c4817f3562fac61c362110cb93b8d296d20dbc3d7a9867c697aa3559202d3a8c3d03468d50c405bc300b4147c0b2c6d7a08da06d1e9e
+  data.tar.gz: eb0a3d64d9594d05559fcd836c7773573f1a061b05e114b3629fb1d231af979364cfbb481a29968360e1ee4a5c0110b329f91174d9998209ff417ff7b453df86

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
+  - 2.3.1
 script: bundle exec rspec --tag ~'type:integration'
 matrix:
   include:
@@ -9,3 +10,5 @@ matrix:
       gemfile: Gemfiles/Gemfile.as3.2
     - rvm: 2.2
       gemfile: Gemfiles/Gemfile.as4.0
+    - rvm: 2.3.1
+      gemfile: Gemfiles/Gemfile.as5.0

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Master
 
+## 0.0.7
+
+* Test ActiveSupport 5 and ruby 2.3.1.
+* Delete redundant `safely_instrument` code -- this is already done by ActiveSupport. This will be a breaking change for code that expects errors in the ASN payload to be in the `error` key.
+They will now be in the `exception` key, as an array.
+
 ## 0.0.6
 
 * Correctly handle error message for database creation conflict exceptions.

data/Gemfile

@@ -3,8 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in orientdb_client.gemspec
 gemspec
 
-gem 'activesupport', '> 3.2', require: false
-
 group :test do
+  gem 'activesupport', '~> 4.0', require: false
   gem 'curb', '~> 0.8'
 end

data/Gemfiles/Gemfile.as3.2

@@ -1,9 +1,8 @@
 source "https://rubygems.org"
 
-gem 'activesupport', '~> 3.2', require: false
-
 group :test do
   gem 'curb', '~> 0.8'
+  gem 'activesupport', '~> 3.2', require: false
 end
 
 gemspec :path => "../"

data/Gemfiles/Gemfile.as4.0

@@ -1,9 +1,8 @@
 source "https://rubygems.org"
 
-gem 'activesupport', '~> 4.0', require: false
-
 group :test do
   gem 'curb', '~> 0.8'
+  gem 'activesupport', '~> 4.0', require: false
 end
 
 gemspec :path => "../"

data/Gemfiles/Gemfile.as5.0

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+group :test do
+  gem 'curb', '~> 0.8'
+  gem 'activesupport', '~> 5.0', require: false
+end
+
+gemspec :path => "../"

data/README.md

@@ -12,6 +12,8 @@ Goals:
 * fine-grained handling of Orientdb errors, via rich set of ruby exceptions
 
 Tested on:
+* 2.1.10
+* 2.1.9
 * 2.1.5
 * 2.1.4
 * 2.0.6 - specs may fail due to Orientdb bug with deleting database (https://github.com/orientechnologies/orientdb/issues/3746)

data/lib/orientdb_client/instrumenters/memory.rb

@@ -12,14 +12,16 @@ module OrientdbClient
       end
 
       def instrument(name, payload = {})
-        result = if block_given?
-          yield payload
-        else
-          nil
+        result = nil
+        begin
+          result = yield payload
+        rescue Exception => e
+          payload[:exception] = [e.class.name, e.message]
+          raise e
+        ensure
+          @events << Event.new(name, payload, result)
+          result
         end
-
-        @events << Event.new(name, payload, result)
-        result
       end
     end
   end

data/lib/orientdb_client/version.rb

@@ -1,3 +1,3 @@
 module OrientdbClient
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/orientdb_client.rb

@@ -253,13 +253,13 @@ module OrientdbClient
     def request(method, path, options = {})
       url = build_url(path)
       request_instrumentation_hash = {method: method, url: url, options: options}
-      raw_response = safe_instrument('request.orientdb_client', request_instrumentation_hash) do |payload|
+      raw_response = @client.instrument('request.orientdb_client', request_instrumentation_hash) do |payload|
         response = @http_client.request(method, url, options)
         payload[:response_code] = response.response_code
         response
       end
       response_instrumentation_hash = request_instrumentation_hash.merge(response_code: raw_response.response_code)
-      processed_response = safe_instrument('process_response.orientdb_client', response_instrumentation_hash) do |payload|
+      processed_response = @client.instrument('process_response.orientdb_client', response_instrumentation_hash) do |payload|
         handle_response(raw_response)
       end
       processed_response
@@ -392,20 +392,5 @@ module OrientdbClient
         raise OrientdbError.new("Could not parse Orientdb server error", response.response_code, response.body)
       end
     end
-
-    # Ensures instrumentation will complete even if exception is raised.
-    def safe_instrument(event_name, args)
-      err = nil
-      result = @client.instrument(event_name, args) do |payload|
-        begin
-          yield payload
-        rescue => e
-          payload[:error] = e.class.to_s
-          err = e
-        end
-      end
-      raise err if err
-      result
-    end
   end
 end

data/orientdb_client.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lukeasrodgers@gmail.com"]
   spec.summary       = %q{Orientdb ruby client}
   spec.description   = %q{Orientdb ruby client aiming to be simple, fast, and provide good integration with Orientdb error messages.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/lukeasrodgers/orientdb_client"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/orientdb_client_spec.rb

@@ -753,7 +753,7 @@ RSpec.describe OrientdbClient do
           client.get_class('OUser')
         rescue
         ensure
-          expect(memory_instrumenter.events.last.payload[:error]).to eq('RuntimeError')
+          expect(memory_instrumenter.events.last.payload[:exception]).to eq(['RuntimeError', 'err'])
         end
       end
 
@@ -776,7 +776,8 @@ RSpec.describe OrientdbClient do
           client.command('insert into OUser CONTENT ' + Oj.dump({a:1}))
         rescue
         ensure
-          expect(memory_instrumenter.events.last.payload[:error]).to eq('OrientdbClient::SerializationException')
+          exception_klass = memory_instrumenter.events.last.payload[:exception].first
+          expect(exception_klass).to eq('OrientdbClient::SerializationException')
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb_client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Luke Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -137,6 +137,7 @@ files:
 - Gemfile
 - Gemfiles/Gemfile.as3.2
 - Gemfiles/Gemfile.as4.0
+- Gemfiles/Gemfile.as5.0
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -158,7 +159,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_http_adapter.rb
 - spec/typhoeus_adapter_spec.rb
-homepage: ''
+homepage: https://github.com/lukeasrodgers/orientdb_client
 licenses:
 - MIT
 metadata: {}