shortie 0.0.2 → 0.0.3

data/lib/shortie/base_shortener.rb

@@ -1,7 +1,8 @@
 module Shortie
   class BaseShortener
     attr_accessor :url
-
+    
+    # Shortens a url.
     def self.shorten(url)
       self.new(url).shorten
     end
@@ -9,7 +10,8 @@ module Shortie
     def initialize(url)
       self.url = url
     end
-
+    
+    # Shorten method to be called. Must be implemented by classes inheriting this class.
     def shorten
       raise "Invalid shortener. It must implement the shorten method."
     end

data/lib/shortie/service.rb

@@ -1,21 +1,31 @@
 module Shortie
   class Service
+    @@services = []
+    
+    # Register a new service by key, name, and shortener, e.g. register("bitly", "bit.ly", Bitly).
+    def self.register(key, name, shortener)
+      @@services << Service.new(key, name, shortener)
+    end
+    
+    # Get a list of all services.
     def self.all
-      SERVICES
+      @@services
     end
     
+    # Find a service by key, e.g. 'bitly'.
     def self.find_by_key(key)
-      SERVICES.find { |s| s.key == key }
+      @@services.find { |s| s.key == key }
     end
     
-    attr_accessor :key, :name, :class_name
+    attr_accessor :key, :name, :shortener
     
-    def initialize(key, name, class_name)
-      self.key, self.name, self.class_name = key, name, class_name
+    def initialize(key, name, shortener)
+      self.key, self.name, self.shortener = key, name, shortener
     end
     
+    # Shorten a URL. This calls the shorten(url) method on the shortener.
     def shorten(url)
-      eval("Shortie::Shorteners::#{class_name}").shorten(url)
+      shortener.shorten(url)
     end
   end
 end

data/lib/shortie/shorteners/bitly.rb

@@ -17,5 +17,6 @@ module Shortie
         url_element.text
       end
     end
+    Service.register("bitly", "bit.ly", Bitly)
   end
 end

data/lib/shortie/shorteners/cligs.rb

@@ -5,5 +5,6 @@ module Shortie
         SimpleHttp.get("http://cli.gs/api/v1/cligs/create?url=#{escaped_url}")
       end
     end
+    Service.register("cligs", "cli.gs", Cligs)
   end
 end

data/lib/shortie/shorteners/cllk.rb

@@ -1,9 +1,15 @@
 module Shortie
   module Shorteners
-    class Cllk < Snipurl
+    class Cllk < BaseShortener
       def shorten
-        super("http://cl.lk")
+        SimpleHttp.post("http://cl.lk/site/getsnip", {
+          "sniplink" => url,
+          "snipuser" => "lassebunk",
+          "snipapi" => "55656c5bbaf92f859aa657be1482fc3a",
+          "snipformat" => "simple"
+        })
       end
     end
+    Service.register("cllk", "cl.lk", Cllk)
   end
 end

data/lib/shortie/shorteners/idek.rb

@@ -5,5 +5,6 @@ module Shortie
         SimpleHttp.get("http://idek.net/shorten/?idek-api=true&idek-url=#{escaped_url}")
       end
     end
+    Service.register("idek", "idek.net", Idek)
   end
 end

data/lib/shortie/shorteners/isgd.rb

@@ -5,5 +5,6 @@ module Shortie
         SimpleHttp.get("http://is.gd/api.php?longurl=#{escaped_url}")
       end
     end
+    Service.register("isgd", "is.gd", Isgd)
   end
 end

data/lib/shortie/shorteners/rubyurl.rb

@@ -8,5 +8,6 @@ module Shortie
         doc.elements["link/permalink"].text
       end
     end
+    Service.register("rubyurl", "RubyURL", Rubyurl)
   end
 end

data/lib/shortie/shorteners/shortie.rb

@@ -11,5 +11,6 @@ module Shortie
         doc.elements["short/shortened"].text
       end
     end
+    Service.register("shortie", "short.ie", Shortie)
   end
 end

data/lib/shortie/shorteners/snim.rb

@@ -1,9 +1,15 @@
 module Shortie
   module Shorteners
-    class Snim < Snipurl
+    class Snim < BaseShortener
       def shorten
-        super("http://sn.im")
+        SimpleHttp.post("http://sn.im/site/getsnip", {
+          "sniplink" => url,
+          "snipuser" => "lassebunk",
+          "snipapi" => "55656c5bbaf92f859aa657be1482fc3a",
+          "snipformat" => "simple"
+        })
       end
     end
+    Service.register("snim", "sn.im", Snim)
   end
 end

data/lib/shortie/shorteners/snipr.rb

@@ -1,9 +1,15 @@
 module Shortie
   module Shorteners
-    class Snipr < Snipurl
+    class Snipr < BaseShortener
       def shorten
-        super("http://snipr.com")
+        SimpleHttp.post("http://snipr.com/site/getsnip", {
+          "sniplink" => url,
+          "snipuser" => "lassebunk",
+          "snipapi" => "55656c5bbaf92f859aa657be1482fc3a",
+          "snipformat" => "simple"
+        })
       end
     end
+    Service.register("snipr", "Snipr", Snipr)
   end
 end

data/lib/shortie/shorteners/snipurl.rb

@@ -1,8 +1,8 @@
 module Shortie
   module Shorteners
     class Snipurl < BaseShortener
