elementary-rpc 2.6.0.64 → 2.7.0.dev

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2I4MWNhODE2NDJjZjNlNGY5Mjk3ZDRiN2JjMjBiMjQ0Y2I5MGIwOA==
-  data.tar.gz: !binary |-
-    NDczNTllODIwZDI5Y2Y4YWUyNWFkMGI4ZmNjYzdhZDU0M2I0YjJkYQ==
+SHA1:
+  metadata.gz: b598ea611587a7a887920939f2ed90cb57ca86ba
+  data.tar.gz: 70d8f2326b2bdb838b251235b8657cd83335de69
 SHA512:
-  metadata.gz: !binary |-
-    NTA3ZGI4YjlmYTY3MDg2MTNmMmFiNjk1YTViZTcwZTg3ODY3OTFkM2IxYjFj
-    ZTEzZjU5NjdkYzE2YzgzYTlhYTNmYjk2M2RkYzg0M2U4MjJjNzBjMTQwOGUz
-    NTFjNTA0MTMzZWU3YWNkMjZjN2ZlMDhmZTkyNjY3YjBjNjhlYzc=
-  data.tar.gz: !binary |-
-    YWQ1ZjdkMTdjNmM1NTc5ZmE3OGM3MTJjMWFmMmNkMzg3NDAwZmE0ODNlN2Ix
-    MWE0NjZjNzgzMzU4N2QxZjkxM2I4N2NlY2Y0OGQ3MGU0YmQ1NTFlNTdhZTlk
-    YzE5YzQwM2YyMDA0M2EwZGE5ZWQzNDU1MTFjMzRkODZmZGJkOGY=
+  metadata.gz: 4323cfe597d637b220c5d6e683e09e5515025c7c48df75764f0c9145f2d81783457b8ffa1fb98f7e253ceee88f1ddde4f56ddaa9f291b9c738b5ef28daa38b20
+  data.tar.gz: 6956f2f07bfef96eb01a9b88d69bbb1ff1cfc99291a9939f29776f9f2eb92436826eac9b026b9100bb1a77dda2f6e96fc909c10e9ed32761fa3234c0676625ec

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -1,9 +1,8 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in elementary-rpc.gemspec
-gemspec
+gemspec :name => 'elementary-rpc'
 
-gem 'rack'
 gem 'protobuffy', :github => 'lookout/protobuffy'
 
 group :test do
@@ -16,3 +15,13 @@ group :development do
   gem 'debugger-pry', :platform => :mri_19
   gem 'byebug', :platform => [:mri_20, :mri_21]
 end
+
+# added to make travis ci happy
+gem "bundler", "~> 1.6"
+gem "rake", "10.5.0"
+gem 'concurrent-ruby', '>= 0.7'
+gem 'faraday', '~> 0.9.0'
+gem 'net-http-persistent', '~> 2.9.4'
+gem 'lookout-statsd', '~> 2.0.0'
+gem 'hashie'
+gem 'activesupport', '4.2.4'

data/Gemfile.lock

