saddle 0.0.38 → 0.0.41

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
 
-script: rspec
+script: bundle exec rspec

data/CHANGELOG.md

@@ -1,2 +1,17 @@
+# 0.0.41
+* Cleanup of the path building chain makes nicer URLs
+
+# 0.0.40
+* Support for client-specified HTTP adapter. Preparing for Thrawn.
+
+# 0.0.39
+* DEPRECATION warning: root_endpoint.rb is no longer supported
+
+# 0.0.38
+* Support for `ABSOLUTE_PATH` on endpoints
+
+# 0.0.37
+* Lowered the default # of retries
+
 # 0.0.36
 * Parse JSON before throwing an error. The body may have useful failure info.

data/lib/saddle/endpoint.rb

@@ -77,17 +77,23 @@ module Saddle
 
     # Get the url path for this endpoint/action combo
     def _path(action=nil)
-      if defined?(self.class::ABSOLUTE_PATH)
-        [self.class::ABSOLUTE_PATH, action].compact.join('/')
-      else
-        paths = _path_array()
-        paths << action unless action.nil?
-        paths.join('/')
-      end
+      # Use the absolute path if present, otherwise get the relative path
+      pre_action_paths =
+        if defined?(self.class::ABSOLUTE_PATH)
+          [self.class::ABSOLUTE_PATH]
+        else
+          _path_array()
+        end
+      # Strip out empty elements
+      pre_action_paths.compact!
+      pre_action_paths.reject! { |p| p.empty? }
+      # Join it with the action
+      pre_action_paths << action
+      "/#{pre_action_paths.join('/')}"
     end
 
     def _path_array
-      _endpoint_chain().map(&:relative_path).reject{|p| p.nil?}
+      _endpoint_chain().map(&:relative_path).compact
     end
 
     # Get the parent chain that led to this endpoint

data/lib/saddle/method_tree_builder.rb

@@ -37,6 +37,7 @@ module Saddle
           'root_endpoint.rb'
         )
         if File.file?(root_endpoint_file)
+          warn "[DEPRECATION] `root_endpoint.rb` is deprecated. Please use `ABSOLUTE_PATH` in your endpoints."
           # Load it and create our base endpoint
           require(root_endpoint_file)
           # RootEndpoint is the special class name for a root endpoint

data/lib/saddle/options.rb

@@ -14,8 +14,9 @@ module Saddle
         :request_style => request_style,
         :num_retries => num_retries,
         :timeout => timeout,
-        :additional_middlewares => self.additional_middlewares,
+        :http_adapter => http_adapter,
         :stubs => stubs,
+        :additional_middlewares => self.additional_middlewares,
       }
     end
 
@@ -55,9 +56,13 @@ module Saddle
       30
     end
 
-    # If you want to set up an ActiveSupport::Notification, give your client
-    #  an instrumentation key to monitor.
-    def instrumentation_key
+    # Support specification of the HTTP adapter being used
+    def http_adapter
+      :net_http
+    end
+
+    # If the Typhoeus adapter is being used, pass stubs to it for testing.
+    def stubs
       nil
     end
 
@@ -76,10 +81,5 @@ module Saddle
       self.additional_middlewares << m
     end
 
-    # If the Typhoeus adapter is being used, pass stubs to it for testing.
-    def stubs
-      nil
-    end
-
   end
 end

data/lib/saddle/requester.rb

@@ -58,6 +58,8 @@ module Saddle
       raise ':additional_middleware must be an Array' unless @additional_middlewares.is_a?(Array)
       raise 'invalid middleware found' unless @additional_middlewares.all? { |m| m[:klass] < Faraday::Middleware }
       raise 'middleware arguments must be an array' unless @additional_middlewares.all? { |m| m[:args].nil? || m[:args].is_a?(Array) }
+      @http_adapter = opt[:http_adapter] || :net_http
+      raise ':http_adapter must be a symbol' unless @http_adapter.is_a?(Symbol)
       @stubs = opt[:stubs] || nil
       unless @stubs.nil?
         raise ':stubs must be a Faraday::Adapter::Test::Stubs' unless @stubs.is_a?(Faraday::Adapter::Test::Stubs)
@@ -166,7 +168,7 @@ module Saddle
         # Set up our adapter
         if @stubs.nil?
           # Use the default adapter
-          builder.adapter(:net_http)
+          builder.adapter(@http_adapter)
         else
           # Use the test adapter
           builder.adapter(:test, @stubs)

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.38'
+  VERSION = '0.0.41'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.41
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport