short 0.5.4 → 0.6.0

data/lib/shortener/server/views/u/login.haml

@@ -0,0 +1,13 @@
+
+.row
+  %form{action: '/api/v1/u/login', method: 'post'}
+    .control-group
+      %label.control-label{for: 'user[username]'} Username:
+      .controls
+        %input{type: 'text', name: 'user[username]', class: 'text'}
+    .control-group
+      %label.control-label{for: 'user[password]'} Password:
+      .controls
+        %input{type: 'password', name: 'user[password]', class: 'password'}
+
+    %input{type: 'submit', value: 'Login', class: 'btn primary'}

data/lib/shortener/server/views/upload.haml

@@ -1,7 +1,7 @@
-%script{src: "js/swfupload.js"}
-%script{src: "js/jquery-swfupload-min.js"}
+%script{src: "/js/swfupload.js"}
+%script{src: "/js/jquery-swfupload-min.js"}
 .row
-  %form.form-horizontal.span6{id: 'upload-form', action: '/upload', method: 'post'}
+  %form.form-horizontal.span6{id: 'upload-form', action: '/api/v1/upload', method: 'post'}
     .control-group
       %label.control-label Select File:
       .controls
@@ -13,16 +13,16 @@
       %label.control-label Display Type:
       .controls
         %label.radio.inline
-          %input{name: 'shortener[type]', type: 'radio', value: 'video'} 
+          %input{name: 'shortener[type]', type: 'radio', value: 'video'}
             Video
         %label.radio.inline
-          %input{name: 'shortener[type]', type: 'radio', value: 'audio'} 
+          %input{name: 'shortener[type]', type: 'radio', value: 'audio'}
           Audio
         %label.radio.inline
-          %input{name: 'shortener[type]', type: 'radio', value: 'image'} 
+          %input{name: 'shortener[type]', type: 'radio', value: 'image'}
           Image
         %label.radio.inline
-          %input{name: 'shortener[type]', type: 'radio', value: 'download'} 
+          %input{name: 'shortener[type]', type: 'radio', value: 'download'}
           Download
     .control-group.hideable
       %label.control-label{for: 'shorterner[name]'} Name
@@ -45,7 +45,7 @@
   $(function(){
     $('#swfupload-control').swfupload({
       // Backend Settings
-      upload_url: "#{@upload_url}",    
+      upload_url: "#{@upload_url}",
       http_success : [ 200, 201, 204 ],     // FOR AWS
 
       // File Upload Settings
@@ -84,7 +84,7 @@
     .bind('uploadSuccess', function(event, file, serverData){
       var values = $('#upload-form').serialize();
       values += '&shortener%5bfile_name%5d=' + file.name;
-      $.post('/upload.json', values, function(data){
+      $.post('/api/v1/upload', values, function(data){
         $('#display-up-new-shorts').append(data.html)
       });
 

data/lib/shortener/server/warden.rb

@@ -0,0 +1,29 @@
+
+Warden::Manager.serialize_into_session{|user| user.token }
+Warden::Manager.serialize_from_session{|token| User.get_by_token(token) }
+
+Warden::Manager.before_failure do |env,opts|
+  env['REQUEST_METHOD'] = "POST"
+end
+
+Warden::Strategies.add(:password) do
+  def valid?
+    params['user']["username"] || params['user']["password"]
+  end
+
+  def authenticate!
+    u = User.authenticate!(params['user']["username"], params['user']["password"])
+    u ? success!(u) : fail!('Could not log in')
+  end
+end
+
+Warden::Strategies.add(:token) do
+  def valid?
+    params.has_key?('token')
+  end
+
+  def authenticate!
+    u = User.get_by_token(params['token'])
+    u ? success!(u) : fail!('Could not log in')
+  end
+end

data/lib/shortener/short.rb

@@ -11,7 +11,7 @@ class Shortener
 
       # set a shortened url
       def shorten(url, conf = nil)
-        opts = {'shortener' =>  {'url' => url}.to_json}
+        opts = {"shortener[url]" => "#{url}"}
         response = request(:post, :add, conf, opts)
         if response.is_a?(Net::HTTPOK)
           return Short.new(response.body, conf)
@@ -40,7 +40,7 @@ class Shortener
 
       # delete a short
       def delete(short, conf = nil)
-        response = request(:get, :delete, conf, short)
+        response = request(:post, :delete, conf, {id: short})
         Short.new(response.body, conf)
       end
 

data/lib/shortener/tasks/heroku.rb

@@ -64,10 +64,10 @@ namespace :short do
     desc "Build a Heroku Ready Git repo"
     task :build do
       FileUtils.mkdir(File.join(Dir.pwd, 'shortener-heroku')) unless $existing_repo
-      [:'server', :'server/public', :'server/views', :'server/views/s3', 
+      [:'server', :'server/public', :'server/views', :'server/views/s3',
         :'server/public/flash', :'server/public/js', :'server/public/css',
-       :'server/public/skin', :'server/public/images',
-       :'server/public/skin/blue.monday'].each do |f|
+       :'server/public/skin', :'server/public/images', :'server/views/u',
+       :'server/public/skin/blue.monday', 'server/api'].each do |f|
         unless File.exist?(_file(f))
           puts "creating #{_file(f)}" if ENV['VERBOSE']
           FileUtils.mkdir(_file(f))
@@ -76,8 +76,8 @@ namespace :short do
 
       ['server', 'server/public', 'server/views', :'server/views/s3',
        :'server/public/flash', :'server/public/images', :'server/public/skin',
-       :'server/public/skin/blue.monday', :'server/public/js', 
-       :'server/public/css'].each do |end_point|
+       :'server/public/skin/blue.monday', :'server/public/js', :'server/views/u',
+       :'server/public/css', 'server/api'].each do |end_point|
         Dir["#{$gem_dir}/#{end_point}/**"].each do |f|
           next if File.directory?(f)
           end_point = _file(:"#{_ep(f)}")
@@ -85,9 +85,9 @@ namespace :short do
           FileUtils.cp(f, end_point)
         end
       end
-      _s, _e = gem_file('server.rb'), _file(:'main.rb')
-      _l(:copying, _s, _e)
-      FileUtils.cp(_s, _e)
+      #_s, _e = gem_file('server.rb'), _file(:'main.rb')
+      #_l(:copying, _s, _e)
+      #FileUtils.cp(_s, _e)
       _s, _e = gem_file('configuration.rb'), _file(:'configuration.rb')
       _l(:copying, _s, _e)
       FileUtils.cp(_s, _e)
@@ -117,6 +117,7 @@ namespace :short do
         recursively_remove_files(Dir.pwd)
       else
         puts "working directory not clean, stash or commit your changes"
+        exit
       end
       $existing_repo = true
       Rake::Task[:'short:heroku:build'].execute
@@ -124,16 +125,21 @@ namespace :short do
 
     desc "config a Heroku app the way we need it. Optionally set APPNAME to set heroku app name"
     task :config do
-      require 'shortener'
       $name = ENV['APPNAME'] || "shner-#{`whoami`.chomp}"
       cmd = Dir.pwd =~ /heroku$/ ? "" : "cd heroku && "
       cmd += "heroku create #{$name}"
       cmd += " && heroku addons:add redistogo:nano"
-      cmd += " && heroku config:add #{Shortener::Configuration.new.to_params}"
       cmd += " && heroku addons:add custom_domains:basic"
+      Rake::Task[:update_config].execute
       sh cmd
     end
 
+    desc "Update Heroku env vars with Shortener::Config dump"
+    task :update_config do
+      require 'shortener'
+      sh "heroku config:add #{Shortener::Configuration.new.to_params}"
+    end
+
     desc "Push to Heroku"
     task :push do
       cmd = Dir.pwd =~ /heroku$/ ? "" : "cd heroku && "

data/lib/shortener/version.rb

@@ -1,6 +1,6 @@
 
 class Shortener
 
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70158657395380 !ruby/object:Gem::Requirement
+  requirement: &70284680213020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158657395380
+  version_requirements: *70284680213020
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70158657394620 !ruby/object:Gem::Requirement
+  requirement: &70284680212600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158657394620
+  version_requirements: *70284680212600
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70158657393920 !ruby/object:Gem::Requirement
+  requirement: &70284680212140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158657393920
+  version_requirements: *70284680212140
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70158657393160 !ruby/object:Gem::Requirement
+  requirement: &70284680211720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158657393160
+  version_requirements: *70284680211720
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com
@@ -71,16 +71,21 @@ files:
 - config.ru
 - lib/shortener.rb
 - lib/shortener/configuration.rb
-- lib/shortener/server.rb
 - lib/shortener/server/Gemfile
 - lib/shortener/server/Gemfile.lock
+- lib/shortener/server/api/v1.rb
+- lib/shortener/server/auth.rb
+- lib/shortener/server/brief.rb
 - lib/shortener/server/config.ru.template
+- lib/shortener/server/helpers.rb
+- lib/shortener/server/pbkdf2.rb
 - lib/shortener/server/public/css/bootstrap-responsive.min.css
 - lib/shortener/server/public/css/bootstrap.min.css
 - lib/shortener/server/public/css/colorbox.css
+- lib/shortener/server/public/css/controls.png
+- lib/shortener/server/public/css/loading.gif
 - lib/shortener/server/public/css/shortener.css
 - lib/shortener/server/public/flash/Jplayer.swf
-- lib/shortener/server/public/flash/clippy.swf
 - lib/shortener/server/public/flash/swfupload.swf
 - lib/shortener/server/public/images/XPButtonUploadText_61x22.png
 - lib/shortener/server/public/images/delete-icon.png
@@ -98,6 +103,8 @@ files:
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.jpg
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.seeking.gif
 - lib/shortener/server/public/skin/blue.monday/jplayer.blue.monday.video.play.png
+- lib/shortener/server/user.rb
+- lib/shortener/server/views.rb
 - lib/shortener/server/views/add.haml
 - lib/shortener/server/views/display.haml
 - lib/shortener/server/views/index.haml
@@ -106,7 +113,10 @@ files:
 - lib/shortener/server/views/s3/image.haml
 - lib/shortener/server/views/s3/layout.haml
 - lib/shortener/server/views/s3/video.haml
+- lib/shortener/server/views/u/edit.haml
+- lib/shortener/server/views/u/login.haml
 - lib/shortener/server/views/upload.haml
+- lib/shortener/server/warden.rb
 - lib/shortener/short.rb
 - lib/shortener/tasks/heroku.rb
 - lib/shortener/version.rb

data/lib/shortener/server.rb

@@ -1,350 +0,0 @@
-require 'sinatra'
-require 'redis-namespace'
-require 'uri'
-require 'json'
-require 'haml'
-require 'digest/sha1'
-require 'base64'
-require File.join(File.dirname(__FILE__), 'configuration')
-
-
-
-class Shortener
-  class Server < Sinatra::Base
-    dir = File.expand_path(File.dirname(__FILE__))
-    set :root,          File.join(dir, 'server')
-    set :public_folder, File.join(dir, 'server', 'public')
-
-    configure do
-      $conf = Shortener::Configuration.new
-      uri = $conf.redistogo_url
-      _redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
-      $redis = Redis::Namespace.new(:shortener, redis: _redis)
-    end
-
-    set(:s3_available) {|v| condition {$conf.s3_available == v}}
-
-    helpers do
-
-      def bad! message
-        halt 412, {}, message
-      end
-
-      def nope!(message = 'No luck.')
-        halt 404, {}, message
-      end
-
-      def base_url
-        @base_url ||= "#{request.env['rack.url_scheme']}://#{request.env['HTTP_HOST']}"
-      end
-
-      def clippy(text, bgcolor='#FFFFFF')
-        html = <<-EOF
-          <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
-                  width="110"
-                  height="25"
-                  id="clippy" >
-          <param name="movie" value="/flash/clippy.swf"/>
-          <param name="allowScriptAccess" value="always" />
-          <param name="quality" value="high" />
-          <param name="scale" value="noscale" />
-          <param NAME="FlashVars" value="text=#{text}">
-          <param name="bgcolor" value="#{bgcolor}">
-          <embed src="/flash/clippy.swf"
-                 width="110"
-                 height="14"
-                 name="clippy"
-                 quality="high"
-                 allowScriptAccess="always"
-                 type="application/x-shockwave-flash"
-                 pluginspage="http://www.macromedia.com/go/getflashplayer"
-                 FlashVars="text=#{text}"
-                 bgcolor="#{bgcolor}"
-          />
-          </object>
-        EOF
-      end
-
-      def set_or_fetch_url(params)
-        bad! 'Missing url.' unless url = params['url']
-        bad! 'Bad URL' unless params['url'] =~ /(^http|^www)/
-        url = "http://#{url}" unless /^http/i =~ url
-        bad! 'Bad URL' unless (url = URI.parse(url)) && /^http/ =~ url.scheme
-
-        %w(max-clicks expire desired-short allow-override).each do |k|
-          params[k] = false if params[k].nil? || params[k].empty?
-        end
-
-        unless params['max-clicks'] || params['expire'] || params['desired-short']
-          data = check_cache(url)
-        end
-        data ||= shorten(url, params)
-
-        data
-      end
-
-      def set_upload_short(params)
-        bad! 'Missing content type.' unless type = params['type']
-        key = generate_short
-        fname = params['file_name'].gsub(' ', '+')
-        sha = Digest::SHA1.hexdigest(fname)
-        hash_key = "data:#{sha}:#{key}"
-        url = "https://s3.amazonaws.com/#{$conf.s3_bucket}/#{$conf.s3_key_prefix}/#{fname}"
-        ext = File.extname(fname)[1..-1]
-        data = {'url' => url, 's3' => true, 'shortened' => key,
-          'extension' => ext, 'set_count' => 1}
-        data = params.merge(data)
-
-        $redis.set(key, sha)
-        $redis.hmset(hash_key, *arrayify_hash(data))
-
-        data
-      end
-
-      def shorten(url, options = {})
-
-        unless options['desired-short']
-          key = generate_short
-        else
-          check = $redis.get(options['desired-short'])
-          if check  # it's already taken
-            check_key = "data:#{check}:#{options['desired-short']}"
-            prev_set = $redis.hgetall(check_key)
-
-            # if we don't expire or have max clicks and previously set key
-            # doesn't expire or have max clicks we can go ahead and use it
-            # without any further setup.
-            unless options['expire'] || options['max-clicks']
-              if (!prev_set['max-clicks'] && !prev_set['expire'] &&
-                (prev_set['url'] == url.to_s))
-                $redis.hincrby(check_key, 'set_count', 1)
-                return prev_set
-              end
-            end
-
-            if prev_set['max-clicks'].to_i < prev_set['clicks'].to_i
-              # previous key is no longer valid, we can assign to it
-              key = options['desired-short']
-            else
-              bad! 'Name is already taken. Use Allow override' unless options['allow-override'] == 'true'
-              key = generate_short
-            end
-
-          else
-            key = options['desired-short']
-          end
-        end
-
-        sha = Digest::SHA1.hexdigest(url.to_s)
-        $redis.set(key, sha)
-
-        hsh_data = {'shortened' => key, 'url' => url, 'set_count' => 1}
-        hsh_data['max-clicks'] = options['max-clicks'].to_i if options['max-clicks']
-
-        if options['expire'] # set expire time if specified
-          ttl = options['expire'].to_i
-          ttl_key = "expire:#{sha}:#{key}"
-          $redis.set(ttl_key, "#{sha}:#{key}")
-          $redis.expire(ttl_key, ttl)
-          hsh_data[:expire] = ttl_key
-        end
-        $redis.hmset("data:#{sha}:#{key}", *arrayify_hash(hsh_data))
-
-        hsh_data
-      end
-
-      def check_cache(url)
-        sha = Digest::SHA1.hexdigest(url.to_s)
-
-        $redis.keys("data:#{sha}:*").each do |key|
-          short = $redis.hgetall(key)
-          unless short == {} || short['expire'] || short['max-clicks']
-            $redis.hincrby(key, 'set_count', 1)
-            return short
-          end
-        end
-        nil
-      end
-
-      def delete_short(id)
-        puts "deleting #{id}"
-        puts sha = $redis.get(id)
-        unless sha.nil?
-          $redis.multi do
-            $redis.del "data:#{sha}:#{id}"
-            $redis.del "expire:#{sha}:#{id}"
-            $redis.del id
-          end
-          true
-        else
-          false
-        end
-      end
-
-      def generate_short
-        begin
-          o =  [('a'..'z'),('A'..'Z'),(0..9)].map{|i| i.to_a}.flatten;
-          key  =  (0..4).map{ o[rand(o.length)]  }.join;
-          puts "testing #{key}"
-        end while !$redis.get(key).nil?
-        key
-      end
-
-      def ttl_display(ttl)
-        if ttl == -1
-          ret = 'expired'
-        elsif ttl == nil
-          ret = '&infin;'
-        else
-          ret = ttl
-        end
-        ret
-      end
-
-      def arrayify_hash(hsh)
-        hsh.keys.map {|k| [k, hsh[k]] }.flatten
-      end
-
-      def boxify_class(int, boxify_classes = '', nonbox_classes = '', other_classes = '')
-        str = if @boxify 
-                "#{other_classes} #{boxify_classes}" 
-              else
-                "#{other_classes} #{nonbox_classes}"
-              end
-        str = str + " offset#{int}" unless !int.nil? && @boxify
-        str
-      end
-
-    end
-
-    before do
-      params
-    end
-
-    get '/' do
-      redirect $conf.default_url
-    end
-
-    get '/add' do
-      @boxify = !params['boxify'].nil?
-      haml :add, layout: !@boxify
-    end
-
-    get '/index.?:format?' do
-      @shortens = Array.new
-      $redis.keys('data:*').each do |key|
-        short = $redis.hgetall(key)
-        short['expire'] = $redis.ttl(short['expire']) if short.has_key?('expire')
-        @shortens << short
-        puts "  url for #{key[-5..-1]} => #{short['url']}"
-      end
-      if params[:format] == 'json'
-        content_type :json
-        return @shortens.to_json
-      end
-      haml :index
-    end
-
-    get '/delete/:id.:format' do |id, format|
-      status = delete_short(id)
-      if format == 'json'
-        nope! "Short not found: #{id}" if status == false
-        content_type :json
-        {success: status, shortened: id}.to_json
-      else
-        redirect :index
-      end
-    end
-
-    get '/upload', s3_available: true do
-      policy = $conf.s3_policy
-      signature = $conf.s3_signature(policy)
-
-      @post = {
-        "key" => "#{$conf.s3_key_prefix}/${filename}",
-        "AWSAccessKeyId" => "#{$conf.s3_access_key_id}",
-        "acl" => "#{$conf.s3_default_acl}",
-        "policy" => "#{policy}",
-        "signature" => "#{signature}",
-        "success_action_status" => "201"
-      }
-
-      @upload_url = "http://#{$conf.s3_bucket}.s3.amazonaws.com/"
-      @boxify = !params['boxify'].nil?
-      haml :upload, layout: !@boxify
-    end
-
-    #get '/:id.?:format?' do
-    get %r{\/([a-z0-9]{3,})(\.[a-z]{3,}){0,1}}i do
-      id = params[:captures].first
-      sha = $redis.get(id)
-      if sha.nil?
-        if (params[:captures].last == '.json')
-          nope! "Short not found: #{id}"
-        else
-          puts "redirecting to default url"
-          redirect $conf.default_url
-        end
-      else
-        key = "data:#{sha}:#{id}"
-        short = $redis.hgetall(key)
-        not_expired = short.has_key?('expire') ? $redis.get(short['expire']) : true
-        not_maxed = !(short['click_count'].to_i >= short['max-clicks'].to_i)
-        short.has_key?('max-clicks') ? not_maxed : not_maxed = true
-        if params[:captures].last == '.json'
-          ret = short.merge({expired: not_expired.nil? , maxed: !not_maxed})
-          content_type :json
-          return ret.to_json
-        else
-          $redis.hincrby(key, 'click_count', 1) if not_expired && not_maxed
-          if not_expired
-            unless short['s3'] == 'true' && !(short['type'] == 'download')
-              if not_maxed
-                puts "redirecting #{id} to #{url}"
-                redirect short['url']
-              end # => max clicks check
-            else
-              @short = short
-              puts "rendering view for s3 content. #{id} => #{short['url']}"
-              return haml(:"s3/#{short['type']}", layout: :'s3/layout')
-            end # => it's S3 and needs displaying.
-          end # => expired check
-        end # => format
-      end
-      puts "redirecting to default url"
-      redirect $conf.default_url
-    end
-
-    post '/upload.?:format?' do |format|
-      @data = set_upload_short(params['shortener'])
-      puts "set #{@data['shortened']} to #{params['shortener']['file_name']}"
-      @url = "#{base_url}/#{@data['shortened']}"
-      if format == 'json'
-        content_type :json
-        @data.merge({html: haml(:display, layout: false)}).to_json
-      else
-        redirect :index
-      end
-    end
-
-    post '/add.?:format?' do |format|
-      begin
-        # TODO figure out why the fuck these are parsing from Net::HTTP
-        params['shortener'] = JSON.parse(params['shortener']) if params['shortener'].is_a?(String)
-      rescue Exception => boom
-        # essentally, params = params
-      end
-
-      @data = set_or_fetch_url(params["shortener"])
-      @url = "#{base_url}/#{@data['shortened']}"
-      puts "set #{@url} to #{params['shortener']['url']}"
-      if format == 'json'
-        content_type :json
-        @data.merge({success: true, html: haml(:display, :layout => false)}).to_json
-      else
-        haml :display
-      end
-    end
-
-  end # => Server
-end # => Shortener