@@ -0,0 +1,101 @@
+GIT
+  remote: git://github.com/lookout/protobuffy.git
+  revision: 08a10a3324157363d0f4fc2123ca00b73487c625
+  specs:
+    protobuffy (3.5.1)
+      activesupport (>= 3.2)
+      middleware
+      multi_json
+      thor
+
+PATH
+  remote: .
+  specs:
+    elementary-rpc (2.7.0.dev)
+      concurrent-ruby (>= 0.7)
+      faraday (~> 0.9.0)
+      hashie
+      lookout-statsd (~> 2.0.0)
+      net-http-persistent (~> 2.9.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    byebug (9.0.5)
+    coderay (1.1.1)
+    columnize (0.9.0)
+    concurrent-ruby (1.0.2)
+    debugger (1.6.8)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-pry (0.1.1)
+      debugger (~> 1)
+      pry (>= 0.9.9)
+    debugger-ruby_core_source (1.3.8)
+    diff-lcs (1.2.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    hashie (3.4.4)
+    i18n (0.7.0)
+    json (1.8.3)
+    lookout-statsd (2.0.3)
+    method_source (0.8.2)
+    middleware (0.1.0)
+    minitest (5.9.0)
+    multi_json (1.12.1)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    slop (3.6.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 4.2.4)
+  bundler (~> 1.6)
+  byebug
+  concurrent-ruby (>= 0.7)
+  debugger
+  debugger-pry
+  elementary-rpc!
+  faraday (~> 0.9.0)
+  hashie
+  lookout-statsd (~> 2.0.0)
+  net-http-persistent (~> 2.9.4)
+  protobuffy!
+  pry
+  rake (= 10.5.0)
+  rspec
+
+BUNDLED WITH
+   1.12.5

data/elementary-rpc.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "10.5.0"
+
 
   spec.add_dependency 'concurrent-ruby', '>= 0.7'
   spec.add_dependency 'faraday', '~> 0.9.0'

data/lib/elementary/errors.rb

@@ -2,6 +2,17 @@ module Elementary
   module Errors
     # A simple root class to signify an failure on the RPC server side (see
     #   "rpc_failed 'message'")
-    class RPCFailure < StandardError; end;
+    class RPCFailure < StandardError
+      attr_reader :status_code, :method, :url, :header_message, :header_code
+
+      def initialize(opts = {})
+        @status_code = opts.fetch(:status_code, nil)
+        @method = opts.fetch(:method, "<Unknown Method>")
+        @url = opts.fetch(:url, "<Unknown URL>")
+        @header_code = opts.fetch(:header_code, "<Unknown Header Code>")
+        @header_message = opts.fetch(:header_message, "<Unknown Header Message>")
+        super "Error #{@header_code}: #{@header_message}"
+      end
+    end
   end
 end

data/lib/elementary/middleware/raise_on_status.rb

@@ -2,7 +2,27 @@ require 'faraday'
 
 module Elementary
   module Middleware
-    class HttpStatusError < StandardError; end
+    class HttpStatusError < StandardError
+      attr_reader :status_code, :method, :url, :parent_message
+      def initialize(opts = {})
+        @status_code = opts.fetch(:status_code, nil)
+        @method = opts.fetch(:method, "<Unknown Method>")
+        @url = opts.fetch(:method, "<Unknown URL>")
+
+        message = if connection_refused?
+                    "#{method} #{url} returned a connection refused: #{opts.fetch(:parent_message, '<Unknown Message>')}"
+                  else
+                    "#{method} #{url} returned an HTTP response status of #{status_code}, so an exception was raised."
+                  end
+        super message
+      end
+
+      # We assume that the connection was refused if no status code was set.
+      # @return [Boolean]
+      def connection_refused?
+        @status_code.nil?
+      end
+    end
     ##
     # Raise an exception for certain HTTP response status codes
     #
@@ -54,19 +74,23 @@ module Elementary
           @app.call(request_env).on_complete do |response_env|
             status = response_env[:status]
             if @status_set.include? status
-              error_msg = response_env[:response_headers][ERROR_HEADER_MSG]
-              error_code = response_env[:response_headers][ERROR_HEADER_CODE]
-              if error_msg
-                raise Elementary::Errors::RPCFailure, "Error #{error_code}: #{error_msg}"
+              error_opts = {
+                  :status_code => status,
+                  :method => response_env.method.to_s.upcase,
+                  :url => response_env.url.to_s
+              }
+              headers = response_env[:response_headers]
+              if headers.include?(ERROR_HEADER_CODE) && headers.include?(ERROR_HEADER_MSG)
+                error_opts[:header_message] = headers[ERROR_HEADER_MSG]
+                error_opts[:header_code] = headers[ERROR_HEADER_CODE]
+                raise Elementary::Errors::RPCFailure, error_opts
               else
-                method = response_env.method.to_s.upcase
-                url = response_env.url.to_s
-                raise HttpStatusError, "#{method} #{url} returned an HTTP response status of #{status}, so an exception was raised."
+                raise HttpStatusError, error_opts
               end
             end
           end
         rescue Faraday::ClientError => e
-          raise HttpStatusError, "#{e.message}"
+          raise HttpStatusError, :parent_message => e.message
         end
       end
 

data/lib/elementary/version.rb

@@ -1,3 +1,3 @@
 module Elementary
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 end

data/spec/elementary_client_using_anti_pattern_spec.rb

@@ -6,6 +6,7 @@ def sendAndVerify(msg)
   response = client.invoke_echo_service(Elementary::Rspec::String.new(:data => msg))
   expect(response).to be_rejected
   expect(response.reason.class).to be Elementary::Middleware::HttpStatusError
+  expect(response.reason.connection_refused?).to be true
   expect(response.reason.message).to include("connection refused: localhost:8090")
 end
 

data/spec/sample_elementary_client_spec.rb

@@ -7,6 +7,7 @@ def send_and_verify_http_error_503(msg)
   expect(response).to be_rejected
   expect(response.reason.class).to be Elementary::Middleware::HttpStatusError
   expect(response.reason.message).to include("returned an HTTP response status of 503, so an exception was raised.")
+  expect(response.reason.status_code).to eql 503
   expect(response.reason.message).to include("Elementary::Rspec::Simple#error")
 end
 
@@ -14,6 +15,7 @@ def send_and_verify_http_error_500(msg)
   response = client.invoke_error_service(Elementary::Rspec::String.new(:data => msg))
   expect(response).to be_rejected
   expect(response.reason.class).to be Elementary::Errors::RPCFailure
+  expect(response.reason.status_code).to eql 500
   expect(response.reason.message).to include("sample failure")
   expect(response.reason.message).to include("Elementary::Rspec::Simple#error")
 end
@@ -22,6 +24,7 @@ def send_and_verify_http_error_400(msg)
   response = client.invoke_bad_request_data_service(Elementary::Rspec::String.new(:data => msg))
   expect(response).to be_rejected
   expect(response.reason.class).to be Elementary::Errors::RPCFailure
+  expect(response.reason.status_code).to eql 400
   expect(response.reason.message).to include("sample bad request data failure")
   expect(response.reason.message).to include("Elementary::Rspec::Simple#bad_request_data_method")
 end
@@ -30,6 +33,7 @@ def send_and_verify_http_error_404(msg)
   response = client.invoke_service_not_found_service(Elementary::Rspec::String.new(:data => msg))
   expect(response).to be_rejected
   expect(response.reason.class).to be Elementary::Errors::RPCFailure
+  expect(response.reason.status_code).to eql 404
   expect(response.reason.message).to include("sample service not found failure")
   expect(response.reason.message).to include("Elementary::Rspec::Simple#service_not_found_method")
 end
@@ -38,6 +42,8 @@ def send_and_verify_connection_refused(msg)
   response = client.invoke_error_service(Elementary::Rspec::String.new(:data => msg))
   expect(response).to be_rejected
   expect(response.reason.class).to be Elementary::Middleware::HttpStatusError
+  expect(response.reason.status_code).to be nil
+  expect(response.reason.connection_refused?).to be true
   expect(response.reason.message).to include("connection refused: localhost:8090")
   expect(response.reason.message).to include("Elementary::Rspec::Simple#error")
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: elementary-rpc
 version: !ruby/object:Gem::Version
-  version: 2.6.0.64
+  version: 2.7.0.dev
 platform: ruby
 authors:
 - R. Tyler Croy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.9.4
 - !ruby/object:Gem::Dependency
   name: lookout-statsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem supporting Protobuf RPC over HTTP with futures and fun
@@ -115,10 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -161,17 +162,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Gem supporting Protobuf RPC in a simple way