short 0.3.2 → 0.3.3

data/bin/short

@@ -105,6 +105,39 @@ def usage
 EOU
 end
 
+def write_configuration
+  store = ARGV.shift(2)
+  puts "the Short command line tool works best with a config file, ~/.shortener."
+  puts "We didn't find on, if you'd like we can write one now. (y|n)"
+  if gets.chomp == 'y'
+    opts = Hash.new
+    puts "sweet. What is the URL for your shortener server?"
+    opts[:SHORTENER_URL] = gets.chomp
+    puts "for your shortener server, what would you like the default redirect to be? (defaults to /index)"
+    opts[:DEFAULT_URL] = gets.chomp
+    puts "are you going to be running the server on this computer? (y|n)"
+    if gets.chomp == 'y'
+      puts "what url would you like to use for redis? (ex. redis://localhost:6379)"
+      opts[:REDISTOGO_URL] = gets.chomp
+      puts "would you like to enabled S3 uploads? (y|n)"
+      if gets.chomp == 'y'
+        opts[:S3_ENABLED] = true
+        puts "You will want to set the following options, either in your ENV of edit this config:"
+        puts "S3_KEY_PREFIX, S3_ACCESS_KEY_ID, S3_SECRET_ACCESS_KEY, S3_DEFAULT_ACL, S3_BUCKET\n\n"
+      end
+    end
+    puts "nice. for now, that's all we need. writing file...\n\n"
+    File.open(@conf_file, 'w') {|f| f.puts opts.to_yaml}
+  else
+    puts "fine, but any errors aren't my fault.\n\n"
+  end
+  ARGV.concat(store)
+end
+
+@conf_file = ENV['DOTFILE_PATH'] || File.join(ENV['HOME'], ".shortener")
+
+write_configuration unless File.exists?(@conf_file)
+
 case ARGV[0]
 when 'shorten'
   do_action(:shorten, ARGV[1])

data/lib/shortener/configuration.rb

@@ -7,7 +7,7 @@ class Shortener
 
     OPTIONS = [:SHORTENER_URL, :DEFAULT_URL, :REDISTOGO_URL, :S3_KEY_PREFIX,
       :S3_ACCESS_KEY_ID, :S3_SECRET_ACCESS_KEY, :S3_DEFAULT_ACL, :S3_BUCKET,
-      :DOTFILE_PATH]
+      :DOTFILE_PATH, :S3_ENABLED]
 
     HEROKU_IGNORE = [:DOTFILE_PATH, :SHORTENER_URL, :REDISTOGO_URL]
 
@@ -21,6 +21,7 @@ class Shortener
       check_dotfile
       check_env
       @options = @options.merge!(opts)
+      @options[:DEFAULT_URL] ||= '/index'
     end
 
     def uri_for(end_point, opts = nil)
@@ -39,12 +40,50 @@ class Shortener
     end
 
     OPTIONS.each do |opt|
+      next if [:REDISTOGO_URL, :S3_ENABLED].include?(opt)
       method_name = opt.to_s.downcase.to_sym
       define_method "#{method_name}" do
         @options[opt]
       end
     end
 
+    def redistogo_url
+      begin
+        URI.parse(@options[:REDISTOGO_URL])
+      rescue Exception => boom
+        puts "Error parsing redistogo_url: #{@options[:REDISTOGO_URL]}"
+        puts "should probably be something like: redis://localhost:6379 if run locally"
+        puts "if you're on Heroku, make sure you have the RedisToGo addon installed.\n\n"
+        raise boom
+      end
+    end
+
+    def s3_enabled
+      @options[:S3_ENABLED].to_s == 'true'
+    end
+
+    def s3_policy
+      expiration_date = (Time.now + 36000).utc.strftime('%Y-%m-%dT%H:%M:%S.000Z') # 10.hours.from_now
+      max_filesize = 2147483648 # 2.gigabyte
+      policy = Base64.encode64(
+        "{'expiration': '#{expiration_date}',
+          'conditions': [
+          {'bucket': '#{s3_bucket}'},
+          ['starts-with', '$key', '#{s3_key_prefix}'],
+          {'acl': '#{s3_default_acl}'},
+          {'success_action_status': '201'},
+          ['starts-with', '$Filename', ''],
+          ['content-length-range', 0, #{max_filesize}]
+          ]
+          }"
+      ).gsub(/\n|\r/, '')
+    end
+
+    def s3_signature(policy)
+      signature = Base64.encode64(OpenSSL::HMAC.digest(
+        OpenSSL::Digest::Digest.new('sha1'), s3_secret_access_key, policy)).gsub("\n","")
+    end
+
     private
 
       def check_dotfile

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

@@ -16,6 +16,9 @@
               %a{href: '/index'} Index
             %li
               %a{href: '/add'} Add
+            - if $conf.s3_enabled
+              %li
+                %a{href: '/upload'} Upload
 
     #main.container(style="margin-top: 40px;")
       = yield

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

@@ -62,7 +62,7 @@
             //   data: "name=" + file.name,
             //   async: false,
             // });
