Inject credentials

lib/shorturl.rb

@@ -30,19 +30,19 @@ def self.credentials_for(service)
   # parameters set so that when +instance+.call is invoked, the
   # shortened URL is returned.
   SERVICES = {
-    :tinyurl => Services::TinyURL.new,
-    :shorl => Services::Shorl.new,
-    :snipurl => Services::SnipURL.new,
-    :metamark => Services::Metamark.new,
-    :minilink => Services::Minilink.new,
-    :lns => Services::Lns.new,
-    :moourl => Services::MooURL.new,
-    :bitly => Services::Bitly.new,
-    :ur1 => Services::Url.new,
-    :vurl => Services::Vurl.new,
-    :isgd => Services::Isgd.new,
-    :gitio => Services::Gitio.new,
-    :vamu => Services::Vamu.new,
+    :tinyurl => Services::TinyURL,
+    :shorl => Services::Shorl,
+    :snipurl => Services::SnipURL,
+    :metamark => Services::Metamark,
+    :minilink => Services::Minilink,
+    :lns => Services::Lns,
+    :moourl => Services::MooURL,
+    :bitly => Services::Bitly,
+    :ur1 => Services::Url,
+    :vurl => Services::Vurl,
+    :isgd => Services::Isgd,
+    :gitio => Services::Gitio,
+    :vamu => Services::Vamu,
 
     # :skinnylink => Service.new("skinnylink.com") { |s|
     #   s.block = lambda { |body| URI.extract(body).grep(/skinnylink/)[0] }
@@ -126,9 +126,10 @@ def self.valid_services
   # call-seq:
   #   ShortURL.shorten("http://mypage.com") => Uses TinyURL
   #   ShortURL.shorten("http://mypage.com", :bitly)
-  def self.shorten(url, service = :tinyurl)
+  def self.shorten(url, service = :tinyurl, credentials = nil)
     if SERVICES.has_key?(service)
-      SERVICES[service].call(url)
+      credentials ||= self.credentials_for(service.to_s)
+      SERVICES[service].new(credentials).call(url)
     else
       raise InvalidService
     end

lib/shorturl/service.rb

@@ -15,7 +15,7 @@ class Service
     # return code, the form method to use, the form action, the form
     # field which contains the long URL, and the block of what to do
     # with the HTML code you get.
-    def initialize(hostname) # :yield: service
+    def initialize(hostname, creds = nil) # :yield: service
       @hostname = hostname
       @port = 80
       @code = 200

lib/shorturl/services/bitly.rb

@@ -4,15 +4,14 @@ module ShortURL
   module Services
     class Bitly < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("api-ssl.bitly.com")
 
         @method = :get
         @port = 443
         @ssl = true
         @action = "/v3/shorten/"
 
-        creds = ShortURL.credentials_for('bitly')
         username = creds['username'] 
         key = creds['key'] 
 

lib/shorturl/services/gitio.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Gitio < Service
 
-      def initialize
+      def initialize(creds = nil)
         super('git.io')
 
         @code = 201

lib/shorturl/services/isgd.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Isgd < Service
 
-      def initialize
+      def initialize(creds = nil)
         super('is.gd')
 
         @method = :get

lib/shorturl/services/lns.rb

@@ -2,7 +2,7 @@ module ShortURL
   module Services
     class Lns < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("ln-s.net")
 
         @method = :get

lib/shorturl/services/metamark.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Metamark < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("metamark.net")
 
         @action = "/add"

lib/shorturl/services/minilink.rb

@@ -2,7 +2,7 @@ module ShortURL
   module Services
     class Minilink < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("minilink.org")
 
         @method = :get

lib/shorturl/services/moourl.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class MooURL < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("moourl.com")
 
         @code = 302

lib/shorturl/services/shorl.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Shorl < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("shorl.com")
 
         @method = :get

lib/shorturl/services/snipurl.rb

@@ -6,7 +6,7 @@ module Services
     # registration.
     class SnipURL < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("snipurl.com")
 
         @action = "/site/index"

lib/shorturl/services/tinyurl.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class TinyURL < Service
 
-      def initialize
+      def initialize(creds = nil)
         super('tinyurl.com')
 
         @action = "/api-create.php"

lib/shorturl/services/url.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Url < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("url.ca")
 
         @method = :post

lib/shorturl/services/vamu.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Vamu < Service
 
-      def initialize
+      def initialize(creds = nil)
         super('va.mu')
 
         @method = :get

lib/shorturl/services/vurl.rb

@@ -4,7 +4,7 @@ module ShortURL
   module Services
     class Vurl < Service
 
-      def initialize
+      def initialize(creds = nil)
         super("vurl.me")
 
         @method = :get

spec/spec_helper.rb

@@ -1,4 +1,4 @@
-gem 'rspec', '~> 2.4'
+gem 'rspec', '~> 2.6'
 require 'rspec'
 require 'shorturl'