shortly 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1da9df6df9580e9a5ac2858d19f0c36652f1d8
-  data.tar.gz: 2deb47bb0e8ef4655ea042433bb1cb5ed27a71f9
+  metadata.gz: 2e60f051f3f6369b07920ec839acc557f1fd8ace
+  data.tar.gz: 4c17b8dfcb2452cfa723c519a5acd9cef5779d73
 SHA512:
-  metadata.gz: b6dd8c828081cc9a7424426caf6e1f63a83d9a31a9d0515e24fa2b9191e090dd772a5fb6be257232c8fec932aa87c70bd07488456b9f6837757fe848d854404c
-  data.tar.gz: e06e14199445b72d8d5384aa43c648ea7c2153794c71bac9fd5641b7f8f41aec67165a17c96c4df3fe82597f5031e9c24bc0913f2adbbe9223c827b19a649cdd
+  metadata.gz: 4e856b9c0c725b1e992b8440103137242ef1fe2aef54c6fa3832cbba3a75500722810340092ef1a7ae6f9eb9ba08d57a0ab71607d074215d2cc1812b92f6c5d2
+  data.tar.gz: c7765e132eecf30d6aec1919a74635fde0d24e6fca13b6d1b0dd1058fd5dfac9cc2208986c2cf812700efa2bbe5c534d70d13188d452bef9a160e7ab23569267

data/README.markdown

@@ -1,13 +1,17 @@
 # Shortly
 
