dubdubdub 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15640115e011f39d528ea0ad6369097c29e02004
-  data.tar.gz: daba756d0aec9b295a04095ef1ff04a3eeb27d6d
+  metadata.gz: 539019bb4ef032b1ed9e449a1bbfbbd81bd6259f
+  data.tar.gz: 5b51570cb2465086030f59776633ea8c22d0c719
 SHA512:
-  metadata.gz: d32b5010a1352ccc3288ac483ce1d9f95f6d7b403ddf6c8b8ad19b6b4ed94dbf36bb9928f782a58099dce664576a2bd5c0905fa2d96c8d4b978266e9d3d57911
-  data.tar.gz: e7450a822efec53afb7dc0e9d1dbf369291afdbb9e413687790b0daa97a027070ba5c6d2148c87150ab4817a7476c9c8818a36e4b68624802db2fb15182e1f1c
+  metadata.gz: faf635beb4993d2f7580ad4b0c593584d6ce48c51a428c4d1137a99a4fc1f67b19c77942c2773b99348728094003bece00d19d2af14704881e5ca5411ad86ff1
+  data.tar.gz: b6b4934910f0ff2510a892f915d4af707fca85b5918ef20406eb6b6dea60d1dda00badf16ce515d7667b4d659000a4f12faddd8f6829f16d099ea585e28259b5

data/dubdubdub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dubdubdub"
-  s.version = "0.3.9"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hu"]
-  s.date = "2014-10-31"
+  s.date = "2014-11-03"
   s.description = "A library that provides web utility methods with proxification."
   s.email = "axsuul@gmail.com"
   s.extra_rdoc_files = [

data/lib/dubdubdub.rb

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

data/lib/dubdubdub/client.rb

@@ -4,7 +4,10 @@ require 'mechanize'
 require 'rest-client'
 
 class DubDubDub::Client
-  attr_accessor :proxy_host, :proxy_port, :proxy_user, :proxy_password
+  attr_accessor :proxy_host,
+                :proxy_port,
+                :proxy_username,
+                :proxy_password
 
   def initialize(options = {})
     default_options = {
@@ -36,15 +39,24 @@ class DubDubDub::Client
   end
 
   def proxy=(url)
-    host, port = url.split(":")
+    matches = url.match(/(?:(?<username>[^\:]+)\:(?<password>[^\@]+)\@)?(?<host>[\.0-9]+|localhost)(?:\:(?<port>[0-9]+))?/)
 
-    port = 80 unless port
-    self.proxy_host = host
-    self.proxy_port = port
+    self.proxy_host = matches[:host]
+    self.proxy_port = matches[:port] || 80
+    self.proxy_username = matches[:username]
+    self.proxy_password = matches[:password]
   end
 
   def proxy
-    "#{proxy_host}:#{proxy_port}" if proxy_host and proxy_port
+    if proxy_host and proxy_port
+      address = "#{proxy_host}:#{proxy_port}"
+
+      if proxy_username and proxy_password
+        address.prepend("#{proxy_username}:#{proxy_password}@")
+      end
+    end
+
+    address
   end
 
   def proxy?

data/spec/dubdubdub_spec.rb

@@ -31,6 +31,17 @@ describe DubDubDub do
       www.proxy_port.should == 80
     end
 
+    it "can specify user and password for proxy" do
+      address = "user:pass@203.131.212.166:55555"
+
+      www = DubDubDub.new(proxy: address)
+      www.proxy_host.should == "203.131.212.166"
+      www.proxy_port.should == 55555
+      www.proxy_username.should == "user"
+      www.proxy_password.should == "pass"
+      www.proxy.should == address
+    end
+
     it "can configure to use a proxy globally" do
       DubDubDub.configure do |config|
         config.proxy = "localhost:8000"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dubdubdub
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client