-      def shorten(base_path = "http://snipurl.com")
-        SimpleHttp.post("#{base_path}/site/getsnip", {
+      def shorten
+        SimpleHttp.post("http://snipurl.com/site/getsnip", {
           "sniplink" => url,
           "snipuser" => "lassebunk",
           "snipapi" => "55656c5bbaf92f859aa657be1482fc3a",
@@ -10,5 +10,6 @@ module Shortie
         })
       end
     end
+    Service.register("snipurl", "Snipurl", Snipurl)
   end
 end

data/lib/shortie/shorteners/snurl.rb

@@ -1,9 +1,15 @@
 module Shortie
   module Shorteners
-    class Snurl < Snipurl
+    class Snurl < BaseShortener
       def shorten
-        super("http://snurl.com")
+        SimpleHttp.post("http://snurl.com/site/getsnip", {
+          "sniplink" => url,
+          "snipuser" => "lassebunk",
+          "snipapi" => "55656c5bbaf92f859aa657be1482fc3a",
+          "snipformat" => "simple"
+        })
       end
     end
+    Service.register("snurl", "Snurl", Snurl)
   end
 end

data/lib/shortie/shorteners/tinycc.rb

@@ -11,5 +11,6 @@ module Shortie
         doc.elements["restapi/results/*/shorturl"].text
       end
     end
+    Service.register("tinycc", "tiny.cc", Tinycc)
   end
 end

data/lib/shortie/shorteners/tinyurl.rb

@@ -5,5 +5,6 @@ module Shortie
         SimpleHttp.get("http://tinyurl.com/api-create.php?url=#{escaped_url}")
       end
     end
+    Service.register("tinyurl", "TinyURL", Tinyurl)
   end
 end

data/lib/shortie/shorteners/twurl.rb

@@ -5,5 +5,6 @@ module Shortie
         SimpleHttp.post("http://tweetburner.com/links", "link[url]" => url)
       end
     end
+    Service.register("twurl", "Twurl", Twurl)
   end
 end

data/lib/shortie/shorteners.rb

@@ -1,14 +1,16 @@
-require 'shortie/shorteners/snipurl'
-require 'shortie/shorteners/bitly'
-require 'shortie/shorteners/cligs'
-require 'shortie/shorteners/cllk'
-require 'shortie/shorteners/idek'
-require 'shortie/shorteners/isgd'
-require 'shortie/shorteners/rubyurl'
-require 'shortie/shorteners/shortie'
-require 'shortie/shorteners/snim'
-require 'shortie/shorteners/snipr'
-require 'shortie/shorteners/snurl'
-require 'shortie/shorteners/tinycc'
-require 'shortie/shorteners/tinyurl'
-require 'shortie/shorteners/twurl'
+Dir["shortie/shorteners/*.rb"].each {|file| require file }
+
+#require 'shortie/shorteners/snipurl'
+#require 'shortie/shorteners/bitly'
+#require 'shortie/shorteners/cligs'
+#require 'shortie/shorteners/cllk'
+#require 'shortie/shorteners/idek'
+#require 'shortie/shorteners/isgd'
+#require 'shortie/shorteners/rubyurl'
+#require 'shortie/shorteners/shortie'
+#require 'shortie/shorteners/snim'
+#require 'shortie/shorteners/snipr'
+#require 'shortie/shorteners/snurl'
+#require 'shortie/shorteners/tinycc'
+#require 'shortie/shorteners/tinyurl'
+#require 'shortie/shorteners/twurl'

data/lib/shortie.rb

@@ -1,8 +1,9 @@
 require 'shortie/base_shortener'
 require 'shortie/service'
-require 'shortie/services'
 require 'shortie/shorteners'
 
 require 'rubygems'
 require 'simplehttp'
-require 'rexml/document'
+require 'rexml/document'
+
+Shortie::Service.all.each { |s| puts s.name }

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shortie
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lasse Bunk
@@ -14,23 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 +02:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: simplehttp
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 3
         version: 0.1.3
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: Shortie makes it easy to shorten URLs with any service.
 email: lassebunk@gmail.com
 executables: []
@@ -42,7 +33,6 @@ extra_rdoc_files: []
 files: 
 - lib/shortie/base_shortener.rb
 - lib/shortie/service.rb
-- lib/shortie/services.rb
 - lib/shortie/shorteners/bitly.rb
 - lib/shortie/shorteners/cligs.rb
 - lib/shortie/shorteners/cllk.rb
@@ -72,20 +62,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Shorten URLs with any service.

data/lib/shortie/services.rb

@@ -1,18 +0,0 @@
-module Shortie
-  SERVICES = [
-    Service.new("bitly", "bit.ly", "Bitly"),
-    Service.new("tinyurl", "TinyURL", "Tinyurl"),
-    Service.new("isgd", "is.gd", "Isgd"),
-    Service.new("cligs", "cli.gs", "Cligs"),
-    Service.new("twurl", "Twurl", "Twurl"),
-    Service.new("snipurl", "Snipurl", "Snipurl"),
-    Service.new("snurl", "Snurl", "Snurl"),
-    Service.new("snipr", "Snipr", "Snipr"),
-    Service.new("snim", "sn.im", "Snim"),
-    Service.new("cllk", "cl.lk", "Cllk"),
-    Service.new("shortie", "short.ie", "Shortie"),
-    Service.new("idek", "idek.net", "Idek"),
-    Service.new("tinycc", "tiny.cc", "Tinycc"),
-    Service.new("rubyurl", "RubyURL", "Rubyurl")
-    ]
-end