saddle 0.0.7 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTA5Y2RmYWY4MTAxYWJmNjI2MTBkNDhlZTVjZWViODdhMDAyMGY3MQ==
+    NmI5ZWE4OTY2MDdhYTU0ODhjMGRlNjQ4NTVlZmYyMDExZWRkMWM0OQ==
   data.tar.gz: !binary |-
-    NDUwZmI1NDAzMzEyOGQ1NjMxMDhhZTE0MjQ1MTRiMWIwOGJmNTBmZg==
+    MTJjNzUzN2UwYjRiNThiNDVmNzk1YjM1YTczOWEzODdkNThhYzFhOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmRjZmY4Yjc4ZDdkYmMxOTBlYzY4NjYxNTlkZWIzZjViZjkzYTExNWM4ZDMw
-    YjU4OWQ3YzA5ZGE5NmVkZDIxYzU1NTQxNGEyNTVlOTY0M2Y5ZTYyZjBiZmMx
-    Y2VmZmMzMTg2YzA5M2NjMzcxMjY5NDg5Nzg2ODRkZGYyNmY1MTk=
+    MTg2NDg1NzkwMWM4NzE4YzEzODNkMzJmNGQ0NTYwNjc5NjAwMThlNzNkOWYx
+    MjYxNTJlYzFiMmMxNTJmYjBiOTc0NDBjNDQzYmM2NGY5ZDExYjc0NTY0ZWUx
+    OTNmMTEyODVlN2RlMTAyZjk4MGVjMGZlMjliN2I4OWQ0ZDQ2MTQ=
   data.tar.gz: !binary |-
-    NzEwYmI5YzRmN2E1NGE0Yjc5MjBiOWIzZTdiNzk0OTc2YjUyZTkwYTQ4ZjE5
-    YTU4MDU2NjFjOWQyMmM2ZDI4M2YwMmU3ZWI0MjY0NDFmZjYxMGViZTNjN2Nh
-    ZjgxNzI4YjVhODliNjgyYzBkZmE3ZTJhZjk0ZTljYWEzYTIxYzc=
+    NWFiOWQ1OTMzMTViM2M0ZGEzOGNmODdiMTQwOTM2NWIzYzMyNjc1OGFjNmQ5
+    N2RlNDBmZTMzYTE0ODkwOWQ4YzVkY2NjY2U5MDk2Nzc1MWVmZTViYTgyNjhk
+    M2I2NzU3NTg0ZjdkNDA5OWQ2N2U5ODQyZGFhOGUzODlkMDgyMzU=

data/lib/saddle/client_attributes.rb

@@ -0,0 +1,20 @@
+module Saddle::ClientAttributes
+
+  def self.included(obj)
+    obj.extend ClassMethods
+
+    # Default values
+    obj.additional_middlewares = []
+
+    # We know that this module is included when saddle client is inherited,
+    # so we're actually interested in the path of the caller two levels deep.
+    path, = caller[2].partition(":")
+    obj.implementation_root = File.dirname(path)
+  end
+
+  module ClassMethods
+    attr_accessor :implementation_root
+    attr_accessor :additional_middlewares
+  end
+
+end

data/lib/saddle/errors.rb

@@ -0,0 +1,7 @@
+module Saddle
+  # The parent class of all exceptions thrown by Saddle
+  class Error < StandardError; end
+
+  # Thrown when a request timeout is exceeded
+  class TimeoutError < Error; end
+end

data/lib/saddle/method_tree_builder.rb

@@ -29,7 +29,7 @@ module Saddle::MethodTreeBuilder
   def build_root_node(requester)
     if knows_root?
       root_endpoint_file = File.join(
-        @@implementation_root,
+        self.implementation_root,
         'root_endpoint.rb'
       )
       if File.file?(root_endpoint_file)
@@ -92,22 +92,12 @@ module Saddle::MethodTreeBuilder
   # Get the path to the 'endpoints' directory, based upon the client
   # class that inherited Saddle
   def endpoints_directory
-    File.join(@@implementation_root, 'endpoints')
-  end
-
-
-
-  # When Saddle is inherited, we store the root of the implementation class
-  # This is so that we know where to look for relative files, like
-  # the endpoints directory
-  def inherited(obj)
-    path, = caller[0].partition(":")
-    @@implementation_root = File.dirname(path)
+    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 and avoid firesystem searching.
   def knows_root?
-    defined?(@@implementation_root)
+    defined?(self.implementation_root)
   end
 end

data/lib/saddle/middleware/ruby_timeout.rb

@@ -3,15 +3,20 @@ require 'faraday'
 
 module Saddle::Middleware
 
-  # Public: Enforces a ruby timeout on the request
+  # Public: Enforces a ruby timeout on the request and throws one consistent
+  # exception for all classes of timeout, internal or from faraday.
   # :timeout must be present in the request or client options
   class RubyTimeout < Faraday::Middleware
 
     def call(env)
       timeout = env[:request][:timeout] # nil or 0 means no timeout
-      Timeout.timeout(timeout) do
+      Timeout.timeout(timeout, Saddle::TimeoutError) do
         @app.call(env)
       end
+    # It is possible that faraday will catch the timeout first and throw
+    # this exception, rethrow as a class derived from standard error.
+    rescue Faraday::Error::TimeoutError
+      raise Saddle::TimeoutError
     end
 
   end

data/lib/saddle/options.rb

@@ -16,7 +16,7 @@ module Saddle::Options
       :request_style => request_style,
       :num_retries => num_retries,
       :timeout => timeout,
-      :additional_middlewares => @@additional_middlewares,
+      :additional_middlewares => self.additional_middlewares,
       :stubs => stubs,
     }
   end
@@ -60,10 +60,9 @@ module Saddle::Options
   # })
   # end
   #
-  ###
-  @@additional_middlewares = []
+  ###  
   def add_middleware m
-    @@additional_middlewares << m
+    self.additional_middlewares << m
   end
 
   # If the Typhoeus adapter is being used, pass stubs to it for testing.

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.7'
+  VERSION = '0.0.10'
 end

data/lib/saddle.rb

@@ -1,7 +1,8 @@
 require 'saddle/method_tree_builder'
 require 'saddle/options'
+require 'saddle/client_attributes'
 require 'saddle/requester'
-
+require 'saddle/errors'
 
 
 # Ghost ride the whip.
@@ -16,7 +17,6 @@ module Saddle
     extend MethodTreeBuilder
     extend Options
 
-
     # Once your implementation is written, this is the magic you need to
     # create a client instance.
     def self.create(opt={})
@@ -27,6 +27,10 @@ module Saddle
       )
     end
 
+    def self.inherited(obj)
+      obj.send(:include, Saddle::ClientAttributes)
+    end    
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
 platform: ruby
 authors:
 - Mike Lewis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,7 +66,9 @@ files:
 - LICENSE
 - README.md
 - lib/saddle.rb
+- lib/saddle/client_attributes.rb
 - lib/saddle/endpoint.rb
+- lib/saddle/errors.rb
 - lib/saddle/method_tree_builder.rb
 - lib/saddle/middleware/logging/airbrake.rb
 - lib/saddle/middleware/logging/statsd.rb