longurl 0.1.5 → 0.1.6

data/Rakefile

@@ -19,7 +19,7 @@ end
 
 desc "build rdoc using hanna theme"
 task :rdoc do
-  `rm -rf rdoc && rdoc -o rdoc --inline-source --format=html -T hanna README* lib/**/*.rb`
+  `rm -rf rdoc && rdoc --op=rdoc --title=LongURL --inline-source --format=darkfish LICENSE README* lib/**/*.rb`
 end
 
 require 'rake/testtask'

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 6
 :major: 0
 :minor: 1

data/lib/longurl/expander.rb

@@ -19,7 +19,7 @@ module LongURL
   #   e.expand("http://www.linuxfr.org")                              # => "http://www.linuxfr.org"
   #
   #   # not expandable urls, calling longurl.org only
-  #   e.expand_with_service_only("http://www.linuxfr.org")            # => "http://www.linuxfr.org/pub"
+  #   e.expand("http://www.linuxfr.org", :direct_resolution => true)  # => "http://www.linuxfr.org/pub"
   #
   #   # not expandable urls, direct resolution only
   #   e.direct_resolution("http://www.linuxfr.org")                   # => "http://www.linuxfr.org/pub"
@@ -48,11 +48,12 @@ module LongURL
       @@service = Service.new(:cache => @@cache)
     end
     
-    # Expand given url using LongURL::Service class first and then try a direct_resolution.
-    def expand(url)
+    # Expand given url using LongURL::Service class first and then try a direct_resolution,
+    # unless :direct_resolution is set to false in options hash.
+    def expand(url, options = {})
       @@service.query_supported_service_only url
     rescue UnsupportedService
-      direct_resolution url
+      options[:direct_resolution] == false ? raise(UnsupportedService) : direct_resolution(url)
     end
     
     # Try to directly resolve url using LongURL::Direct to get final redirection.
@@ -66,24 +67,22 @@ 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)
+    # Expand all url in the given string, if an error occurs while expanding url, then the original url is used.
+    # <tt>options</tt> accepts same options as expand, see expand for more details.
+    def expand_each_in(text, options = {})
       text.gsub(ShortURLMatchRegexp) do |shorturl| 
         begin
-          expand shorturl
-        rescue  LongURL::InvalidURL,
-                LongURL::NetworkError,
-                LongURL::TooManyRedirections,
-                LongURL::UnknownError,
+          expand shorturl, options
+        rescue  InvalidURL,
+                NetworkError,
+                TooManyRedirections,
+                UnknownError,
+                UnsupportedService,
                 JSON::ParserError
           shorturl
         end
       end
-    end
+    end # expand_each_in
     
-    # 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
-    end
-  end
-end
+  end # Expander
+end # LongURL

data/longurl.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{longurl}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabien Jakimowicz"]
-  s.date = %q{2009-06-13}
+  s.date = %q{2009-07-20}
   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}

data/test/expander_test.rb

@@ -22,4 +22,34 @@ class TextExpander < Test::Unit::TestCase
     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
+  
+  def test_expand_each_in_should_not_replace_unexpandable_urls_if_direct_resolution_is_false
+    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://www.flickr.com/photos/jakimowicz & http://is.gd/Bnxy",
+                                :direct_resolution => false )
+  end
+  
+  def test_expand_should_raise_UnsupportedService_if_service_is_not_supported_and_direct_resolution_disabled
+    assert_raise(LongURL::UnsupportedService) do
+      @expander.expand("http://www.google.com", :direct_resolution => false)
+    end
+  end
+
+  def test_expand_should_use_direct_resolution_by_default
+    assert_nothing_raised do
+      assert_equal "http://fabien.jakimowicz.com", @expander.expand("http://fabien.jakimowicz.com")
+    end
+  end
+  
+  def test_expand_should_expand_supported_services
+    assert_equal "http://www.flickr.com/photos/jakimowicz", @expander.expand('http://tinyurl.com/r9cm9p')
+  end
+  
+  def test_expand_should_handle_direct_resolution_if_asked
+    assert_equal "http://fabien.jakimowicz.com", @expander.expand("http://fabien.jakimowicz.com", :direct_resolution => true)
+  end
+  
+  def test_expand_with_should_continue_to_resolve_urls_even_if_direct_resolution_is_true
+    assert_equal "http://www.flickr.com/photos/jakimowicz", @expander.expand('http://tinyurl.com/r9cm9p', :direct_resolution => true)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: longurl
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Fabien Jakimowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 +02:00
+date: 2009-10-30 00:00:00 +01:00
 default_executable: longurl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,8 @@ files:
 - test/url_test.rb
 has_rdoc: true
 homepage: http://longurl.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -79,9 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: longurl
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: LongURL expands shorten urls (tinyurl, is.gd, ...)
 test_files: 
 - test/cache_mock.rb