saddle 0.0.31 → 0.0.32

data/Gemfile

@@ -12,3 +12,7 @@ group :test do
   gem 'airbrake'
   gem 'statsd-ruby', :require => ['statsd']
 end
+
+group :development, :test do
+  gem 'pry'
+end

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       builder
       json
     builder (3.2.0)
+    coderay (1.0.9)
     diff-lcs (1.2.4)
     faraday (0.8.7)
       multipart-post (~> 1.1)
@@ -16,8 +17,13 @@ GEM
       faraday (>= 0.7.4, < 0.9)
     i18n (0.6.1)
     json (1.7.7)
+    method_source (0.8.1)
     multi_json (1.7.3)
     multipart-post (1.2.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -27,6 +33,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
     rspec-mocks (2.13.1)
+    slop (3.4.5)
     statsd-ruby (1.2.0)
 
 PLATFORMS
@@ -37,6 +44,7 @@ DEPENDENCIES
   airbrake
   faraday (~> 0.8.7)
   faraday_middleware (~> 0.9.0)
+  pry
   rspec (~> 2.13.0)
   rspec-instafail (~> 0.2)
   statsd-ruby

data/lib/saddle/endpoint.rb

@@ -1,4 +1,4 @@
-require 'active_support'
+require 'active_support/core_ext/string'
 
 
 
@@ -66,11 +66,7 @@ module Saddle
       # Create the new endpoint
       endpoint_instance = endpoint_class.new(@requester, method_name, self)
       # Attach the endpoint as an instance variable and method
-      method_name ||= ActiveSupport::Inflector.underscore(
-        ActiveSupport::Inflector.demodulize(
-          endpoint_class.name
-        )
-      )
+      method_name ||= endpoint_class.name.demodulize.underscore
       self.instance_variable_set("@#{method_name}", endpoint_instance)
       self.class.class_eval { define_method(method_name) { endpoint_instance } }
       endpoint_instance
@@ -115,11 +111,7 @@ module Saddle
       if _is_root?
         nil
       else
-        ActiveSupport::Inflector.underscore(
-          ActiveSupport::Inflector.demodulize(
-            self.class.name
-          )
-        )
+        self.class.name.demodulize.underscore
       end
     end
   end

data/lib/saddle/method_tree_builder.rb

@@ -1,4 +1,4 @@
-require 'active_support'
+require 'active_support/core_ext/string'
 
 require 'saddle/endpoint'
 
@@ -16,9 +16,12 @@ module Saddle
     # Build out the endpoint structure from the root of the implementation
     def build_tree(requester)
       root_node = build_root_node(requester)
-      # If we have an 'endpoints' directory, build it out
-      if knows_root? && Dir.exists?(endpoints_directory)
-        Dir["#{endpoints_directory}/**/*.rb"].each { |f| load(f) }
+      # Search out the implementations directory structure for endpoints
+      if defined?(self.implementation_root)
+        # For each endpoints directory, recurse down it to load the modules
+        endpoints_directories.each do |endpoints_directories|
+          Dir["#{endpoints_directories}/**/*.rb"].each { |f| require(f) }
+        end
         build_node_children(self.endpoints_module, root_node, requester)
       end
       root_node
@@ -28,14 +31,14 @@ module Saddle
     # Build our root node here. The root node is special in that it lives below
     # the 'endpoints' directory, and so we need to manually check if it exists.
     def build_root_node(requester)
-      if knows_root?
+      if defined?(self.implementation_root)
         root_endpoint_file = File.join(
           self.implementation_root,
           'root_endpoint.rb'
         )
         if File.file?(root_endpoint_file)
           # Load it and create our base endpoint
-          load(root_endpoint_file)
+          require(root_endpoint_file)
           # RootEndpoint is the special class name for a root endpoint
           root_node_class = self.implementation_module::RootEndpoint
         else
@@ -52,6 +55,7 @@ module Saddle
 
     # Build out the traversal tree by module namespace
     def build_node_children(current_module, current_node, requester)
+      return unless current_module
       current_module.constants.each do |const_symbol|
         const = current_module.const_get(const_symbol)
 
@@ -60,7 +64,7 @@ module Saddle
           # Build the branch out with a base endpoint
           branch_node = current_node._build_and_attach_node(
             Saddle::TraversalEndpoint,
-            ActiveSupport::Inflector.underscore(const_symbol)
+            const_symbol.underscore
           )
           # Build out the branch's endpoints on the new branch node
           self.build_node_children(const, branch_node, requester)
@@ -78,27 +82,23 @@ module Saddle
     # Get the module that the client implementation belongs to. This will act
     # as the root namespace for endpoint traversal and construction
     def implementation_module
-      ::ActiveSupport::Inflector.constantize(
-        self.name.split('::')[0..-2].join('::')
-      )
+      self.name.split('::')[0..-2].join('::').constantize
+    end
+
+    # Get all directories under the implementation root named 'endpoints'
+    # This search allows for flexible structuring of gem
+    def endpoints_directories
+      Dir["#{implementation_root}/**/"].select { |d| d.ends_with?('endpoints/') }
     end
 
     # Get the Endpoints module that lives within this implementation's
     # namespace
     def endpoints_module
-      implementation_module.const_get('Endpoints')
-    end
-
-    # Get the path to the 'endpoints' directory, based upon the client
-    # class that inherited Saddle
-    def endpoints_directory
-      File.join(self.implementation_root, 'endpoints')
-    end
-
-    # If this client was not fully constructed, it may not even have an
-    # implementation root. Allow that behavior to avoid filesystem searching.
-    def knows_root?
-      defined?(self.implementation_root)
+      begin
+        implementation_module.const_get('Endpoints')
+      rescue NameError
+        nil # If there is no endpoints module, we just won't load any
+      end
     end
 
   end

data/lib/saddle/middleware/logging/statsd.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string'
+
 require 'statsd'
 require 'faraday'
 
@@ -36,7 +38,7 @@ module Saddle
           elsif env[:request][:saddle]
             statsd_path_components = [
               'saddle',
-              ActiveSupport::Inflector.underscore(env[:request][:saddle][:client].name),
+              env[:request][:saddle][:client].name.underscore,
             ]
             if env[:request][:saddle][:call_chain] && env[:request][:saddle][:action]
               statsd_path_components += env[:request][:saddle][:call_chain]

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.31'
+  VERSION = '0.0.32'
 end

data/spec/middleware/instrumentation_spec.rb

@@ -1,12 +1,11 @@
-require 'saddle'
-
+require 'spec_helper'
 
 
 describe 'FaradayMiddleware::Instrumentation' do
 
   context "test integration of instrumentation middleware" do
 
-    it "with a request" do
+    it "with a request should not bomb" do
       client = Saddle::Client.create(
         :stubs => Faraday::Adapter::Test::Stubs.new do |stub|
           stub.get('/test') {
@@ -19,9 +18,6 @@ describe 'FaradayMiddleware::Instrumentation' do
         end
       )
 
-
-
-
       client.requester.get('/test').should == 'Party on!'
     end
 

data/spec/middleware/logging/airbrake_spec.rb

@@ -1,6 +1,6 @@
-require 'saddle'
-require 'saddle/middleware/logging/airbrake'
+require 'spec_helper'
 
+require 'saddle/middleware/logging/airbrake'
 
 
 describe Saddle::Middleware::Logging::AirbrakeLogger do

data/spec/middleware/logging/rails_spec.rb

@@ -1,6 +1,6 @@
-require 'saddle'
-require 'saddle/middleware/logging/rails'
+require 'spec_helper'
 
+require 'saddle/middleware/logging/rails'
 
 
 describe Saddle::Middleware::Logging::RailsLogger do

data/spec/middleware/logging/statsd_spec.rb

@@ -1,6 +1,6 @@
-require 'saddle'
-require 'saddle/middleware/logging/statsd'
+require 'spec_helper'
 
+require 'saddle/middleware/logging/statsd'
 
 
 describe Saddle::Middleware::Logging::StatsdLogger do

data/spec/middleware/request/retry_spec.rb

@@ -1,6 +1,4 @@
-require 'faraday'
-require 'saddle'
-
+require 'spec_helper'
 
 
 describe Saddle::Client do

data/spec/middleware/response/default_response_spec.rb

@@ -1,5 +1,4 @@
-require 'saddle'
-
+require 'spec_helper'
 
 
 describe Saddle::Client do

data/spec/multiple_spec.rb

@@ -1,9 +1,9 @@
-require 'faraday'
-require 'saddle'
+require 'spec_helper'
 
-
-
-### Make sure that multiple implementations of Saddle clients don't conflict with each other's middlewar.
+###
+# Make sure that multiple implementations of Saddle clients don't conflict with
+# each other's middleware.
+###
 
 describe Saddle::Client do
 

data/spec/requester/get_spec.rb

@@ -1,4 +1,5 @@
-require 'saddle'
+require 'spec_helper'
+
 
 describe Saddle::Client do
 

data/spec/requester/post_spec.rb

@@ -1,4 +1,5 @@
-require 'saddle'
+require 'spec_helper'
+
 
 describe Saddle::Client do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
   prerelease: 
 platform: ruby
 authors: