shutl_resource 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ddcc271e6cf7f37215c62feb2b2815cafc589b4
-  data.tar.gz: 5d289b691593e187a2d02dab517ab41df930edef
+  metadata.gz: 96b124ecad27867670f5f3df5f9d62edb1201575
+  data.tar.gz: 3d9f2c4b25b86d114b9d550e23dc09e4ac5bd608
 SHA512:
-  metadata.gz: cfbf27b564aa4ab98cd4af6fe599f277c1baecea7e5e3958003c2c66e93ce8da8dbf57169cadf76529496f48895512bef9ccf32e5eb1ef7ec3be9a36977fe46e
-  data.tar.gz: 0936ee3c35a6b740f70479d7599f2b3fdbd38240271176e5d681abf339d6f8d00acf9ed9fc0bb10ebce9bff453d68d568d207a5d3422b0bc021afb2adcf00262
+  metadata.gz: 272172bd6f2547034e3feef331a5d9711e93e88b0d2244c310e40c452ed26f0fa80d940a93ca963a03686436b0883290e61386f439ac0838b1b40dfcd4c1f2f5
+  data.tar.gz: 2adc0178107734fc3f42022d8f3babf562b5c84e01f277e9f3ecaa85709d6cec75372f43d4eaa08a69e21e38e008798454231d605bad789dddeca9a609a3b15a

data/lib/shutl/resource/configuration.rb

@@ -28,7 +28,7 @@ module Shutl::Resource
 
   module Configuration
     class << self
-      attr_accessor :base_uri, :logger
+      attr_accessor :base_uri, :logger, :proxy_uri
 
       def configure
         yield self

data/lib/shutl/resource/rest_class_methods.rb

@@ -2,12 +2,16 @@ require 'open-uri'
 module Shutl::Resource
   module RestClassMethods
 
-    def base_uri uri
+    def base_uri(uri)
       @base_uri = uri
     end
 
+    def set_proxy(uri)
+      @proxy_uri = uri
+    end
+
     def connection
-      @connection ||= Faraday.new(:url => @base_uri || Shutl::Resource.base_uri) do |faraday|
+      @connection ||= Faraday.new(url: target_url, proxy: proxy_url) do |faraday|
         faraday.request :url_encoded # form-encode POST params
 
 
@@ -343,7 +347,7 @@ module Shutl::Resource
     def generate_url!(url_pattern, args, params = {})
       url = url_pattern.dup
 
-      args, url = replace_args_from_pattern! args, url
+      _, url = replace_args_from_pattern! args, url
 
       url = URI.escape url
       params = params.except(:headers, :auth, :from, 'headers', 'auth', 'from')
@@ -359,6 +363,14 @@ module Shutl::Resource
       !!@order_collection_by
     end
 
+    def target_url
+      @base_uri || Shutl::Resource.base_uri
+    end
+
+    def proxy_url
+      @proxy_uri || Shutl::Resource.proxy_uri
+    end
+
     private
     def replace_args_from_pattern! args, url
       args = args.reject! do |key, value|

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.7.2'
+    VERSION = '1.7.3'
   end
 end

data/lib/shutl_resource.rb

@@ -18,7 +18,7 @@ Faraday::Middleware.register_middleware :default_logger => :DefaultLogger
 module Shutl::Resource
   extend self
 
-  delegate :logger, :logger=, :base_uri, :base_uri=, to: Configuration
+  delegate :logger, :logger=, :base_uri, :base_uri=, :proxy_uri, :proxy_uri=, to: Configuration
 
   def configure(*args, &block)
     Configuration.configure(*args, &block)

data/spec/configuration_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe Shutl::Resource do
+  after do
+    Shutl::Resource.configure do |config|
+      config.base_uri  = nil
+      config.proxy_uri = nil
+    end
+  end
+
   describe '#configure' do
     it "allows for configuration of the base uri" do
       Shutl::Resource.configure do |config|
@@ -8,11 +15,14 @@ describe Shutl::Resource do
       end
 
       Shutl::Resource.base_uri.should == 'base uri'
+    end
 
-      #set it back to not corrupt other tests
+    it "allows for configuration of the proxy uri" do
       Shutl::Resource.configure do |config|
-        config.base_uri = nil
+        config.proxy_uri = 'proxy uri'
       end
+
+      Shutl::Resource.proxy_uri.should == 'proxy uri'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - David Rouchy
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shutl_auth