shortly 0.3.0 → 0.3.1

data/README.textile

@@ -33,6 +33,12 @@ Optionally you can set apiKey and login beforehand (it would be more DRY i think
 @googl.expand('http://goo.gl/shrt').longUrl@
 @googl.analytics('http://goo.gl/shrt').analytics@
 
+*Lggd* (Credit 'Steve Price (steveprice67)'. See Credits section)
+
+@lggd = Shortly::Clients::Lggd@
+@lggd.apiKey = '<api-key>'@
+@lggd.shorten('http://justatest.com').shortUrl@
+
 *Is.gd*
 
 @isgd = Shortly::Clients::Isgd@
@@ -73,6 +79,10 @@ spits formatted json at CLI
 * Bitly
 @shortly 'http://bit.ly/shrt -s bitly -p my_api_key -l my_login -m expand@
 
+h2. Credits
+
+* "Steve Price(steveprice67)":https://github.com/steveprice67 (For implementing Lggd service support)
+
 h2. More Info
 
 For detailed info visit my blog "http://BagwanPankaj.com":http://bagwanpankaj.com

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/shortly

@@ -15,6 +15,7 @@ services = {
               :googl => Shortly::Clients::Googl, 
               :isgd => Shortly::Clients::Isgd, 
               :vgd => Shortly::Clients::Vgd,
+              :lggd => Shortly::Clients::Lggd, 
               :bitly => Shortly::Clients::Bitly,
               :tinyurl => Shortly::Clients::Tinyurl
             }
@@ -71,12 +72,17 @@ end
 unless options[:url]
   abort("Please provide atleast a valid URL. To see help type --help or -h")
 end
+unless services.include?(options[:service])
+  abort("#{options[:service]} sevice is not supported currently.")
+end
 
 command = services[options[:service]]
 
 if options[:service] == :bitly
-  command.login = options[:login]
-  command.apiKey = options[:apikey]
+  command.login = options.delete(:login)
+  command.apiKey = options.delete(:apikey)
+elsif options[:service] == :lggd
+  command.apiKey = options.delete(:apikey)
 end
 
 response = command.send(options[:method], options[:url])
@@ -99,6 +105,7 @@ output = case options[:service]
     end
   when :isgd then response.shorturl
   when :vgd then response.shorturl
+  when :lggd then response.shortUrl
   when :tinyurl then response.shorturl
   else abort("Something went wrong. Please raise an issue on Github")
 end

data/lib/shortly/clients/bitly.rb

@@ -47,7 +47,8 @@ module Shortly
       #expands provided url by making call to bitly api with given options.      
       def self.expand(short_url, options = {})
         validate_uri!(short_url)
-        options = {:login => self.login, :apiKey => self.apiKey, :shortUrl => short_url, :format => "json"}.merge(options) 
+        options = {:login => self.login, :apiKey => self.apiKey, :shortUrl => short_url, :format => "json"}.merge(options)
+        validate!(options) 
         response = get("/v3/expand", get_params(options))
         OpenStruct.new(response["data"]["expand"].first)
       end
@@ -62,7 +63,8 @@ module Shortly
       private
       
       def self.validate!(options)
-        raise NotAuthorizedError.new("Credentials required(login and apiKey)") unless options.authenticable?
+        raise NotAuthorizedError.new("Credentials required(login and apiKey)") unless 
+          options.authenticable?(:login, :apiKey)
       end
           
     end

data/lib/shortly/clients/lggd.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2011 Bagwan Pankaj
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module Shortly
+
+  module Clients
+
+    class Lggd < Client
+
+      self.register!
+
+      class << self
+        attr_accessor :apiKey
+      end
+
+      base_uri 'lg.gd'
+
+      #shorts provided url by making call to is.gd api with given options.      
+      def self.shorten(url, options = {})
+        validate_uri!(url)
+        options = {:apiKey => self.apiKey, :format => :json, :longUrl => url}.merge(options)
+        validate!(options)
+        response = get("/shorten", get_params(options))
+        OpenStruct.new(response['results'][url])
+      end
+      
+      private
+      
+      def self.validate!(options)
+        raise NotAuthorizedError.new("Credentials required(apiKey)") unless 
+          options.authenticable?(:apiKey)
+      end
+
+    end
+  end
+end

data/lib/shortly/helper.rb

@@ -32,8 +32,8 @@ module Shortly
       
       module MonkeyHash
       
-        def authenticable?
-          [:login, :apiKey].all?{|k| self.key?(k)} && !self.values.any?(&:blank?)
+        def authenticable?(*args)
+          args.all?{|k| self.key?(k)} && !self.values.any?(&:blank?)
         end
       
       end

data/lib/shortly.rb

@@ -9,6 +9,7 @@ require 'shortly/client'
 require 'shortly/clients/bitly'
 require 'shortly/clients/googl'
 require 'shortly/clients/isgd'
+require 'shortly/clients/lggd'
 require 'shortly/clients/tinyurl'
 require 'shortly/clients/vgd'
 

data/spec/shortly_spec.rb

@@ -178,6 +178,35 @@ describe "Shortly" do
     end
   end
   
+  #tests for client lg.gd
+  describe "Lggd" do
+    
+    before(:all) do
+      Shortly::Clients::Lggd.apiKey = "87171b48ff5487f8817021667298e059081d7cc0"
+      @long_url = "http://google.com"
+      @invalid_url = "bagwanpankaj.com"
+      @short_url = "http://demo.shortswitch.com/1"
+    end
+    
+    it "should get a short url from lg.gd(provided valid url)" do
+      res = Shortly::Clients::Lggd.shorten(@long_url)
+      res.shortUrl.should_not be_empty
+      res.shortUrl.should == @short_url
+    end
+    
+    it "result should be an instance of OpenStruct" do
+      res = Shortly::Clients::Lggd.shorten(@long_url)
+      res.should be_an_instance_of(OpenStruct)
+    end
+    
+    it "should throw an error on wrong uri format" do
+      lambda do
+        Shortly::Clients::Lggd.shorten(@invalid_url)
+      end.should raise_error(Shortly::Errors::InvalidURIError)
+    end
+    
+  end
+  
   describe "Client" do
     
     before(:all) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shortly
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Bagwan Pankaj
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-22 00:00:00 +05:30
+date: 2011-01-23 00:00:00 +05:30
 default_executable: shortly
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,6 +126,7 @@ files:
 - lib/shortly/clients/bitly.rb
 - lib/shortly/clients/googl.rb
 - lib/shortly/clients/isgd.rb
+- lib/shortly/clients/lggd.rb
 - lib/shortly/clients/rubyurl.rb
 - lib/shortly/clients/tinyurl.rb
 - lib/shortly/clients/vgd.rb