dubdubdub 0.2.6 → 0.2.7

data/dubdubdub.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "dubdubdub"
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hu"]

data/lib/dubdubdub.rb

@@ -1,6 +1,6 @@
 class DubDubDub
   # Version
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 
   attr_accessor :client
 

data/lib/dubdubdub/client.rb

@@ -16,13 +16,13 @@ class DubDubDub::Client
     if options[:proxy]
       # If true, refer to global proxy config
       if options[:proxy] == true
-        proxy = DubDubDub.configuration.proxy
+        unless DubDubDub.configuration.ignore_proxy?
+          proxy = DubDubDub.configuration.proxy
 
-        if proxy.nil? and !DubDubDub.configuration.ignore_proxy
-          raise DubDubDub::Exception, "No proxy has been configured or provided!"
-        end
+          raise DubDubDub::Exception, "No proxy has been configured or provided!" if proxy.nil?
 
-        self.proxy = proxy
+          self.proxy = proxy
+        end
       # Otherwise, it should be a proxy url
       else
         self.proxy = options[:proxy]

data/lib/dubdubdub/configuration.rb

@@ -7,6 +7,8 @@ class DubDubDub::Configuration
     self.ignore_proxy = false
   end
 
+  alias_method :ignore_proxy?, :ignore_proxy
+
   # Can be used as callable-setter when block provided.
   def proxy(&block)
     if block_given?

data/spec/dubdubdub_spec.rb

@@ -41,6 +41,16 @@ describe DubDubDub do
       www.proxy.should == "localhost:8000"
     end
 
+    it "ignores proxy if configured to and it's set to nil" do
+      DubDubDub.configure do |config|
+        config.ignore_proxy = true
+        config.proxy = nil
+      end
+
+      www = DubDubDub.new(proxy: true)
+      www.should_not be_proxy
+    end
+
     it "raises an error if we have specified to use a proxy but none has been set globally" do
       DubDubDub.configure do |config|
         config.ignore_proxy = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dubdubdub
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 172753336999949758
+      hash: 4395775456282320006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: