jakimowicz-longurl 0.1.1 → 0.1.3

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+doc
+pkg
+rdoc

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009, Fabien Jakimowicz
+Copyright (c) 2009, Fabien Jakimowicz <fabien@jakimowicz.com>
 
 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

data/Manifest

@@ -0,0 +1,13 @@
+bin/longurl
+ChangeLog
+lib/longurl/constants.rb
+lib/longurl/direct.rb
+lib/longurl/exceptions.rb
+lib/longurl/service.rb
+lib/longurl.rb
+LICENSE
+longurl.gemspec
+Manifest
+Rakefile
+README
+TODO

data/{README → README.rdoc}

@@ -1,9 +1,11 @@
-== LongURL
+= LongURL
 
+== DESCRIPTION
 LongURL expands short urls (tinyurl, is.gd, ...) to original ones, using on LongURL.org, internal resolution or direct resolution
 First, expand will try to expand url using longurl.org service.
 Then, it will try to direct follow redirections on the given url and returns final one.
 
+== SYNOPSIS
 === Options
 * <tt>:cache</tt> : cache object to use, must implement [] and []= functions.
 
@@ -37,4 +39,35 @@ Then, it will try to direct follow redirections on the given url and returns fin
 === Exceptions
 * LongURL::InvalidURL : will occurs if given url is nil, empty or invalid
 * LongURL::NetworkError : a network (timeout, host could be reached, ...) error occurs
-* LongURL::UnknownError : an unknown error occurs
+* LongURL::UnknownError : an unknown error occurs
+
+== REQUIREMENTS
+
+* json gem
+
+== INSTALL
+  gem install longurl
+
+== LICENSE
+
+(The MIT License)
+
+Copyright (c) 2009, Fabien Jakimowicz <fabien@jakimowicz.com>
+
+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.

data/Rakefile

@@ -44,4 +44,31 @@ rescue LoadError
   puts "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
 end
 
-task :default => :test
+# Rubyforge publishing
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/longurl/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
+task :default => :test

data/TODO

@@ -0,0 +1,6 @@
+* add a cache to avoid multiple calls for same url
+ * cache could be : hash, memcache, ...
+* handle http errors
+* handle json parsing errors
+* handle ServiceUnknown exception
+* possible infinite loop in Direct::follow_redirections

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
 :major: 0
 :minor: 1
+:patch: 3

data/lib/longurl/constants.rb

@@ -1,6 +1,9 @@
 require "uri"
 
 module LongURL
+  ShortURLMatchRegexp = /http:\/\/[\/\-_.a-z0-9]+/im
+
+  # Urls for longurl
   EndPoint        = URI.parse("http://api.longurl.org/v1/expand")
   ServiceEndPoint = URI.parse("http://api.longurl.org/v1/services")
 end

data/lib/longurl/expander.rb

@@ -66,6 +66,21 @@ module LongURL
       end
     end
     
+    # Expand all url in the given string, if an error occurs while expanding url, then the original url is used
+    def expand_each_in(text)
+      text.gsub(ShortURLMatchRegexp) do |shorturl| 
+        begin
+          expand shorturl
+        rescue  LongURL::InvalidURL,
+                LongURL::NetworkError,
+                LongURL::TooManyRedirections,
+                LongURL::UnknownError,
+                JSON::ParserError
+          shorturl
+        end
+      end
+    end
+    
     # Expand given url using LongURL::Service only. If given url is not a expandable url, it will still be given to Service.
     def expand_with_service_only(url)
       @@service.query url

data/lib/longurl/service.rb

@@ -85,14 +85,28 @@ module LongURL
     
     def handle_response(response)
       parsed = JSON.parse(response.body)
+      parsed = parsed.first if parsed.is_a?(Array)
       if parsed['long_url']
         parsed['long_url']
       elsif parsed['message'] # Error
-        raise LongURL::UnsupportedService if parsed['messages']['message'] == 'Unsupported service.'
+        raise exception_regarding_message(parsed['message'])
       else
         raise LongURL::UnknownError
       end
     end
+    
+    def exception_class_regarding_message(message)
+      case message
+      when 'Unsupported service.'
+        LongURL::UnsupportedService
+      when 'Connection timeout'
+        LongURL::NetworkError
+      when 'Could not expand URL. Please check that you have submitted a valid URL.'
+        LongURL::InvalidURL
+      else
+        LongURL::UnknownError
+      end
+    end
 
   end  
 

data/longurl.gemspec

