protobuf-rpc-register 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95025c1649fcad777029cc0184f470d75238c7bf
-  data.tar.gz: 5bc6a4ce1cf7ffa4524e04aedb305e2b4aa83c62
+  metadata.gz: 362470f8276803cafeb830ff8ddea959aa03f238
+  data.tar.gz: b3a77da275250ae14de8212ed98738c89d5725d4
 SHA512:
-  metadata.gz: 2161642f5fb2ed13926cd182e682c87d9e3b6427d7b9b0dfc48143fbebeb27b2d157b3d11b79da90cf35047629c975ee5f0016655b31d6048fcdf233a2e0f76c
-  data.tar.gz: 5299cd9bef63b312236c16c86625acd1ae63e72d5053232015314f7dfee73065fd35cc59dafa2acc483a699a29647ffb51a22fc82c85909fe958a515b017558f
+  metadata.gz: 194cab84f899393fbc40cf5579d5e0c339d32fc706dd4a2d6ad97ad6ea7e76c70e61b3344c255557f9e5134bde72aece05d4289b7f35245753a22d3c294e2059
+  data.tar.gz: 98c27617e08b54cf7e6a969584fd01b6e89471133ea6ea898da2b5838fa49ec5c4e68334392fda5b05a5d537b65992515d32b6350361059fea93c317b781667b

data/lib/protobuf/rpc/clients/base.rb

@@ -16,7 +16,7 @@ module Protobuf
           @error_logger = Logger.new(stderr)
 
           names = self.class.name.split('::')
-          @service =  Object.const_get([names[0..-3], 'Services', names[-1]].flatten.join('::'))
+          @service = Object.const_get([names[0..-3], 'Services', names[-1]].flatten.join('::'))
         end
 
         def internal_client
@@ -60,16 +60,18 @@ module Protobuf
 
         def define_error_class(res)
           module_name = (@namespace || 'Protobuf').camelize
-          m = Object.const_defined?(module_name, false) ? Object.const_get(module_name, false) : Object.const_set(module_name, Module.new)
-          m.const_defined?(:Rpc, false) ? m.const_get(:Rpc, false) : m.const_set(:Rpc, Module.new)
-
-          if m.const_defined?(res.error_class, false)
-            m.const_get(res.error_class, false)
+          c = if res.error_class.start_with?("Protobuf::Rpc") && module_name == "Protobuf"
+                res.error_class
+              else
+                "#{module_name}::Rpc::#{res.error_class}"
+              end
+
+          if c.safe_constantize
+            c.safe_constantize
           else
-            module_name = res.error_class.deconstantize
             class_name = res.error_class.demodulize
-            base_module = m::Rpc
-            module_name.split('::').each do |m|
+            base_module = Object
+            c.split('::')[0..-2].each do |m|
               base_module.const_defined?(m, false) || base_module.const_set(m, Module.new)
               base_module = base_module.const_get(m, false)
             end
@@ -79,23 +81,19 @@ module Protobuf
             rescue LoadError
               raise NameError.new("uninitialized constant #{res.error_class}", res.error_class)
             end
-            if base_module.const_defined?(class_name, false)
-              base_module.const_get(class_name, false)
-            else
-              base_module.const_set(class_name, Class.new(error_superclass) do
-                def initialize(message = nil)
-                  @message = message
-                end
-
-                def inspect
-                  "#{self.class}: #{@message}"
-                end
-
-                def message
-                  @message
-                end
-              end)
-            end
+            base_module.const_set(class_name, Class.new(error_superclass) do
+              def initialize(message = nil)
+                @message = message
+              end
+
+              def inspect
+                "#{self.class}: #{@message}"
+              end
+
+              def message
+                @message
+              end
+            end)
           end
         end
 
@@ -116,8 +114,8 @@ module Protobuf
                     msg_class.new(*args)
                   elsif args.first.respond_to?(:to_hash)
                     ::Protobuf::Rpc::Messages::RpcCompressedMessage.new(response_body: args.first.to_hash.to_json,
-                                                       serializer: :JSON,
-                                                       compressed: false)
+                                                                        serializer: :JSON,
+                                                                        compressed: false)
                   else
                     raise ArgumentError, "#{args} should be be a Hash or Protobuf Message."
                   end

data/lib/protobuf/rpc/interaction_instrumentation.rb

@@ -0,0 +1,20 @@
+require 'new_relic/agent/instrumentation/action_controller_subscriber'
+
+DependencyDetection.defer do
+  @name = :active_interaction
+
+  depends_on do
+    defined?(ActiveInteraction) && defined?(ActiveInteraction::Base)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing ActiveInteraction instrumentation'
+  end
+
+  executes do
+    class ActiveInteraction::Base
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      add_transaction_tracer :run
+    end
+  end
+end

data/lib/protobuf/rpc/interactions/base.rb

@@ -18,15 +18,6 @@ module Protobuf
           def include_attributes
             [].freeze
           end
-
-          private
-
-          def inherited(subclass)
-            super
-            require 'new_relic/agent'
-            subclass.include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-            subclass.add_transaction_tracer :run
-          end
         end
       end
     end

data/lib/protobuf/rpc/register.rb

@@ -6,6 +6,7 @@ require 'protobuf/rpc/generator'
 require 'protobuf/rpc/clients/base'
 require 'protobuf/rpc/interactions/base'
 require 'protobuf/rpc/services/base'
+require 'protobuf/rpc/serializer'
 require 'protobuf/rpc/messages/error'
 require 'protobuf/rpc/messages/rpc_compressed_message'
 

data/lib/protobuf/rpc/register/version.rb

@@ -1,7 +1,7 @@
 module Protobuf
   module Rpc
     module Register
-      VERSION = "0.17.0".freeze
+      VERSION = "0.19.0".freeze
     end
   end
 end

data/lib/protobuf/rpc/services/base.rb

@@ -1,6 +1,3 @@
-require 'protobuf'
-require 'protobuf/rpc/serializer'
-
 module Protobuf
   module Rpc
     module Services
@@ -14,8 +11,6 @@ module Protobuf
         end
 
         def self.inherited(subclass)
-          require 'new_relic/agent'
-          subclass.include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
           subclass.inherit_rpcs!
         end
 
@@ -64,8 +59,6 @@ module Protobuf
 
             compress_with result
           end
-
-          add_transaction_tracer method
         end
       end
     end

data/protobuf-rpc-register.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'msgpack', "~> 0.5"
   spec.add_development_dependency 'multi_json', "~> 1.0"
   spec.add_development_dependency 'oj', "~> 2.0"
-  spec.add_development_dependency 'newrelic_rpm'
 
   spec.add_runtime_dependency 'protobuf', '~> 3.5'
   spec.add_runtime_dependency 'active_interaction', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-rpc-register
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - scorix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: newrelic_rpm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +182,7 @@ files:
 - bin/setup
 - lib/protobuf/rpc/clients/base.rb
 - lib/protobuf/rpc/generator.rb
+- lib/protobuf/rpc/interaction_instrumentation.rb
 - lib/protobuf/rpc/interactions/base.rb
 - lib/protobuf/rpc/messages/error.rb
 - lib/protobuf/rpc/messages/rpc_compressed_message.rb