public/application.js public/jquery.js views/index.haml @@ -7,7 +7,7 @@ set :repository, "git://github.com/you/#{application}.git" # If you aren't using Subversion to manage your source code, specify # your SCM below: set :scm, :git - +set :user, :you set :ruby_vm_type, :ree # :ree, :mri set :web_server_type, :apache # :apache, :nginx set :app_server_type, :passenger # :passenger, :mongrel @@ -23,7 +23,7 @@ role :web, domain # If you aren't deploying to /opt/apps/#{application} on the target # servers (which is the deprec default), you can specify the actual location # via the :deploy_to variable: -# set :deploy_to, "/opt/apps/#{application}" +set :deploy_to, "/opt/apps/#{application}" namespace :deploy do task :restart, :roles => :app, :except => { :no_release => true } do config/deploy.rb @@ -1,12 +1,10 @@ body { - margin-top: 20%; background: #fde181; color: #830000; - text-align: center; } body, input { - font: 36pt Sans-serif; + font: 16pt Sans-serif; font-weight:bold; } @@ -26,4 +24,29 @@ input#url { a { color: #830000; +} + +.left { + text-align: left; +} + +.url { + border: 3px solid #c9ad71; + margin: 5px; + padding: 5px; + background: #e1c35e; + width: 40em; + overflow: none; +} + +.url .original-url { + display: block; +} +h3, h6 { + padding: 0px; + margin: 0px; +} + +.as-seen-on { + display: none; } \ No newline at end of file public/style.css @@ -5,105 +5,128 @@ require 'sequel' begin - database = YAML::load(File.open("config/database.yml")) - if database["adapter"] == "sqlite" || database["adapter"] == "sqlite3" - DB = Sequel.sqlite('url') unless defined?(DB) - elsif database["adapter"] == "mysql" - DB = Sequel.mysql(database["database"], - :user => database["user"] || database["username"], - :password => database["password"], - :host => database["host"] || 'localhost') unless defined?(DB) - elsif database["adapter"] == "postgresql" || database["adapter"] == "postgres" - DB = Sequel.connect('postgres://#{database[:user] || database[:username]}:#{database[:password]}@#{database[:host] || "localhost"}/#{database[:database]}') unless defined?(DB) - end - - unless DB.table_exists?(:urls) - DB.create_table :urls do - primary_key :id - column :url, :text - end - end - - end - $dataset = DB[:urls] + database = YAML::load(File.open("config/database.yml")) + if database["adapter"] == "sqlite" || database["adapter"] == "sqlite3" + DB = Sequel.sqlite('url') unless defined?(DB) + elsif database["adapter"] == "mysql" + DB = Sequel.mysql(database["database"], + :user => database["user"] || database["username"], + :password => database["password"], + :host => database["host"] || 'localhost') unless defined?(DB) + end + + unless DB.table_exists?(:urls) + DB.create_table :urls do + primary_key :id + column :url, :text + end + end + $dataset = DB[:urls] end class AppError < Exception - + +end + +# We paginate 7 because the twitter search url can only be so long, we'll be conservative and try to keep this under 255. +def paginate + @paginated_rows = $dataset.reverse_order(:id).paginate(params[:page].to_i, 7) +end + +def next_page + !$dataset.reverse_order(:id).paginate(params[:page].to_i + 1, 7).empty? +end + +def previous_page + return false if params[:page] == "1" + !$dataset.reverse_order(:id).paginate(params[:page].to_i - 1, 7).empty? +end + +get '/urls' do + params[:page] = "1" + paginate + haml :index +end + +get '/urls/:page' do + paginate + haml :index end get '/p/:url' do - begin - @url = $dataset.filter(:id => params[:url].to_i(36)).first[:url] - @url = assume_http(@url) - haml :preview - rescue Exception => e - missing_url - end + begin + @url = $dataset.filter(:id => params[:url].to_i(36)).first[:url] + @url = assume_http(@url) + haml :preview + rescue Exception => e + missing_url + end end get '/:url' do - begin - url = $dataset.filter(:id => params[:url].to_i(36)).first[:url] - redirect assume_http(url) - rescue - missing_url - end + begin + url = $dataset.filter(:id => params[:url].to_i(36)).first[:url] + redirect assume_http(url) + rescue + missing_url + end end get '/' do - haml :form + haml :form end # A get based creator so that bookmarklet can be used get '/c/*' do - create_and_display(params[:splat].to_s) + create_and_display(params[:splat].to_s) end post '/create' do - create_and_display(params[:url]) + create_and_display(params[:url]) end [AppError, Sinatra::NotFound].each do |e| error e do @error = request.env["sinatra.error"].name - haml :error + haml :error end end def missing_url - raise Sinatra::NotFound, "We could not find that URL." + raise Sinatra::NotFound, "We could not find that URL." end def create_and_display(url) - url - url = assume_http(url) - if url_chain?(url) - raise "You've been bad.<br />You cannot create URL chains." - elsif url.length.zero? - raise "Input a URL, please." - else - if $dataset.filter(:url => url).empty? - $dataset << {:url => url } - end - - url = $dataset.filter(:url => url) - @id = url[:id][:id].to_s(36) - haml :url - end + url + url = assume_http(url) + if url_chain?(url) + @error = "You've been bad.<br />You cannot create URL chains." + haml :error + elsif url.length.zero? + @error = "Input a URL, please." + haml :error + else + if $dataset.filter(:url => url).empty? + $dataset << {:url => url } + end + + url = $dataset.filter(:url => url) + @id = url[:id][:id].to_s(36) + haml :url + end end def url_chain?(string) - blacklist = [request.env['HTTP_HOST'], "tinyurl", "is.gd", "tr.im", "rubyurl"] - !!blacklist.detect { |url| string.include?(url) } + blacklist = [request.env['HTTP_HOST'], "tinyurl", "is.gd", "tr.im", "rubyurl"] + !!blacklist.detect { |url| string.include?(url) } end # Assume http if nothing is specified. def assume_http(url) - if !/^(.*):\/\//.match(url) - url = "http://#{url}" - end - url + if !/^(.*):\/\//.match(url) + url = "http://#{url}" + end + url end url.rb @@ -7,4 +7,12 @@ %input{ :type => "submit", :name => "submit", :value => "URLize", :class => "button" } %small - == We haz #{DB[:urls].count} urls \ No newline at end of file + We haz + %a{:href => "/urls"}== #{DB[:urls].count} urls + + %br/ + Drag + -#%a{:href => "javascript:void(location.host=='maps.google.com'?location.href='http://#{request.env['HTTP_HOST']}/c/'+encodeURIComponent(document.getElementById('link').href):location.href='http://#{request.env['HTTP_HOST']}/c/'+encodeURIComponent(location.href))"} + %a{:href => "javascript:void(location.host=='maps.google.com'?location.href='http://#{request.env['HTTP_HOST']}/c/'+document.getElementById('link').href:location.href='http://#{request.env['HTTP_HOST']}/c/'+location.href)"} + this link + to your bookmarks bar to save the link \ No newline at end of file views/form.haml @@ -1,6 +1,8 @@ %html %head - %link{ :rel => "stylesheet", :href => "/style.css"} + %link{ :rel => "stylesheet", :href => "/style.css?#{Time.now}"} + %script{ :src => "/jquery.js?#{Time.now}", :type => "text/javascript" } + %script{ :src => "/application.js?#{Time.now}", :type => "text/javascript" } %body = yield views/layout.haml tmp/restart.txt url b1998906f399639d29527151170aee194c0dec17 d6592d6dfee412681c42e4f089f0dc7690f4d4e4 Ryan Bigg radarlistener@gmail.com http://github.com/radar/url/commit/c1803ea3b56368a9cb7d416af1e8eb66d570a4f2 c1803ea3b56368a9cb7d416af1e8eb66d570a4f2 2009-02-26T22:18:43-08:00 2009-02-26T22:18:43-08:00 Merge branch 'master' of git://github.com/mocra/url Conflicts: url.rb 67eaa5ca0252965ed69a24522d17e83039478621 Ryan Bigg radarlistener@gmail.com