@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{longurl}
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Fabien Jakimowicz"]
+  s.date = %q{2009-05-26}
+  s.default_executable = %q{longurl}
+  s.description = %q{LongURL expands short urls (tinyurl, is.gd, ...) to original ones, using on LongURL.org, internal resolution or direct resolution}
+  s.email = %q{fabien@jakimowicz.com}
+  s.executables = ["longurl"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "Manifest",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION.yml",
+     "bin/longurl",
+     "lib/longurl.rb",
+     "lib/longurl/constants.rb",
+     "lib/longurl/direct.rb",
+     "lib/longurl/exceptions.rb",
+     "lib/longurl/expand.rb",
+     "lib/longurl/expander.rb",
+     "lib/longurl/service.rb",
+     "lib/longurl/url.rb",
+     "longurl.gemspec",
+     "test/cache_mock.rb",
+     "test/constants.rb",
+     "test/expander_test.rb",
+     "test/service/no_cache_service_test.rb",
+     "test/service/service_cache_test.rb",
+     "test/service/service_test.rb",
+     "test/service/supported_services_test.rb",
+     "test/url_test.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://longurl.rubyforge.org}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{longurl}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{LongURL expands shorten urls (tinyurl, is.gd, ...)}
+  s.test_files = [
+    "test/cache_mock.rb",
+     "test/constants.rb",
+     "test/expander_test.rb",
+     "test/service/no_cache_service_test.rb",
+     "test/service/service_cache_test.rb",
+     "test/service/service_test.rb",
+     "test/service/supported_services_test.rb",
+     "test/url_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+    else
+      s.add_dependency(%q<json>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 0"])
+  end
+end

data/test/constants.rb

@@ -6,5 +6,9 @@ ShortToLong = {
   :is_gd => {
     "http://is.gd/iUKg" => "http://fabien.jakimowicz.com",
     "http://is.gd/iYCo" => "http://www.google.com/search?q=number+of+horns+on+a+unicorn&ie=UTF-8"
+  },
+  :friendfeed => {
+    "http://ff.im/-31OFh" => "http://en.wikipedia.org/wiki/Product_requirements_document",
+    "http://ff.im/-31MWm" => "http://www.infrasystems.com/how-to-write-an-mrd.html"
   }
 }

data/test/expander_test.rb

@@ -0,0 +1,25 @@
+$test_lib_dir = File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift($test_lib_dir)
+
+require "test/unit"
+require "longurl/expander"
+
+class TextExpander < Test::Unit::TestCase
+  def setup
+    @expander = LongURL::Expander.new
+  end
+  
+  def test_expand_each_in_should_expand_friendfeed_urls
+    assert_equal "Product requirements document - Wikipedia, http://en.wikipedia.org/wiki/Product_requirements_document the free encyclopedia",
+      @expander.expand_each_in("Product requirements document - Wikipedia, http://ff.im/-31OFh the free encyclopedia")
+  end
+  
+  def test_expand_each_in_should_not_change_strings_with_no_urls
+    assert_equal "i'm not to be changed !!!", @expander.expand_each_in("i'm not to be changed !!!")
+  end
+  
+  def test_expand_each_in_should_be_able_to_expand_multiple_urls
+    assert_equal "Those websites are great: http://www.flickr.com/photos/jakimowicz & http://www.google.com/profiles/fabien.jakimowicz",
+      @expander.expand_each_in("Those websites are great: http://tinyurl.com/r9cm9p & http://is.gd/Bnxy")
+  end
+end

data/test/service/service_test.rb

@@ -2,7 +2,6 @@ $test_lib_dir = File.join(File.dirname(__FILE__), "..", "lib")
 $:.unshift($test_lib_dir)
 
 require "test/unit"
-require "constants"
 require "longurl/exceptions"
 require "longurl/service"
 

data/test/url_test.rb

@@ -17,9 +17,10 @@ class TestURL < Test::Unit::TestCase
                  "bleh://asfd.com",
                  "ftp://asdf.com",
                  "google.com",
-                 "asdf@toto.com"]
+                 "asdf@toto.com",
+                 "httpd://asdf.com"]
                  
-  GoodURL = "http://www.google.com"
+  GoodURLs = ["http://www.google.com", "https://rubyonrails.org"]
 
   def test_check_should_raise_invalid_url_if_url_is_nil
     assert_raise(LongURL::InvalidURL) { LongURL::URL.check nil }
@@ -38,6 +39,6 @@ class TestURL < Test::Unit::TestCase
   end
   
   def test_check_should_returns_parsed_url_on_success
-    assert_equal URI.parse(GoodURL), LongURL::URL.check(GoodURL)
+    GoodURLs.each {|good_url| assert_equal URI.parse(good_url), LongURL::URL.check(good_url)}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jakimowicz-longurl
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Fabien Jakimowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: longurl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +30,14 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README
+- README.rdoc
 files: 
+- .gitignore
 - LICENSE
+- Manifest
+- README.rdoc
 - Rakefile
+- TODO
 - VERSION.yml
 - bin/longurl
 - lib/longurl.rb
@@ -44,14 +48,15 @@ files:
 - lib/longurl/expander.rb
 - lib/longurl/service.rb
 - lib/longurl/url.rb
+- longurl.gemspec
 - test/cache_mock.rb
 - test/constants.rb
+- test/expander_test.rb
 - test/service/no_cache_service_test.rb
 - test/service/service_cache_test.rb
 - test/service/service_test.rb
 - test/service/supported_services_test.rb
 - test/url_test.rb
-- README
 has_rdoc: true
 homepage: http://longurl.rubyforge.org
 post_install_message: 
@@ -81,6 +86,7 @@ summary: LongURL expands shorten urls (tinyurl, is.gd, ...)
 test_files: 
 - test/cache_mock.rb
 - test/constants.rb
+- test/expander_test.rb
 - test/service/no_cache_service_test.rb
 - test/service/service_cache_test.rb
 - test/service/service_test.rb