oso 1.0.1 → 2.0.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 2.0.0 / 2011-03-30
+
+* Return the unshortened URL if Oso#shorten encounters a problem.
+* Add Oso#shorten!, which raises if it encounters a problem.
+
 === 1.0.1 / 2011-03-28
 
 * Support Bundler for development/deployment.

data/Gemfile

@@ -1,9 +1,8 @@
 source :rubygems
 
-gem "new_base_60",     "1.0.3"
-gem "rack",            "1.2.1"
+gem "new_base_60",     "1.0.4"
 gem "redis-namespace", "0.10.0"
-gem "sinatra",         "1.1.2"
+gem "sinatra",         "1.2.1"
 
 group :development do
   gem "heroku"
@@ -13,7 +12,7 @@ group :development do
 end
 
 group :test do
-  gem "fakeweb",  "1.3.0"
-  gem "minitest", "2.0.2"
-  gem "mocha",    "0.9.12"
+  gem "fakeweb"
+  gem "minitest"
+  gem "mocha"
 end

data/Gemfile.lock

@@ -19,31 +19,30 @@ GEM
     mime-types (1.16)
     minitest (2.0.2)
     mocha (0.9.12)
-    new_base_60 (1.0.3)
-    rack (1.2.1)
+    new_base_60 (1.0.4)
+    rack (1.2.2)
     rake (0.8.7)
     redis (2.1.1)
     redis-namespace (0.10.0)
       redis (< 3.0.0)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    sinatra (1.1.2)
+    sinatra (1.2.1)
       rack (~> 1.1)
-      tilt (~> 1.2)
+      tilt (>= 1.2.2, < 2.0)
     tilt (1.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fakeweb (= 1.3.0)
+  fakeweb
   heroku
   hoe
   hoe-doofus
   hoe-git
-  minitest (= 2.0.2)
-  mocha (= 0.9.12)
-  new_base_60 (= 1.0.3)
-  rack (= 1.2.1)
+  minitest
+  mocha
+  new_base_60 (= 1.0.4)
   redis-namespace (= 0.10.0)
-  sinatra (= 1.1.2)
+  sinatra (= 1.2.1)

data/README.rdoc

@@ -46,6 +46,10 @@ If you install the <tt>oso</tt> RubyGem:
     Oso.shorten "github.com"              # => "http://oso.local/Acf"
     Oso.shorten "github.com", :life => 30 # => "http://oso.local/Ad0"
 
+If <tt>Oso.shorten</tt> doesn't receive a response within one second
+it returns the original, unshortened URL. To raise an error, call
+<tt>Oso.shorten!</tt> instead.
+
 Set the <tt>OSO_URL</tt> environment variable to control where the
 client looks for the server, or see the RDocs for information on
 creating multiple instances.

data/lib/oso.rb

@@ -13,7 +13,7 @@ class Oso
 
   # Duh.
 
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 
   # :nodoc:
 
@@ -30,6 +30,12 @@ class Oso
     instance.shorten(*args)
   end
 
+  # See #shorten! for more information.
+
+  def self.shorten! *args
+    instance.shorten!(*args)
+  end
+  
   # A URI. Where does the Oso server live? If unspecified during
   # initialization it'll default to the contents of the
   # <tt>OSO_URL</tt> environment variable. If that's unset, it's
@@ -54,10 +60,10 @@ class Oso
   # the URL can be hit before it's deactivated. Pass a <tt>:name</tt>
   # option to explicitly set the shortened URL.
   #
-  # +shorten+ will raise an Oso::Error if network or server
+  # +shorten!+ will raise an Oso::Error if network or server
   # conditions keep +url+ from being shortened in one second.
-
-  def shorten url, options = {}
+  
+  def shorten! url, options = {}
     params = options.merge :url => url
 
     params[:life]  &&= params[:life].to_i
@@ -82,4 +88,11 @@ class Oso
       end
     end
   end
+
+  # Create a short URL like #shorten!, but return the original URL if
+  # an error is raised.
+
+  def shorten url, options = {}
+    shorten! url, options rescue url
+  end
 end

data/test/test_oso.rb

@@ -32,6 +32,15 @@ class TestOso < MiniTest::Unit::TestCase
     assert_equal "bar", Oso.shorten("foo")
   end
 
+  def test_shorten!
+    FakeWeb.register_uri :post, "http://example.org/",
+      :body => "http://example.org/1", :status => 201
+
+    oso = Oso.new "example.org"
+
+    assert_equal "http://example.org/1", oso.shorten!("whatever")
+  end
+
   def test_shorten
     FakeWeb.register_uri :post, "http://example.org/",
       :body => "http://example.org/1", :status => 201
@@ -42,13 +51,22 @@ class TestOso < MiniTest::Unit::TestCase
   end
 
   def test_shorten_bad
+    FakeWeb.register_uri :post, "http://example.org/",
+      :body => "BAD!", :status => 500
+
+    oso = Oso.new "example.org"
+
+    assert_equal "whatever", oso.shorten("whatever")
+  end
+
+  def test_shorten_bang_bad
     FakeWeb.register_uri :post, "http://example.org/",
       :body => "No luck.", :status => 404
 
     oso = Oso.new "example.org"
 
     assert_raises Oso::Error do
-      oso.shorten "blah"
+      oso.shorten! "blah"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oso
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
-  - 1
+  - 2
   - 0
-  - 1
-  version: 1.0.1
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Audiosocket
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -05:00
+date: 2011-03-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency