shawty-server 1.0.1 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/shawty-server.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shawty-server}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]

data/shawty.rb

@@ -1,11 +1,13 @@
 ## Resources
-require 'rubygems'
+require 'rubygems' # sorry @defunkt, this is easier
 gem 'sinatra', :version => '1.0'
 require 'sinatra'
 require 'active_record'
 gem 'alphadecimal'
 require 'alphadecimal'
 
+
+
 ## Application
 
 get '/' do
@@ -17,44 +19,40 @@ get '/' do
 end
 
 get '/:id' do
-  pass unless url = find_url_by_id(params[:id].alphadecimal)
+  url = select_column %Q{
+                  SELECT url FROM #{table_name}
+                  WHERE id = #{quote params[:id].alphadecimal.to_i}
+                }
+
+  pass unless url
 
   redirect url, 301
 end
 
 post '*' do
-  pass if params[:splat].empty?
+  url = request.env['REQUEST_URI'] || Array(params[:splat]).first
 
-  url = params[:splat].first
-  url = url[1, url.size] if url.chars.first == '/'
+  url = url[1, url.size] if url =~ /^\//
 
-  pass if url.empty?
+  pass if url.nil? || '' == url
 
   quoted = quote url
 
-  found = execute %Q{ SELECT id FROM #{table_name} WHERE url = #{quoted} }
+  id = select_column %Q{ SELECT id FROM #{table_name} WHERE url = #{quoted} }
 
-  if found.any?
-    id = found.first['id']
-  else
-    connection.transaction do
-      found = execute %Q{
-          INSERT INTO #{table_name} (url, id) VALUES (#{quoted}, nextval('shawty_id_seq'));
-          SELECT MAX(id) from #{table_name}
+  id ||= select_column %Q{
+          INSERT INTO #{table_name} (url, id) VALUES (#{quoted}, nextval('shawty_id_seq'))
+          RETURNING id
         }
-    end
-    id = found.first['max']
-  end
 
-  "http://#{request.host}/#{id.alphadecimal}"
+  "http://#{request.host}/#{id.to_i.alphadecimal}"
 end
 
 
 ## Helpers
 
-def find_url_by_id(id)
-  result = execute %Q{ SELECT url FROM #{table_name} WHERE id = #{quote id.to_i} }
-  return result.map.first['url'] if result.map.length > 0
+def select_column sql
+  connection.select_rows(sql).flatten.first
 end
 
 def execute sql

data/test.rb

@@ -32,19 +32,16 @@ class ShawtyTest < Test::Unit::TestCase
 
   context "on GET to / with url" do
     setup {
-      execute %Q{
+      id = select_column %Q{
         INSERT INTO #{table_name} (url, id)
         VALUES (
           #{quote 'http://google.com/'},
           nextval('shawty_id_seq')
         )
+        RETURNING id
       }
-      id = execute(%Q{
-              SELECT id FROM #{table_name}
-              WHERE url = #{quote 'http://google.com/'}
-           }).first['id'].to_i
 
-      get "/#{id.alphadecimal}"
+      get "/#{id.to_i.alphadecimal}"
     }
     should "return a 301 redirect" do
       assert_equal 301, last_response.status
@@ -63,21 +60,20 @@ class ShawtyTest < Test::Unit::TestCase
       assert last_response.ok?
     end
     should_change "record count", :by => 1 do
-      execute(%Q{ SELECT COUNT(*) FROM #{table_name} }).first['count'].to_i
+      select_column(%Q{ SELECT COUNT(*) FROM #{table_name} }).to_i
     end
     should "save the url" do
-      res = execute(%Q{
-                SELECT * FROM #{table_name}
+      assert select_column %Q{
+                SELECT id FROM #{table_name}
                 WHERE  url = #{quote 'http://some.url/path.ext'}
-              })
-      assert res.one?, res.map.inspect
+              }
     end
     should "display the shortened url" do
-      id = execute(%Q{
+      id = select_column %Q{
                 SELECT id FROM #{table_name}
                 WHERE  url = #{quote 'http://some.url/path.ext'}
-              }).first['id']
-      assert_equal "http://example.org/#{id.alphadecimal}",
+              }
+      assert_equal "http://example.org/#{id.to_i.alphadecimal}",
                    last_response.body
     end
     context "with a url that's been saved previously" do
@@ -88,7 +84,7 @@ class ShawtyTest < Test::Unit::TestCase
         assert last_response.ok?
       end
       should_not_change "record count" do
-        execute(%Q{ SELECT COUNT(*) FROM #{table_name} }).first['count'].to_i
+        select_column(%Q{ SELECT COUNT(*) FROM #{table_name} }).to_i
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shawty-server
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jack Danger Canty