+[![Gem Version](https://badge.fury.io/rb/shortly.png)](http://badge.fury.io/rb/shortly)
+
+[![Build Status](https://travis-ci.org/bagwanpankaj/shortly.svg?branch=master)](https://travis-ci.org/bagwanpankaj/shortly)
+
 <a style="float:right" href='https://pledgie.com/campaigns/24609'><img alt='Click here to lend your support to: Shortly and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/24609.png?skin_name=chrome' border='0' ></a><div style="clear:both"></div>
-    
-     ____  _                _   _       
-    / ___|| |__   ___  _ __| |_| |_   _ 
+
+     ____  _                _   _
+    / ___|| |__   ___  _ __| |_| |_   _
     \___ \| '_ \ / _ \| '__| __| | | | |
      ___) | | | | (_) | |  | |_| | |_| |
     |____/|_| |_|\___/|_|   \__|_|\__, |
-                                  |___/ 
+                                  |___/
 
 
 A Ruby wrapper for various url shortener services
@@ -123,9 +127,9 @@ Copyright (c) 2010 Bagwan Pankaj: http://bagwanpankaj.com, released under the MI
 * Example series
 
 ## Contributing to shortly
- 
+
 * Fork, code, and then send me a pull request.
 
 ## Copyright
 
-Copyright (c) 2010-2014 [Bagwan Pankaj]. See LICENSE.txt for further details.
+Copyright (c) 2010-2014 [Bagwan Pankaj]. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/shortly.rb

@@ -18,17 +18,17 @@ require 'shortly/clients/snim'
 require 'shortly/clients/bitdo'
 
 module Shortly
-  
+
   #gem version
   def self.version #:nodoc
     File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
   end
-  
+
   #returns active services
   def self.active_services
     Client.registered
   end
-  
+
   Helper::MonkeyPatches.activate!
-  
-end
+
+end

data/lib/shortly/client.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -20,48 +20,48 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Shortly
-  
+
   class Client
-    
+
     include HTTParty
     include Shortly::Errors
     include Shortly::Helper
-    
+
     base_uri ''
-    
+
     @@registered = []
-    
+
     def self.method_missing(method_sym, *params) #:nodoc
       raise MethodNotAvailableError.new("Sorry, #{method_sym} method is not implemented/available for this service.")
     end
-    
+
     protected
-    
+
     def self.register! #:nodoc
       @@registered = [] unless @@registered
       @@registered << self.name.to_sym
     end
-    
+
     def self.registered #:nodoc
       @@registered
     end
-    
+
     def self.validate_uri!(url)
       raise InvalidURIError.new("provided URI is invalid.") unless valid_uri?(url)
     end
-    
+
     #returns a uri is valid or not
     def self.valid_uri?(url)
       !!(url =~ URI::regexp)
     end
-    
+
     def self.post_params(options = {})
       {:body => options}
     end
-    
+
     def self.get_params(options = {})
       {:query => options}
     end
-    
+
   end
-end
+end

data/lib/shortly/errors.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -20,21 +20,21 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Shortly
-  
+
   module Errors
-    
+
     class ShortlyError < StandardError
-      
+
       def initialize(msg)
         super("ShortlyError - #{msg}")
       end
-      
+
     end
-    
+
     class ShortlyArgumentError < ArgumentError;       end
     class InvalidURIError < ShortlyError;             end
     class NotAuthorizedError < ShortlyArgumentError;  end
     class MethodNotAvailableError < ShortlyError;     end
   end
-  
-end
+
+end

data/lib/shortly/helper.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -20,44 +20,44 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Shortly
-  
+
   module Helper
-    
+
     module MonkeyPatches
-      
+
       def self.activate!
         Hash.send(:include, MonkeyHash)
         Object.send(:include, MonkeyObject)
       end
-      
+
       module MonkeyHash
-      
+
         def authenticable?(*args)
           args.all?{|k| self.key?(k)} && !self.values.any?(&:blank?)
         end
-        
+
         def to_params
           collect do |key, value|
             "#{key}=#{value}"
           end.sort * '&'
         end
-      
+
       end
-      
+
       module MonkeyObject
-        
+
         def blank?
           instance_of?(Array) ? empty? : nil?
         end
-        
+
         def present?
           !blank?
         end
-        
+
       end
-      
+
     end
-    
+
   end
-  
-end
+
+end

data/spec/shortly_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Shortly" do
-  
+
   #tests for client googl
   describe "Googl" do
     before(:all) do
@@ -11,50 +11,50 @@ describe "Shortly" do
       @googl = Shortly::Clients::Googl
       @uri = @googl.base_uri + @googl.send(:relative_path)
     end
-    
-    it "should get a short url from googl(provided valid url)" do
+
+    it ".shorten" do
       mock_request_for(@uri, :method => :post, :fixture => "googl_shorten")
       res = @googl.shorten(@long_url)
-      res.shortUrl.should_not be_empty
-      res.shortUrl.should == @short_url
+      expect(res.shortUrl).not_to be_empty
+      expect(res.shortUrl).to eq @short_url
     end
-    
-    it "result of shorten should be an instance of OpenStruct" do
+
+    it ".shorten should respond_with OpenStruct" do
       res = @googl.shorten(@long_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should get a long url back for given valid short url" do
+
+    it ".expand" do
       mock_request_for(@uri + "?shortUrl=#{CGI.escape(@short_url)}", :method => :get, :fixture => "googl_expand")
       res = @googl.expand(@short_url)
-      res.longUrl.should_not be_empty
-      res.longUrl.should == @long_url
+      expect(res.longUrl).not_to be_empty
+      expect(res.longUrl).to eq @long_url
     end
-    
-    it "result of expand should be an instance of OpenStruct" do
+
+    it ".expand should respond_with OpenStruct" do
       res = @googl.expand(@short_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should give analytics for given short url" do
+
+    it ".analytics" do
       mock_request_for(@uri + "?shortUrl=#{CGI.escape(@short_url)}&projection=FULL",
         :fixture => "googl_analytics")
-      
+
       res = @googl.analytics(@short_url)
-      res.analytics.should_not be_empty
-      res.analytics.should be_an_instance_of(Hash)
-      res.analytics["week"].should be_an_instance_of(Hash)
-      res.analytics["day"].should be_an_instance_of(Hash)
-    end
-    
-    it "should throw an error on wrong uri format" do
-      lambda do
+      expect(res.analytics).not_to be_empty
+      expect(res.analytics).to be_an_instance_of(Hash)
+      expect(res.analytics["week"]).to be_an_instance_of(Hash)
+      expect(res.analytics["day"]).to be_an_instance_of(Hash)
+    end
+
+    it "InvalidURIError" do
+      expect(lambda do
         @googl.shorten(@invalid_url)
-      end.should raise_error(Shortly::Errors::InvalidURIError)
+      end).to raise_error(Shortly::Errors::InvalidURIError)
     end
-    
+
   end
-  
+
   #tests for client isgd
   describe "Isgd" do
     before(:all) do
@@ -64,73 +64,73 @@ describe "Shortly" do
       @invalid_url = "bagwanpankaj.com"
       @uri = @isgd.base_uri
     end
-    
-    it "should get a short url from Is.gd(provided valid url)" do
+
+    it ".shorten" do
       mock_request_for(@uri + "/create.php?url=#{CGI.escape(@long_url)}&format=json",
         :fixture => "isgd_shorten")
-      
+
       res = @isgd.shorten(@long_url)
-      res.shorturl.should_not be_empty
-      res.shorturl.should == @shorturl
+      expect(res.shorturl).not_to be_empty
+      expect(res.shorturl).to eq @shorturl
     end
-    
-    it "result should be an instance of OpenStruct" do
+
+    it ".shorten should respond_with OpenStruct" do
       res = @isgd.shorten(@long_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should throw an error on wrong uri format" do
-      lambda do
+
+    it "InvalidURIError" do
+      expect(lambda do
         @isgd.shorten(@invalid_url)
-      end.should raise_error(Shortly::Errors::InvalidURIError)
+      end).to raise_error(Shortly::Errors::InvalidURIError)
     end
-    
-    it "should raise MethodNotAvailableError if method is not implemented for" do
-      lambda do
+
+    it "MethodNotAvailableError" do
+      expect(lambda do
         @isgd.expand(@long_url)
-      end.should raise_error(Shortly::Errors::MethodNotAvailableError)
+      end).to raise_error(Shortly::Errors::MethodNotAvailableError)
     end
   end
-  
+
   #tests for client vgd
-   describe "Vgd" do
-     before(:all) do
-       @vgd = Shortly::Clients::Vgd
-       @long_url = "http://bagwanpankaj.com"
-       @invalid_url = "bagwanpankaj.com"
-       @uri = @vgd.base_uri
-     end
-  
-     it "should get a short url from v.gd(provided valid url)" do
-       mock_request_for(@uri + "/create.php?url=#{CGI.escape(@long_url)}&format=json", 
-        :fixture => "vgd_shorten")
-       
-       res = @vgd.shorten(@long_url)
-       res.shorturl.should_not be_empty
-       res.shorturl.should == @vgd.shorten(@long_url).shorturl
-     end
-  
-     it "result should be an instance of OpenStruct" do
-       res = @vgd.shorten(@long_url)
-       res.should be_an_instance_of(OpenStruct)
-     end
-  
-     it "should throw an error on wrong uri format" do
-       lambda do
-         @vgd.shorten(@invalid_url)
-       end.should raise_error(Shortly::Errors::InvalidURIError)
-     end
-  
-     it "should raise MethodNotAvailableError if method is not implemented for" do
-       lambda do
-         @vgd.expand(@long_url)
-       end.should raise_error(Shortly::Errors::MethodNotAvailableError)
-     end
-   end
-  
+  describe "Vgd" do
+    before(:all) do
+      @vgd = Shortly::Clients::Vgd
+      @long_url = "http://bagwanpankaj.com"
+      @invalid_url = "bagwanpankaj.com"
+      @uri = @vgd.base_uri
+    end
+
+    it ".shorten" do
+      mock_request_for(@uri + "/create.php?url=#{CGI.escape(@long_url)}&format=json",
+      :fixture => "vgd_shorten")
+
+      res = @vgd.shorten(@long_url)
+      expect(res.shorturl).not_to be_empty
+      expect(res.shorturl).to eq @vgd.shorten(@long_url).shorturl
+    end
+
+    it ".shorten should respond_with OpenStruct" do
+      res = @vgd.shorten(@long_url)
+      expect(res).to be_an_instance_of(OpenStruct)
+    end
+
+    it "InvalidURIError" do
+      expect(lambda do
+              @vgd.shorten(@invalid_url)
+            end).to raise_error(Shortly::Errors::InvalidURIError)
+    end
+
+    it "MethodNotAvailableError" do
+      expect(lambda do
+              @vgd.expand(@long_url)
+            end).to raise_error(Shortly::Errors::MethodNotAvailableError)
+    end
+  end
+
   #tests for client bitly
   describe "Bitly" do
-    
+
     before(:all) do
       @bitly = Shortly::Clients::Bitly
       @bitly.login = "TEST_LOGIN"
@@ -140,40 +140,40 @@ describe "Shortly" do
       @short_url = "http://bit.ly/dUdiIJ"
       @uri = @bitly.base_uri + "/v3"
     end
-    
-    it "should get a short url from bitly(provided valid url)" do
-      mock_request_for(@uri + "/shorten?longUrl=#{CGI.escape(@long_url)}&format=json&login=#{@bitly.login}&apiKey=#{@bitly.apiKey}", 
+
+    it ".shorten" do
+      mock_request_for(@uri + "/shorten?longUrl=#{CGI.escape(@long_url)}&format=json&login=#{@bitly.login}&apiKey=#{@bitly.apiKey}",
        :fixture => "bitly_shorten")
-       
+
       res = @bitly.shorten(@long_url)
-      res.url.should_not be_empty
-      res.url.should == @short_url
+      expect(res.url).not_to be_empty
+      expect(res.url).to eq @short_url
     end
-    
-    it "result should be an instance of OpenStruct" do
+
+    it ".shorten should respond_with OpenStruct" do
       res = @bitly.shorten(@long_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should throw an error on wrong uri format" do
-      lambda do
-        @bitly.shorten(@invalid_url)
-      end.should raise_error(Shortly::Errors::InvalidURIError)
+
+    it "InvalidURIError" do
+      expect(lambda do
+              @bitly.shorten(@invalid_url)
+            end).to raise_error(Shortly::Errors::InvalidURIError)
     end
-    
-    it "should expand a given short url" do
-      mock_request_for(@uri + "/expand?shortUrl=#{CGI.escape(@short_url)}&format=json&login=#{@bitly.login}&apiKey=#{@bitly.apiKey}", 
+
+    it ".expand" do
+      mock_request_for(@uri + "/expand?shortUrl=#{CGI.escape(@short_url)}&format=json&login=#{@bitly.login}&apiKey=#{@bitly.apiKey}",
        :fixture => "bitly_expand")
-       
+
       res = @bitly.expand("http://bit.ly/dUdiIJ")
-      res.long_url.should == @long_url
+      expect(res.long_url).to eq @long_url
     end
-    
+
   end
-  
+
   #tests for client jmp
   describe "Jmp" do
-    
+
     before(:all) do
       @jmp = Shortly::Clients::Jmp
       @jmp.login = "TEST_LOGIN"
@@ -183,37 +183,37 @@ describe "Shortly" do
       @short_url = "http://j.mp/dUdiIJ"
       @uri = @jmp.base_uri + '/v3'
     end
-    
-    it "should get a short url from jmp(provided valid url)" do
-      mock_request_for(@uri + "/shorten?longUrl=#{CGI.escape(@long_url)}&format=json&login=#{@jmp.login}&apiKey=#{@jmp.apiKey}", 
+
+    it ".shorten" do
+      mock_request_for(@uri + "/shorten?longUrl=#{CGI.escape(@long_url)}&format=json&login=#{@jmp.login}&apiKey=#{@jmp.apiKey}",
        :fixture => "jmp_shorten")
-       
+
       res = @jmp.shorten(@long_url)
-      res.url.should_not be_empty
-      res.url.should == @short_url
+      expect(res.url).not_to be_empty
+      expect(res.url).to eq @short_url
     end
-    
-    it "result should be an instance of OpenStruct" do
+
+    it ".shorten should respond_with OpenStruct" do
       res = @jmp.shorten(@long_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should throw an error on wrong uri format" do
-      lambda do
-        @jmp.shorten(@invalid_url)
-      end.should raise_error(Shortly::Errors::InvalidURIError)
+
+    it "InvalidURIError" do
+      expect(lambda do
+              @jmp.shorten(@invalid_url)
+            end).to raise_error(Shortly::Errors::InvalidURIError)
     end
-    
-    it "should expand a given short url" do
-      mock_request_for(@uri + "/expand?shortUrl=#{CGI.escape(@short_url)}&format=json&login=#{@jmp.login}&apiKey=#{@jmp.apiKey}", 
+
+    it ".expand" do
+      mock_request_for(@uri + "/expand?shortUrl=#{CGI.escape(@short_url)}&format=json&login=#{@jmp.login}&apiKey=#{@jmp.apiKey}",
        :fixture => "jmp_expand")
-       
+
       res = @jmp.expand(@short_url)
-      res.long_url.should == @long_url
+      expect(res.long_url).to eq @long_url
     end
-    
+
   end
-  
+
   #tests for client tinyurl
   describe "TinyUrl" do
     before(:all) do
@@ -221,37 +221,37 @@ describe "Shortly" do
       @invalid_url = "bagwanpankaj.com"
       @uri = Shortly::Clients::Tinyurl.base_uri
     end
-    
-    it "should get a short url from TinyUrl(provided valid url)" do
+
+    it ".shorten" do
       mock_request_for(@uri + "/api-create.php", :method => :post,
        :fixture => "tinyurl_shorten", :content_type => "text/plain")
-       
+
       res = Shortly::Clients::Tinyurl.shorten(@long_url)
-      res.shorturl.should_not be_empty
-      res.shorturl.should == "http://tinyurl.com/6jt3pjr"
+      expect(res.shorturl).not_to be_empty
+      expect(res.shorturl).to eq "http://tinyurl.com/6jt3pjr"
     end
-    
-    it "result should be an instance of OpenStruct" do
+
+    it ".shorten should respond_with OpenStruct" do
       res = Shortly::Clients::Tinyurl.shorten(@long_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should throw an error on wrong uri format" do
-      lambda do
-        Shortly::Clients::Tinyurl.shorten(@invalid_url)
-      end.should raise_error(Shortly::Errors::InvalidURIError)
+
+    it "InvalidURIError" do
+      expect(lambda do
+              Shortly::Clients::Tinyurl.shorten(@invalid_url)
+            end).to raise_error(Shortly::Errors::InvalidURIError)
     end
-    
-    it "should raise MethodNotAvailableError if method is not implemented for" do
-      lambda do
-        Shortly::Clients::Tinyurl.expand(@long_url)
-      end.should raise_error(Shortly::Errors::MethodNotAvailableError)
+
+    it "should raise MethodNotAvailableError" do
+      expect(lambda do
+              Shortly::Clients::Tinyurl.expand(@long_url)
+            end).to raise_error(Shortly::Errors::MethodNotAvailableError)
     end
   end
-  
+
   #tests for client ShortSwitch
   describe "ShortSwitch" do
-    
+
     before(:all) do
       @ss = Shortly::Clients::ShortSwitch
       Shortly::Clients::ShortSwitch.apiKey = "TESTKEY"
@@ -261,28 +261,28 @@ describe "Shortly" do
       @uri = @ss.base_uri
     end
 
-    it "should get a short url from ShortSwitch(provided valid url)" do
+    it ".shorten" do
       mock_request_for(@uri + "/shorten?longUrl=#{CGI.escape(@long_url)}&format=json&apiKey=TESTKEY",
        :fixture => "shortswitch_shorten")
-    
+
       res = Shortly::Clients::ShortSwitch.shorten(@long_url)
-      res.shortUrl.should_not be_empty
-      res.shortUrl.should == @short_url
+      expect(res.shortUrl).not_to be_empty
+      expect(res.shortUrl).to eq @short_url
     end
-    
-    it "result should be an instance of OpenStruct" do
+
+    it ".shorten should respond_with OpenStruct" do
       res = Shortly::Clients::ShortSwitch.shorten(@long_url)
-      res.should be_an_instance_of(OpenStruct)
+      expect(res).to be_an_instance_of(OpenStruct)
     end
-    
-    it "should throw an error on wrong uri format" do
-      lambda do
-        Shortly::Clients::ShortSwitch.shorten(@invalid_url)
-      end.should raise_error(Shortly::Errors::InvalidURIError)
+
+    it "InvalidURIError" do
+      expect(lambda do
+              Shortly::Clients::ShortSwitch.shorten(@invalid_url)
+            end).to raise_error(Shortly::Errors::InvalidURIError)
     end
-    
+
   end
-  
+
   #tests for client sn.im
   describe "Snim" do
     before(:all) do
@@ -294,96 +294,96 @@ describe "Shortly" do
       @short_url = "http://sn.im/1wvkof"
       @uri = @snim.base_uri
     end
-    
-    it "should get a short url from Snim(provided valid url)" do
+
+    it ".shorten" do
       mock_request_for(@uri + "/getsnip", :method => :post,
        :fixture => "snim_shorten")
-    
+
       res = @snim.shorten(@long_url)
-      res.shortUrl.should_not be_empty
-      res.shortUrl.should == @short_url
+      expect(res.shortUrl).not_to be_empty
+      expect(res.shortUrl).to eq @short_url
     end
-    
-    it "should get analytics from Snim(provided valid id)" do
+
+    it ".analytics" do
       mock_request_for(@uri + "/getsnipdetails", :method => :post,
        :fixture => "snim_analytics")
-    
+
       res = @snim.analytics("1wvkof")
-      res.url.should_not be_empty
-      res.clicks.should_not be_nil
-      res.clicks.should == 10000
+      expect(res.url).not_to be_empty
+      expect(res.clicks).not_to be_nil
+      expect(res.clicks).to eq 10000
     end
-    
-    it "should get long url from Snim(provided valid shorturl)" do
+
+    it ".expand" do
       mock_request_for(@uri + "/getsnipdetails", :method => :post,
        :fixture => "snim_analytics")
-    
+
       res = @snim.expand(@short_url)
-      res.url.should_not be_empty
-      res.url.should == @long_url
+      expect(res.url).not_to be_empty
+      expect(res.url).to eq @long_url
     end
   end
-  
+
   describe "Client" do
-    
+
     before(:all) do
       @valid_uri = "http://bagwanpankaj.com"
-      @invalid_uri = "someinveliduri" 
+      @invalid_uri = "someinveliduri"
     end
-    
-    it "should include HTTParty" do
-      Shortly::Client.included_modules.should include HTTParty
+
+    it "includes HTTParty" do
+      expect(Shortly::Client.included_modules).to include HTTParty
     end
-    
-    it "should include Shortly::Errors" do
-      Shortly::Client.included_modules.should include Shortly::Errors
+
+    it "includes Shortly::Errors" do
+      expect(Shortly::Client.included_modules).to include Shortly::Errors
     end
-    
-    it "should include Shortly::Helper" do
-      Shortly::Client.included_modules.should include Shortly::Helper
+
+    it "includes Shortly::Helper" do
+      expect(Shortly::Client.included_modules).to include Shortly::Helper
     end
-    
-    it "should respond to resitered class variable" do
-      Shortly::Client.class_variables.should include :"@@registered"
+
+    it ":@@registered" do
+      expect(Shortly::Client.class_variables).to include :"@@registered"
     end
-    
-    it "should respond to register/valid_uri? and registered methods" do
-      Shortly::Client.should respond_to :register!
-      Shortly::Client.should respond_to :registered
-      Shortly::Client.should respond_to :valid_uri?
+
+    it ".register/.valid_uri?/.registered" do
+      expect(Shortly::Client).to respond_to :register!
+      expect(Shortly::Client).to respond_to :registered
+      expect(Shortly::Client).to respond_to :valid_uri?
     end
-    
-    it "should test a uri is valid or not" do
-      Shortly::Client.valid_uri?(@valid_uri).should be true
-      Shortly::Client.valid_uri?(@invalid_uri).should_not be true
+
+    it ".valid_uri" do
+      expect(Shortly::Client.valid_uri?(@valid_uri)).to be true
+      expect(Shortly::Client.valid_uri?(@invalid_uri)).to be false
     end
-    
+
   end
-  
+
   describe "Misc" do
-    
+
     describe "Errors" do
-      
-      it "should have various error classes implemented" do
-        Shortly::Errors::ShortlyError.superclass.name.should == "StandardError"
-        Shortly::Errors::ShortlyArgumentError.superclass.name.should == "ArgumentError"
-        Shortly::Errors::InvalidURIError.superclass.name.should == "Shortly::Errors::ShortlyError"
-        Shortly::Errors::NotAuthorizedError.superclass.name.should == "Shortly::Errors::ShortlyArgumentError"
-        Shortly::Errors::MethodNotAvailableError.superclass.name.should == "Shortly::Errors::ShortlyError"
+
+      it "CustomErrors" do
+        expect(Shortly::Errors::ShortlyError.superclass.name).to eq "StandardError"
+        expect(Shortly::Errors::ShortlyArgumentError.superclass.name).to eq "ArgumentError"
+        expect(Shortly::Errors::InvalidURIError.superclass.name).to  eq "Shortly::Errors::ShortlyError"
+        expect(Shortly::Errors::NotAuthorizedError.superclass.name).to eq "Shortly::Errors::ShortlyArgumentError"
+        expect(Shortly::Errors::MethodNotAvailableError.superclass.name).to eq "Shortly::Errors::ShortlyError"
       end
-      
+
     end
-    
+
     describe "Shortly" do
-      it "should return current version of gem" do
-        Shortly.version.should == File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+      it ".version" do
+        expect(Shortly.version).to eq File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
       end
-      
-      it "should return all registered services" do
-        Shortly.active_services.should == Shortly::Client.registered
+
+      it ".active_services" do
+        expect(Shortly.active_services).to eq Shortly::Client.registered
       end
-      
+
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shortly
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Bagwan Pankaj
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 3
 summary: Url Shortner Services Ruby Wrapper
@@ -95,3 +95,4 @@ test_files:
 - spec/shortly_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb_stub.rb
+has_rdoc: