rester 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d4b971390eaa9fe9c3aa6abdfb754f141bd8bb
-  data.tar.gz: 23c86151fc635c434a83249f85b0a66f66bf93ce
+  metadata.gz: a17ecdff2d900cdad60ccd5404afca94cfda269f
+  data.tar.gz: efa02cdbfef4743e9c0538896d769cb33c979a51
 SHA512:
-  metadata.gz: 3782bdebc01e6c081ab57224f025b9c8abc0f5002b83f3cf120b67626232f42855910714885e0d0f49572eb011b8e3e537f175fa0aa13e4d0db3e5d7c9e9839c
-  data.tar.gz: 6fe88686d1afa14ee878b4868ee3e67e201ca4ede8dfdaf0a9c4ab4369b81812cf51542aad5cd6cbec05042c0e624547af3457aabc4d5bd030d0111092406792
+  metadata.gz: 38c3311be4b40526035536d31cbbd1e682911e51cd54dcd53e1789aa356c44ef4ef38ff4bdf9b7012735c0d79d844a324eeedd7418706985ddabb756b7546bb5
+  data.tar.gz: 60f377dc74da842bf80696998657ce61549db1a7f7cb86f0d38967cd35a4311ae6d9d5d1d8c565956b56dcf0a82305cbac9d64044aabf9910569621cc42225df

data/lib/rester/middleware/new_relic.rb

@@ -0,0 +1,51 @@
+require 'new_relic/agent'
+require 'active_support/inflector'
+
+NewRelic::Agent.manual_start unless defined?(Rails)
+
+module Rester
+  module Middleware
+    class NewRelic < Base
+      include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+      def call(env)
+        request = Service::Request.new(env)
+        name = identify_method(request)
+        ::NewRelic::Agent.set_transaction_name(name, category: :controller)
+        super
+      end
+
+      def identify_method(request)
+        object_chain = request.object_chain
+
+        if object_chain.length.odd?
+          resource_name = object_chain.last
+        else
+          resource_name = object_chain[-2]
+        end
+
+        method = _determine_method(request)
+
+        "#{service.class.name}::#{request.version.to_s.upcase}::"\
+          "#{resource_name.singularize.camelcase}/#{method}"
+      end
+
+      private
+
+      def _determine_method(request)
+        if request.object_chain.length.odd?
+          case request.request_method
+          when 'GET'  then 'search'
+          when 'POST' then 'create'
+          end
+        else
+          case request.request_method
+          when 'GET'    then 'get'
+          when 'PUT'    then 'update'
+          when 'DELETE' then 'delete'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rester/middleware.rb

@@ -3,5 +3,6 @@ module Rester
     autoload(:Base,          'rester/middleware/base')
     autoload(:ErrorHandling, 'rester/middleware/error_handling')
     autoload(:Ping,          'rester/middleware/ping')
+    autoload(:NewRelic,      'rester/middleware/new_relic')
   end
 end

data/lib/rester/rspec.rb

@@ -37,6 +37,16 @@ RSpec.configure do |config|
   end
 
   config.before :each, rester: // do |ex|
+    _setup_example(ex) unless ex.pending?
+  end
+
+  config.after :each, rester: // do |ex|
+    if defined?(service_response_code)
+      expect(service_response_code).to eq stub_response_code
+    end
+  end
+
+  def _setup_example(ex)
     # Gather the request args from the spec descriptions
     #
     # For example:
@@ -96,10 +106,6 @@ RSpec.configure do |config|
     ex.example_group.let(:subject) { service_response }
   end
 
-  config.after :each, rester: // do |ex|
-    expect(service_response_code).to eq stub_response_code
-  end
-
   ##
   # Check to see if each stub example has a corresponding test written for it
   def _validate_test_coverage(ex)
@@ -115,8 +121,7 @@ RSpec.configure do |config|
         verb_group = _find_or_create_child(path_group, missing_verb)
 
         missing_contexts.each { |missing_context, _|
-          context_group = _find_or_create_child(verb_group, missing_context)
-          context_group.it { is_expected.to include_stub_response }
+          _find_or_create_child(verb_group, missing_context).pending
         }
       }
     }

data/lib/rester/service/request.rb

@@ -15,6 +15,16 @@ module Rester
         path.length < 256 && %r{\A/v\d+/(\w+/?)+\z}.match(path)
       end
 
+      def each_resource
+        return unless (chain = object_chain)
+
+        loop do
+          name, id, *chain = chain
+          yield name, id
+          break if chain.empty?
+        end
+      end
+
       private
 
       def _parse_path

data/lib/rester/service/resource/params.rb

@@ -192,6 +192,9 @@ module Rester
 
       def _validate_str(key, value, klass, opts)
         fail unless value.is_a?(String) # assert
+        if [Array, Hash].include?(klass)
+          _error!("expected #{key} to be of type #{klass}")
+        end
 
         _validate_match(key, value, opts[:match]) if opts[:match]
         _parse_with_class(klass, value).tap do |obj|
@@ -201,7 +204,7 @@ module Rester
       end
 
       def _validate_array(key, value, klass, opts)
-        _error!("unexpected array for #{key}") unless klass == Array
+        _error!("unexpected Array for #{key}") unless klass == Array
         type = (opts = opts.dup).delete(:type) || String
 
         value.each_with_index
@@ -209,7 +212,7 @@ module Rester
       end
 
       def _validate_hash(key, value, klass, opts)
-        _error!("unexpected hash for #{key}") unless klass == Hash
+        _error!("unexpected Hash for #{key}") unless klass == Hash
         (validator = opts[:use]) && validator.validate(value)
       end
 

data/lib/rester/service.rb

@@ -143,38 +143,39 @@ module Rester
     def _call_method(request)
       params = request.params
       retval = nil
-
-      name, id, *object_chain = request.object_chain
-      obj = _load_resource(request, name)
-
-      loop {
-        params.merge!(obj.id_param => id) if id
-
-        if object_chain.empty?
-          retval = obj.process(request.request_method, !!id, params)
-          break
+      resource_obj = nil
+      resource_id = nil
+
+      request.each_resource do |name, id|
+        unless resource_obj
+          (resource_obj = _load_resource(request.version, name)) or
+            _error!(Errors::NotFoundError)
+        else
+          mounted_resource = resource_obj.mounts[name] or
+            _error!(Errors::NotFoundError)
+          resource_obj = mounted_resource.new
         end
 
-        name, id, *object_chain = object_chain
-        obj = obj.mounts[name].new or fail Errors::NotFoundError
-      }
+        params.merge!(resource_obj.id_param => id) if id
+        resource_id = id
+      end
 
-      retval
+      resource_obj.process(request.request_method, !!resource_id, params)
     end
 
     ##
     # Loads the appropriate Service::Resource for the request. This will return
     # the class, not an instance.
-    def _load_resource(request, name)
-      _version_module(request).const_get(name.camelcase.singularize).new
+    def _load_resource(version, name)
+      _version_module(version).const_get(name.camelcase.singularize).new
     rescue NameError
-      _error!(Errors::NotFoundError)
+      nil
     end
 
     ##
     # Returns the module specified by the version in the request.
-    def _version_module(request)
-      self.class.version_module(request.version)
+    def _version_module(version)
+      self.class.version_module(version)
     end
 
     ##

data/lib/rester/version.rb

@@ -1,3 +1,3 @@
 module Rester
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rester
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Robert Honer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -115,6 +115,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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'
 description: A framework for creating simple RESTful interfaces between services.
 email:
 - robert@payout.com
@@ -137,6 +151,7 @@ files:
 - lib/rester/middleware.rb
 - lib/rester/middleware/base.rb
 - lib/rester/middleware/error_handling.rb
+- lib/rester/middleware/new_relic.rb
 - lib/rester/middleware/ping.rb
 - lib/rester/railtie.rb
 - lib/rester/rspec.rb
@@ -169,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A framework for creating simple RESTful interfaces between services.