-            $.post('/upload', values, function(data){
+            $.post('/upload.json', values, function(data){
               $('#shortener-display').text(data.url)
                 .removeClass('hide');
             });

data/lib/shortener/server.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'haml'
 require 'digest/sha1'
 require 'base64'
+require File.join(File.dirname(__FILE__), 'configuration')
 
 
 
@@ -15,19 +16,14 @@ class Shortener
     set :public_folder, File.join(dir, 'server', 'public')
 
     configure do
-      uri = URI.parse(ENV["REDISTOGO_URL"])
+      $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)
-      $default_url = ENV['DEFAULT_URL'] || '/index'
-      $s3_config = {
-        bucket:            ENV['S3_BUCKET'],
-        key_prefix:        ENV['S3_KEY_PREFIX'],
-        default_acl:       ENV['S3_DEFAULT_ACL'],
-        access_key_id:     ENV['S3_ACCESS_KEY_ID'],
-        secret_access_key: ENV['S3_SECRET_ACCESS_KEY']
-      }
     end
 
+    set(:s3_enabled) {|v| condition {$conf.s3_enabled == v}}
+
     helpers do
 
       def bad! message
@@ -92,7 +88,7 @@ class Shortener
         fname = params['file_name'].gsub(' ', '+')
         sha = Digest::SHA1.hexdigest(fname)
         hash_key = "data:#{sha}:#{key}"
-        url = "https://s3.amazonaws.com/#{$s3_config[:bucket]}/#{$s3_config[:key_prefix]}/#{fname}"
+        url = "https://s3.amazonaws.com/#{$conf.s3_bucket}/#{$conf.s3_key_prefix}/#{fname}"
         ext = File.extname(fname)[1..-1]
         extras = ['url', url, 's3', true, 'shortened', key, 'extension', ext, 'set-count', 1]
         data = params.keys.map {|k| [k, params[k]] }.flatten.concat(extras)
@@ -198,30 +194,6 @@ class Shortener
         ret
       end
 
-      def s3_policy
-        expiration_date = (Time.now + 36000).utc.strftime('%Y-%m-%dT%H:%M:%S.000Z') # 10.hours.from_now
-        max_filesize = 2147483648 # 2.gigabyte
-        policy = Base64.encode64(
-          "{'expiration': '#{expiration_date}',
-            'conditions': [
-            {'bucket': '#{$s3_config[:bucket]}'},
-            ['starts-with', '$key', '#{$s3_config[:key_prefix]}'],
-            {'acl': '#{$s3_config[:default_acl]}'},
-            {'success_action_status': '201'},
-            ['starts-with', '$Filename', ''],
-            ['content-length-range', 0, #{max_filesize}]
-            ]
-            }"
-        ).gsub(/\n|\r/, '')
-      end
-
-      def s3_signature(policy)
-        signature = Base64.encode64(OpenSSL::HMAC.digest(
-          OpenSSL::Digest::Digest.new('sha1'),
-          $s3_config[:secret_access_key], policy)
-        ).gsub("\n","")
-      end
-
     end
 
     before do
@@ -229,7 +201,7 @@ class Shortener
     end
 
     get '/' do
-      redirect $default_url
+      redirect $conf.default_url
     end
 
     get '/add' do
@@ -262,20 +234,20 @@ class Shortener
       end
     end
 
-    get '/upload' do
-      policy = s3_policy
-      signature = s3_signature(policy)
+    get '/upload', s3_enabled: true do
+      policy = $conf.s3_policy
+      signature = $conf.s3_signature(policy)
 
       @post = {
-        "key" => "#{$s3_config[:key_prefix]}/${filename}",
-        "AWSAccessKeyId" => "#{$s3_config[:access_key_id]}",
-        "acl" => "#{$s3_config[:default_acl]}",
+        "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://#{$s3_config[:bucket]}.s3.amazonaws.com/"
+      @upload_url = "http://#{$conf.s3_bucket}.s3.amazonaws.com/"
       haml :upload
     end
 
@@ -286,10 +258,10 @@ class Shortener
       if sha.nil?
         if (params[:captures].last == '.json')
           content_type :json
-          {success: false, message: 'Short not found'}.to_json
+          return {success: false, message: 'Short not found'}.to_json
         else
           puts "redirecting to default url"
-          redirect $default_url
+          redirect $conf.default_url
         end
       else
         key = "data:#{sha}:#{id}"
@@ -317,13 +289,15 @@ class Shortener
           end # => expired check
         end # => format
       end
+      puts "redirecting to default url"
+      redirect $conf.default_url
     end
 
     post '/upload.?:format?' do |format|
-      content_type :json
       short = set_upload_short(params['shortener'])
       puts "set #{short} to #{params['shortener']['file_name']}"
       if format == 'json'
+        content_type :json
         {url: short}.to_json
       else
         redirect :index

data/lib/shortener/version.rb

@@ -1,6 +1,6 @@
 
 class Shortener
 
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 
 end

data/tasks/heroku.rake

@@ -10,6 +10,7 @@ namespace :heroku do
     cmd += " && mkdir heroku/server"
     cmd += " && cp -r #{gem_file("lib/shortener/server/*")} ./heroku/server/"
     cmd += " && cp #{gem_file('lib/shortener/server.rb')} ./heroku/main.rb"
+    cmd += " && cp #{gem_file('lib/shortener/configuration.rb')} ./heroku/configuration.rb"
     cmd += " && mv ./heroku/server/config.ru.template ./heroku/config.ru"
     cmd += " && mv ./heroku/server/Gemfile ./heroku/server/Gemfile.lock ./heroku"
     cmd += " && git init heroku && cd heroku && git add . && git commit -m initial"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-25 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70253057029640 !ruby/object:Gem::Requirement
+  requirement: &70233398587560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253057029640
+  version_requirements: *70233398587560
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70253057028820 !ruby/object:Gem::Requirement
+  requirement: &70233398586580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253057028820
+  version_requirements: *70233398586580
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70253057027960 !ruby/object:Gem::Requirement
+  requirement: &70233398584580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253057027960
+  version_requirements: *70233398584580
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70253057023180 !ruby/object:Gem::Requirement
+  requirement: &70233398580400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253057023180
+  version_requirements: *70233398580400
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com