dubdubdub 0.2.5 → 0.2.6

data/dubdubdub.gemspec

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

data/lib/dubdubdub.rb

@@ -1,13 +1,9 @@
 class DubDubDub
   # Version
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 
   attr_accessor :client
 
-  class << self
-    attr_accessor :proxies
-  end
-
   def self.configure
     yield(configuration)
   end

data/lib/dubdubdub/client.rb

@@ -14,14 +14,15 @@ class DubDubDub::Client
 
     # If we want to use a proxy
     if options[:proxy]
-      # If true and we have a proxy list, use a random one from the list
-      # or ignore and don't use a proxy at all
+      # If true, refer to global proxy config
       if options[:proxy] == true
-        if DubDubDub.proxies and DubDubDub.proxies.is_a?(Array) and DubDubDub.proxies.any?
-          self.proxy = DubDubDub.proxies.sample
-        else
-          raise DubDubDub::Exception, "No proxies have been specified!" unless DubDubDub.configuration.ignore_proxies
+        proxy = DubDubDub.configuration.proxy
+
+        if proxy.nil? and !DubDubDub.configuration.ignore_proxy
+          raise DubDubDub::Exception, "No proxy has been configured or provided!"
         end
+
+        self.proxy = proxy
       # Otherwise, it should be a proxy url
       else
         self.proxy = options[:proxy]
@@ -46,7 +47,7 @@ class DubDubDub::Client
   end
 
   def proxy?
-    return false if DubDubDub.configuration.ignore_proxies
+    return false if DubDubDub.configuration.ignore_proxy
 
     !!proxy
   end

data/lib/dubdubdub/configuration.rb

@@ -1,9 +1,26 @@
 class DubDubDub::Configuration
   # Ignores all attempts to use proxies
-  attr_accessor :ignore_proxies
+  attr_accessor :ignore_proxy
 
   def initialize
     # Default config values
-    self.ignore_proxies = false
+    self.ignore_proxy = false
+  end
+
+  # Can be used as callable-setter when block provided.
+  def proxy(&block)
+    if block_given?
+      @proxy = block
+    else
+      if @proxy.is_a? Proc
+        @proxy.call
+      else
+        @proxy
+      end
+    end
+  end
+
+  def proxy=(proxy)
+    @proxy = proxy
   end
 end

data/spec/dubdubdub_spec.rb

@@ -31,27 +31,31 @@ describe DubDubDub do
       www.proxy_port.should == 80
     end
 
-    it "can specify to use a random proxy from list of proxies set" do
-      proxies = ["localhost:8000", "localhost:4000", "12.12.12.12:3000"]
-      DubDubDub.proxies = proxies
+    it "can configure to use a proxy globally" do
+      DubDubDub.configure do |config|
+        config.proxy = "localhost:8000"
+      end
 
       www = DubDubDub.new(proxy: true)
       www.should be_proxy
-
-      proxies.include?(www.proxy).should be_true
+      www.proxy.should == "localhost:8000"
     end
 
-    it "raises an error if we have specified to use a proxy from the list but there are none" do
-      DubDubDub.proxies = []
-      lambda { DubDubDub.new(proxy: true) }.should raise_error(DubDubDub::Exception)
+    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
+        config.proxy = nil
+      end
 
-      DubDubDub.proxies = nil
       lambda { DubDubDub.new(proxy: true) }.should raise_error(DubDubDub::Exception)
     end
 
-    it "doesn't raise an error if configured to ignore proxies and we have specified to use a proxy from the list but there are none" do
-      DubDubDub.configuration.ignore_proxies = true
-      DubDubDub.proxies = nil
+    it "doesn't raise an error if configured to ignore proxies and we have specified to use a global proxy that hasn't been set" do
+      DubDubDub.configure do |config|
+        config.ignore_proxy = true
+        config.proxy = nil
+      end
+
       lambda { DubDubDub.new(proxy: true) }.should_not raise_error(DubDubDub::Exception)
     end
 
@@ -67,42 +71,50 @@ describe DubDubDub do
     end
 
     it "has default config values" do
-      DubDubDub.configuration.ignore_proxies.should be_false
+      DubDubDub.configuration.ignore_proxy.should be_false
+      DubDubDub.configuration.proxy.should be_nil
     end
   end
 
   describe '::reset_configuration!' do
     it "resets configuration by to defaults" do
       DubDubDub.configure do |config|
-        config.ignore_proxies = true
+        config.ignore_proxy = true
       end
 
-      DubDubDub.configuration.ignore_proxies.should be_true
+      DubDubDub.configuration.ignore_proxy.should be_true
 
       DubDubDub.reset_configuration!
 
-      DubDubDub.configuration.ignore_proxies.should be_false
+      DubDubDub.configuration.ignore_proxy.should be_false
     end
   end
 
   describe '::configure' do
     it "sets config attributes" do
       DubDubDub.configure do |config|
-        config.ignore_proxies = true
+        config.ignore_proxy = true
       end
 
-      DubDubDub.configuration.ignore_proxies.should be_true
+      DubDubDub.configuration.ignore_proxy.should be_true
     end
-  end
 
-  describe '::proxies' do
-    it "is nil by default" do
-      DubDubDub.proxies.should be_nil
+    it "can pass a string to proxy config" do
+      DubDubDub.configure do |config|
+        config.proxy = "localhost:8000"
+      end
+
+      DubDubDub.configuration.proxy.should == "localhost:8000"
     end
 
-    it "can be set" do
-      DubDubDub.proxies = ["localhost:8000"]
-      DubDubDub.proxies.should be == ["localhost:8000"]
+    it "can pass a block to proxy config with the block being called when accessing it" do
+      DubDubDub.configure do |config|
+        config.proxy do
+          "localhost:8000"
+        end
+      end
+
+      DubDubDub.configuration.proxy.should == "localhost:8000"
     end
   end
 
@@ -125,7 +137,7 @@ describe DubDubDub do
     end
 
     it "ignores proxy if configured" do
-      DubDubDub.configuration.ignore_proxies = true
+      DubDubDub.configuration.ignore_proxy = true
 
       www.proxy = "localhost:8000"
       agent = www.mechanize

metadata

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