protobuffy 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c1d5bfad6397559b237d7d382b86d38e52a5b4
-  data.tar.gz: 8f09b82dec50f954eaf072c6ce27440188f4ebd2
+  metadata.gz: 5bdff6c7c5855a0e038787f254471e5024deb0ed
+  data.tar.gz: dfa56251758baed600cd8576c47012b7d7e8d698
 SHA512:
-  metadata.gz: 87a1c33ee0c8f104fb3165458379f22994a2d82cdd0f81ddc15604992f74c3176361c449c56e267a68f8e018b3ab0abc9c603074fe96319c8205e7c36c7007f9
-  data.tar.gz: 7e1128579d172e3404f85442668e1090931110d0216bb4c2ae0f402031a4bcb81fabaa9ed47739d67d438b9ad29e2c23822b6b20ca87f761e5de52d817d38389
+  metadata.gz: 15411df49fdb161491e6e4e746325eb5c735ffdb00f0057d9b0084dea4011f2a890b819f8ec232b78230616398d3b8134432cd6ec6be5215a8c6a60925d804a5
+  data.tar.gz: e66a6f427327a47a0804a5f6faa754f36962abf92233514b56b565ed01f594a797d418c2f4389c91a8859e9bf5809a4c053594185963eaef150db25460193847

data/.travis.yml

@@ -1,12 +1,21 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec/lib
+- 1.9.3
+- 2.3.1
+before_install:
+- gem install bundler
+script: NO_COMPILE_TEST_PROTOS=1 bundle _1.12.5_ exec rake spec/lib
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/51a956bcd2b1854d6756
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: false     # default: false
+    - https://webhooks.gitter.im/e/51a956bcd2b1854d6756
+    on_success: change
+    on_failure: always
+    on_start: false
+deploy:
+  provider: rubygems
+  api_key:
+    secure: iQ9JnUKw2CaOGUSR2dSYQ6z3Kp55GkZ0s5ZYq5EQ2KW94hJh1Mn7t3hUnga7IW569lGQyjnWziLRW0GAVxu3q+RrT2OwZJYB/di39kv1IJTQpXbFI7bm/AvbYba2t3mFgMLpPGEmxemyAQ1AigbEu/5V5DssfF6Qkh6jiMuphaY=
+  gem: protobuffy
+  on:
+    repo: lookout/protobuffy

data/lib/protobuf/rpc/env.rb

@@ -39,6 +39,7 @@ module Protobuf
                     :encoded_response,
                     :log_signature,
                     :method_name,
+                    :parent_env,
                     :request,
                     :request_type,
                     :response,

data/lib/protobuf/rpc/server.rb

@@ -20,10 +20,12 @@ module Protobuf
 
       # Invoke the service method dictated by the proto wrapper request object
       #
-      def handle_request(request_data)
+      def handle_request(request_data, parent_env = nil)
         # Create an env object that holds different parts of the environment and
         # is available to all of the middlewares
-        env = Env.new('encoded_request' => request_data, 'log_signature' => log_signature)
+        env = Env.new('encoded_request' => request_data,
+                      'log_signature' => log_signature,
+                      'parent_env' => parent_env)
 
         # Invoke the middleware stack, the last of which is the service dispatcher
         env = Rpc.middleware.call(env)

data/lib/protobuf/rpc/servers/http/server.rb

@@ -56,7 +56,7 @@ module Protobuf
           encoded_request = rpc_request.encode()
 
           begin
-            encoded_response = handle_request(encoded_request)
+            encoded_response = handle_request(encoded_request, env)
           rescue Exception => e
             return protobuf_http_response 500,
               :error => "Handle request failed: #{e.to_s}",

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.5.1'
+  VERSION = '3.6.0'
 end

data/protobuffy.gemspec

@@ -19,12 +19,18 @@ require "protobuf/version"
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport', '>= 3.2'
+  if RUBY_VERSION =~ /^2/
+    s.add_dependency 'activesupport'
+  else
+    s.add_dependency 'activesupport', '< 5'
+  end
+
   s.add_dependency 'middleware'
-  s.add_dependency 'multi_json'
+  s.add_dependency 'multi_json', '~> 1.0'
   s.add_dependency 'thor'
+  s.add_dependency 'json', '< 2.0'
 
-  s.add_development_dependency 'rack'
+  s.add_development_dependency 'rack', '~> 1.0'
   s.add_development_dependency 'faraday'
   s.add_development_dependency 'ffi-rzmq'
   s.add_development_dependency 'pry-nav'

data/spec/lib/protobuf/rpc/servers/http/server_spec.rb

@@ -11,11 +11,14 @@ module ReverseModule
   end
   class ReverseResponse < ::Protobuf::Message
     required :string, :reversed, 1
+    optional :string, :some_header, 2
   end
   class ReverseService < ::Protobuf::Rpc::Service
     rpc :reverse, ReverseRequest, ReverseResponse
     def reverse
-      respond_with :reversed => request.input.reverse
+      respond_with :reversed => request.input.reverse,
+                   :some_reversed_header => env.parent_env.has_key?('X-SOME-HEADER') ?
+                                            env.parent_env['X-SOME-HEADER'].reverse : nil
     end
   end
 end
@@ -38,6 +41,18 @@ describe Protobuf::Rpc::Http::Server do
       response.body.should eq ReverseModule::ReverseResponse.new(:reversed => "hello world".reverse).encode()
     end
 
+    it 'should return the correct response for ReverseModule::ReverseService.reverse when some header is passed' do
+      response = client.post "/ReverseModule%3A%3AReverseService/reverse",
+                             :input => ReverseModule::ReverseRequest.new(:input => "hello world").encode(),
+                             "X-SOME-HEADER" => "yes i am"
+      response.status.should eq 200
+      response.headers['content-type'].should eq "application/x-protobuf"
+      response.headers['x-protobuf-error'].should be_nil
+      response.headers['x-protobuf-error-reason'].should be_nil
+      response.body.should eq ReverseModule::ReverseResponse.new(:reversed => "hello world".reverse,
+                                                                 :some_reversed_header => "yes i am".reverse).encode()
+    end
+
     it 'should return METHOD_NOT_FOUND for ReverseModule::ReverseService.bobloblaw' do
       response = client.post "/ReverseModule%3A%3AReverseService/bobloblaw", :input => ReverseModule::ReverseRequest.new(:input => "hello world").encode()
       response.status.should eq 404

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuffy
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - BJ Neilsen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -46,16 +46,16 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -70,20 +70,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -436,9 +450,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
 test_files: []
-has_rdoc: