oso 1.0.0 → 1.0.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm use --create ree-1.8.7-2011.01@audiosocket-oso

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 1.0.1 / 2011-03-28
+
+* Support Bundler for development/deployment.
+* Support Ruby 1.8.7.
+
 === 1.0.0 / 2011-02-15
 
 * Birthday!

data/Gemfile

@@ -0,0 +1,19 @@
+source :rubygems
+
+gem "new_base_60",     "1.0.3"
+gem "rack",            "1.2.1"
+gem "redis-namespace", "0.10.0"
+gem "sinatra",         "1.1.2"
+
+group :development do
+  gem "heroku"
+  gem "hoe"
+  gem "hoe-doofus"
+  gem "hoe-git"
+end
+
+group :test do
+  gem "fakeweb",  "1.3.0"
+  gem "minitest", "2.0.2"
+  gem "mocha",    "0.9.12"
+end

data/Gemfile.lock

@@ -0,0 +1,49 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.5)
+    configuration (1.2.0)
+    fakeweb (1.3.0)
+    heroku (1.19.1)
+      activesupport (>= 2.1.0)
+      launchy (~> 0.3.2)
+      rest-client (>= 1.4.0, < 1.7.0)
+    hoe (2.8.0)
+      rake (>= 0.8.7)
+    hoe-doofus (1.0.0)
+    hoe-git (1.3.0)
+      hoe (>= 2.2.0)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    mime-types (1.16)
+    minitest (2.0.2)
+    mocha (0.9.12)
+    new_base_60 (1.0.3)
+    rack (1.2.1)
+    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)
+      rack (~> 1.1)
+      tilt (~> 1.2)
+    tilt (1.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeweb (= 1.3.0)
+  heroku
+  hoe
+  hoe-doofus
+  hoe-git
+  minitest (= 2.0.2)
+  mocha (= 0.9.12)
+  new_base_60 (= 1.0.3)
+  rack (= 1.2.1)
+  redis-namespace (= 0.10.0)
+  sinatra (= 1.1.2)

data/Manifest.txt

@@ -1,5 +1,7 @@
-.gems
+.rvmrc
 CHANGELOG.rdoc
+Gemfile
+Gemfile.lock
 Manifest.txt
 README.rdoc
 Rakefile
@@ -9,9 +11,11 @@ lib/oso/public/audiosocket.png
 lib/oso/public/favicon.ico
 lib/oso/public/index.css
 lib/oso/public/index.html
+lib/oso/public/jquery.ago.js
 lib/oso/public/robots.txt
 lib/oso/public/style.css
 lib/oso/server.rb
 lib/oso/views/layout.rhtml
+lib/oso/views/stat.rhtml
 lib/oso/views/stats.rhtml
 test/test_oso.rb

data/README.rdoc

@@ -9,11 +9,11 @@ three letters look a bit like our logo.
 
 == Configuring
 
-We deploy 1.9.2, so Oso expects it. It shouldn't be too hard to port
-to 1.8 if you feel the need.
+Oso has a <tt>.rvmrc</tt> because it's useful in our dev process. We
+know it's annoying for you.
 
-If you install the deps in the <tt>.gems</tt> file you can run
-<tt>rackup</tt> by itself.
+If you run <tt>bundle install</tt> you can launch <tt>rackup</tt> by
+itself.
 
 Oso needs Redis. Set the <tt>OSO_REDIS_URL</tt> environment variable,
 which defaults to <tt>redis://localhost:6379</tt>. All keys are
@@ -29,8 +29,8 @@ to <tt>/</tt> with a <tt>url</tt> parameter. It'll return a
 You can optionally pass a <tt>life</tt> parameter, which is the
 lifetime of the shortened URL in seconds.
 
-You can optionally pass a <tt>limit</tt> parameter, which is the number
-of times you want the shortened URL to work. After the limit is
+You can optionally pass a <tt>limit</tt> parameter, which is the
+number of times you want the shortened URL to work. After the limit is
 reached <tt>404</tt>'s are returned.
 
 You can optionally pass a <tt>name</tt> parameter, which will be used
@@ -43,8 +43,8 @@ If you install the <tt>oso</tt> RubyGem:
 
     require "oso"
 
-    Oso.shorten "github.com"             # => "http://oso.local/Acf"
-    Oso.shorten "github.com", life: 30   # => "http://oso.local/Ad0"
+    Oso.shorten "github.com"              # => "http://oso.local/Acf"
+    Oso.shorten "github.com", :life => 30 # => "http://oso.local/Ad0"
 
 Set the <tt>OSO_URL</tt> environment variable to control where the
 client looks for the server, or see the RDocs for information on
@@ -53,8 +53,10 @@ creating multiple instances.
 == Deploying
 
 If you fork it, Oso is already prepped for Heroku. It has an
-up-to-date <tt>.gems</tt> manifest, and it'll use the
-<tt>REDISTOGO_URL</tt> env var if it exists.
+up-to-date <tt>Gemfile.lock</tt>, and it'll use the
+<tt>REDISTOGO_URL</tt> env var if it exists. You'll probably want to
+set the <tt>BUNDLE_WITHOUT</tt> env var to exclude the
+<tt>development</tt> and <tt>test</tt> groups.
 
 If you'd like to use it in your own <tt>config.ru</tt> file via the
 gem, you'll need to provide the server's dependencies yourself. The
@@ -62,7 +64,7 @@ gem doesn't express any runtime dependencies since it's primarily used
 as a client.
 
 Assuming you've provided the server dependencies (see the
-<tt>.gems</tt> file), using the gem from Rack is simple:
+<tt>Gemfile</tt>), using the gem from Rack is simple:
 
     require "oso/server"
     run Sinatra::Application

data/lib/oso.rb

@@ -13,7 +13,7 @@ class Oso
 
   # Duh.
 
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 
   # :nodoc:
 
@@ -58,7 +58,7 @@ class Oso
   # conditions keep +url+ from being shortened in one second.
 
   def shorten url, options = {}
-    params = options.merge url: url
+    params = options.merge :url => url
 
     params[:life]  &&= params[:life].to_i
     params[:limit] &&= params[:limit].to_i

data/lib/oso/public/jquery.ago.js

@@ -0,0 +1,31 @@
+(function($) {
+    $.fn.ago = function() {
+        var now = parseInt((new Date()).getTime() / 1000)
+
+        return this.each(function() {
+            var then    = parseInt($(this).attr("data-at"), 10)
+            var delta   = now - then
+            var message = "" + delta + " seconds ago"
+
+            if (delta < 30)
+                message = "just now"
+
+            else if (delta >= 60 && delta < 120)
+                message = "a minute ago"
+
+            else if (delta >= 120 && delta < 3300)
+                message = "" + parseInt(delta / 60) + " minutes ago"
+
+            else if (delta >= 3300 && delta < 3600)
+                message = "almost an hour ago"
+
+            else if (delta >= 3600) {
+                var hours = parseInt(delta / 3600)
+                var unit  = hours > 1 ? "hours" : "hour"
+                message = "" + hours + " " + unit + " ago"
+            }
+
+            $(this).html(message)
+        })
+    }
+})(jQuery)

data/lib/oso/server.rb

@@ -6,8 +6,10 @@ require "uri"
 url = ENV.values_at("OSO_REDIS_URL", "REDISTOGO_URL").compact.first
 url = URI.parse url || "redis://localhost:6379"
 
-$redis = Redis::Namespace.new :oso,
-  redis: Redis.new(host: url.host, password: url.password, port: url.port)
+$redis = Redis::Namespace.new(:oso,
+                              :redis => Redis.new(:host => url.host,
+                                                  :password => url.password,
+                                                  :port => url.port))
 
 helpers do
   def bad! message
@@ -36,6 +38,11 @@ helpers do
     end
   end
 
+  def shorten str
+    return str unless str.length > 40
+    str[0, 37] + "..."
+  end
+
   def shorturl short
     request.path_info = "/#{short}"
     request.url
@@ -54,7 +61,8 @@ get "/stats" do
   @bytimes = Hash[*$redis.zrevrange("by:time", 0, 10, :with_scores => true)]
 
   [@byhits, @bytimes].each do |h|
-    h.each { |k, v| h[k] = { long: $redis.get("short:#{k}"), score: v }  }
+    h.select! { |k, v| $redis.exists "short:#{k}" }
+    h.each  { |k, v| h[k] = { :long => $redis.get("short:#{k}"), :score => v } }
   end
 
   @title = "Stats"
@@ -105,3 +113,15 @@ get "/:short" do |short|
 
   redirect long
 end
+
+get "/:short/stats" do |short|
+  nope! unless @long = $redis.get("short:#{short}")
+
+  @short = short
+  @hits  = $redis.zscore("by:hits", short).to_i
+  @limit = $redis.get("short:#{short}:limit").to_i
+  @time  = $redis.zscore("by:time", short).to_i
+
+  @title = "Stats :: #@short"
+  erb :stat
+end

data/lib/oso/views/layout.rhtml

@@ -18,5 +18,11 @@
 
     <script type="text/javascript"
             src="http://code.jquery.com/jquery-1.5.min.js"></script>
+
+    <script type="text/javascript" src="/jquery.ago.js"></script>
+
+    <script type="text/javascript">
+      $(function() { $("[data-at]").ago() })
+    </script>
   </body>
 </html>

data/lib/oso/views/stat.rhtml

@@ -0,0 +1,14 @@
+<p>
+  <a href="<%= shorturl @short %>"><%= @short %></a> points at
+  <a href="<%= @long %>"><%= shorten @long %></a>.
+
+  <% if @hits > 0 %>
+  It's been hit <b><%= @hits %></b> time<%= "s" if @hits != 1 %>,
+  most recently <b data-at="<%= @time %>">timestamp</b>.
+  <% end %>
+
+  <% if @limit > 0 %>
+  It can be hit <b><%= @limit %> more time<%= "s" if @limit != 1 %></b>
+  before it disappears.
+  <% end %>
+</p>

data/lib/oso/views/stats.rhtml

@@ -30,18 +30,17 @@
   <tbody>
     <% @bytimes.each do |short, data| %>
     <tr>
-      <td><%= data[:score] %></td>
-      <td><a href="<%= data[:long] %>"><%= data[:long] %></a></td>
+      <td data-at="<%= data[:score] %>">time</td>
+      <td><a href="<%= data[:long] %>"><%= shorten data[:long] %></a></td>
       <td><a href="<%= shorturl(short) %>"><%= shorturl(short) %></a></td>
     </tr>
     <% end %>
   </tbody>
-</table>
-
-<h2>Most Hits</h2>
-
-<table cellspacing="0">
   <thead>
+    <tr colspan="3">
+      <td><h2>Most Hits</h2></td>
+    </tr>
+
     <tr>
       <th>Hits</th>
       <th>URL</th>
@@ -53,7 +52,7 @@
     <% @byhits.each do |short, data| %>
     <tr>
       <td><%= data[:score] %></td>
-      <td><a href="<%= data[:long] %>"><%= data[:long] %></a></td>
+      <td><a href="<%= data[:long] %>"><%= shorten data[:long] %></a></td>
       <td><a href="<%= shorturl(short) %>"><%= shorturl(short) %></a></td>
     </tr>
     <% end %>

data/test/test_oso.rb

@@ -34,7 +34,7 @@ class TestOso < MiniTest::Unit::TestCase
 
   def test_shorten
     FakeWeb.register_uri :post, "http://example.org/",
-      body: "http://example.org/1", status: 201
+      :body => "http://example.org/1", :status => 201
 
     oso = Oso.new "example.org"
 
@@ -43,7 +43,7 @@ class TestOso < MiniTest::Unit::TestCase
 
   def test_shorten_bad
     FakeWeb.register_uri :post, "http://example.org/",
-      body: "No luck.", status: 404
+      :body => "No luck.", :status => 404
 
     oso = Oso.new "example.org"
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oso
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Audiosocket
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -06:00
+date: 2011-03-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
   type: :development
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
   type: :development
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
         version: 0.9.12
   type: :development
   version_requirements: *id003
@@ -54,7 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.1
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id004
 description: |-
@@ -72,8 +97,10 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.rdoc
 files: 
-- .gems
+- .rvmrc
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - Manifest.txt
 - README.rdoc
 - Rakefile
@@ -83,13 +110,14 @@ files:
 - lib/oso/public/favicon.ico
 - lib/oso/public/index.css
 - lib/oso/public/index.html
+- lib/oso/public/jquery.ago.js
 - lib/oso/public/robots.txt
 - lib/oso/public/style.css
 - lib/oso/server.rb
 - lib/oso/views/layout.rhtml
+- lib/oso/views/stat.rhtml
 - lib/oso/views/stats.rhtml
 - test/test_oso.rb
-- .gemtest
 has_rdoc: true
 homepage: http://github.com/audiosocket/oso
 licenses: []
@@ -105,17 +133,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: oso
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Audiosocket's minimal URL shortener

data/.gems

@@ -1,4 +0,0 @@
-new_base_60 --version '= 1.0.3'
-rack --version '= 1.2.1'
-redis-namespace --version '= 0.10.0'
-sinatra --version '= 1.1.2'