short 0.3.3 → 0.4.0

data/Guardfile

@@ -0,0 +1,14 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/test_(.*)\.rb|)
+  watch(%r|^lib/shortener/(.*)\.rb|)     { |m| "test/test_#{m[1]}.rb" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
+
+  # with Minitest::Spec
+  # watch(%r|^spec/(.*)_spec\.rb|)
+  # watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
+  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+end

data/README.md

@@ -5,24 +5,89 @@ A super simple, Sinatra based, Redis backed URL shortener designed to be deploye
 
 Check it out [here](http://shortener1.heroku.com), but be aware that the css on the add page that displays the shortened link assumes you're using a short url, so it kind of looks like shit when it displays `http://shortener1.heroku.com/whatev`
 
-:edit: the version ^ there is an oldy but a goody. There's been a lot of feature creep since then which would muck up a demo. Very soon there will be a way to disable said feature creep and we'll get a new demo.
+for obvious reasons, the demo is configured with S3 disabled. However, if you are just looking
+to play around with `short` follow the instructions below and use `http://shortener1.heroku.com`
+as your the url you want to use.
 
-### Configuration
+### Installation
 
-Currently, short uses either environment variables or settings from a config file, ~/.shortener.
+is now as easy as 
+
+`gem install short`
+
+and 
+
+`short`
+
+which will then prompt you to supply the config vars necessary to use the short
+executable or the short server. You can check out `/lib/shortener/configuration.rb`
+to see a list of available configuration variables.
+
+configuration variables are parsed by default on-load and cached for each use,
+but all client methods allow override.
+
+### Server
+
+Shortener server provides a primitive API for interacting with shorts. You get the following.
 
-for the `short` client to work, you only need something like
 <pre>
----
-:SHORTENER_URL: http://< your shortener url>
+get '/index.json'      => info on all shorts.
+
+get '/delete/:id.json' => delete short @ id, returns {success: true, shortened: id}
+
+get '/:id.json'        => data hash for short @ id
+
+post '/add.json'       => data hash for new short
+        can accept the following options:
+          url:            the url to shorten
+          expire:         time in seconds that this short should live
+          max-clicks:     the maximum number of clicks this short should accept.
+          desired-short:  a short that should be set for this url.
+          allow-override: if desired-short is passed, whether or not to allow
+                          a random short override.
+
+post '/upload.json'    => data hash for new short,
+
+a data hash will contain the following keys:
+
+  shortened   => id of this short. i.e. 'xZ147'
+  url         => url of this short. i.e. 'www.google.com'
+  set-count   => number of times this url has been shortened.
+  click-count => number of times this short has been resolved.
+
+a data hash might contain the following keys:
+
+  expire      => expire key that will be checked to see if this key will expire
+  max-clicks  => maximum number of clicks this short will resolve for
+
+  if it's an endpoint that performs an action it will have a success key set to true or false.
+  (right now this is stupid and is set to true always, unless it errors, in which case you
+  get a 500 server error. hopefully that changes with some better error messages.)
+
+
+  S3 Keys
+
+    S3          => true if this is S3 content
+    extension   => the file extension of S3 content. i.e. 'm4v'
+    file\_name  => the name of the file. i.e. '1234.m4v'
+    name        => the descriptive name. i.e. 'Pandas'
+    description => the description. i.e. 'A panda sneezes'
 </pre>
 
-checkout `lib/shortener/configuration.rb` for more options that you can set.
+### Client
+
+`Shortener::Short` provides methods to access the server. You can access it through
+the `Shortener` class or directly through the `Shortener::Short` class. You get:
 
-I'm going to put together a better way of handling this soon, because right now
-it's kind of a mess.
+* shorten
+* index
+* fetch
+* delete
 
-### Usage
+methods, each of which will return a/n istance of the `Short` class which will 
+parse the data and provide some defaults and access to said data.
+
+### Executable
 
 Use the `short` executable to
 
@@ -44,12 +109,15 @@ Run `short rake -T` to see more info.
 
 ### License
 
+Short makes use of a number of libraries, each of which has its own license.
+
+Short uses the DWTFYWPL.
 
 <pre>
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
                     Version 2, December 2004
 
- Copyright (C) 20011 Jake Wilkins <jake AT jakewilkins DOT com>
+ Copyright (C) 20011 Jake Wilkins \<jake AT jakewilkins DOT com\>
 
  Everyone is permitted to copy and distribute verbatim or modified
  copies of this license document, and changing it is allowed as long

data/bin/short

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
-require 'shortener/client'
+require 'shortener'
 
 def start_web
   begin
@@ -27,18 +27,19 @@ def start_web
 end
 
 def shorten(url)
-  puts Shortener::Client.new.shorten(url)['url']
+  puts Shortener.shorten(url).short_url
 end
 
 def fetch(url)
   if url =~ /http:/
     url = url[-6..-1]
   end
-  fetched = Shortener::Client.new.fetch(url)
+  fetched = Shortener.fetch(url)
   unless fetched['success'] == false
     puts <<-EOF
   short       => #{fetched['shortened']}
   url         => #{fetched['url']}
+  short-url   => #{fetched.short_url}
   set-count   => #{fetched['set-count']}
   click-count => #{fetched['click-count']}
   expired     => #{fetched['expired']}
@@ -50,12 +51,12 @@ def fetch(url)
 end
 
 def delete(short)
-  del =  Shortener::Client.new.delete(short)
+  del =  Shortener.delete(short)
   puts "#{short} deleted" if del['success']
 end
 
 def show_index
-  index = Shortener::Client.new.index
+  index = Shortener.index
   short_summary = index.map do |v|
     url = v['url'].length > 38 ? "#{v['url'][0..25]}...#{v['url'][-10..-1]}" : "#{v['url']}"
     "#{v['shortened']} :   #{url}  #{v['type'].nil? ? '' : ('type: ' + v['type'])}"
@@ -151,6 +152,8 @@ when 'rake'
   do_action(:rake, ARGV[1])
 when 'delete'
   do_action(:delete, ARGV[1])
+when '-v', '--version'
+  puts "short version #{Shortener::VERSION}"
 else
   do_action(:shorten, ARGV[0])
 end

data/lib/shortener/configuration.rb

@@ -5,6 +5,14 @@ class Shortener
   # The class for storing Configuration Information
   class Configuration
 
+    class << self
+      def current
+        @current_configuration ||= Configuration.new(conf_current_placeholder: nil)
+      end
+    end
+
+    attr_accessor :options
+
     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, :S3_ENABLED]
@@ -17,13 +25,19 @@ class Shortener
     # priority goes dotfile < env < passed option
     def initialize(opts = Hash.new)
       # TODO check keys by calls opts.delete {|k| !OPTIONS.include?(k)
-      @options = Hash.new
-      check_dotfile
-      check_env
-      @options = @options.merge!(opts)
-      @options[:DEFAULT_URL] ||= '/index'
+      unless opts.empty?
+        opts.delete(:conf_current_placeholder)
+        @options = Hash.new
+        check_dotfile
+        check_env
+        @options = @options.merge!(opts)
+        @options[:DEFAULT_URL] ||= '/index'
+      else
+        @options = Configuration.current.options
+      end
     end
 
+    # return a URI for an endpoint based on this configuration
     def uri_for(end_point, opts = nil)
       if END_POINTS.include?(end_point.to_sym)
         path = path_for(end_point, opts)
@@ -33,6 +47,7 @@ class Shortener
       end
     end
 
+    # return a string ENV's for command line use.
     def to_params
       ret = Array.new
       @options.each {|k,v| ret << "#{k}=#{v}" unless HEROKU_IGNORE.include?(k)}
@@ -47,6 +62,7 @@ class Shortener
       end
     end
 
+    # return the URI for the redistogo url
     def redistogo_url
       begin
         URI.parse(@options[:REDISTOGO_URL])
@@ -58,10 +74,27 @@ class Shortener
       end
     end
 
+    # return a boolean of the S3_ENABLED option
     def s3_enabled
       @options[:S3_ENABLED].to_s == 'true'
     end
 
+    # are the necessary options present for S3 to work?
+    def s3_configured
+      ret = true
+      [:S3_KEY_PREFIX, :S3_ACCESS_KEY_ID, :S3_SECRET_ACCESS_KEY, 
+        :S3_DEFAULT_ACL, :S3_BUCKET ].each do |k|
+        ret = !@options[k].nil? unless ret == false
+      end
+      ret
+    end
+
+    # is S3 enabled and configured?
+    def s3_available
+      s3_enabled && s3_configured
+    end
+
+    # build an S3 policy.
     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
@@ -79,6 +112,7 @@ class Shortener
       ).gsub(/\n|\r/, '')
     end
 
+    # Sign an S3 policy
     def s3_signature(policy)
       signature = Base64.encode64(OpenSSL::HMAC.digest(
         OpenSSL::Digest::Digest.new('sha1'), s3_secret_access_key, policy)).gsub("\n","")
@@ -86,6 +120,7 @@ class Shortener
 
     private
 
+      # Parse the YAML dotfile if one exists
       def check_dotfile
         dotfile = @options[:DOTFILE_PATH] || File.join(ENV['HOME'], ".shortener")
         if File.exists?(dotfile)
@@ -93,6 +128,7 @@ class Shortener
         end
       end
 
+      # Check our environment for any overrides.
       def check_env
         OPTIONS.each do |opt|
           @options[opt] = ENV[opt.to_s] unless ENV[opt.to_s].nil?

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

@@ -1,5 +1,6 @@
 #link_display.row
-  %div.offset5.span4
+  - classs = @data['s3'].nil? ? 'offset5' : ''
+  %div.span4{class: classs}
     %h4= @url
   %div.span2
     = clippy(@url)

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

@@ -16,7 +16,7 @@
               %a{href: '/index'} Index
             %li
               %a{href: '/add'} Add
-            - if $conf.s3_enabled
+            - if $conf.s3_available
               %li
                 %a{href: '/upload'} Upload
 

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

@@ -63,7 +63,7 @@
             //   async: false,
             // });
             $.post('/upload.json', values, function(data){
-              $('#shortener-display').text(data.url)
+              $('#shortener-display').html(data.html)
                 .removeClass('hide');
             });
 
@@ -102,7 +102,7 @@
         %li.radio
           %input{name: 'shortener[type]', type: 'radio', value: 'download'} Download
       .row
-        %label.offset8.hide{id: 'shortener-display'}
+        #shortener-display.offset8.hide
       .field
         %label{for: 'shorterner[name]'} Name
         %input{type: 'text', name: 'shortener[name]'}

data/lib/shortener/server.rb

@@ -22,7 +22,7 @@ class Shortener
       $redis = Redis::Namespace.new(:shortener, redis: _redis)
     end
 
-    set(:s3_enabled) {|v| condition {$conf.s3_enabled == v}}
+    set(:s3_available) {|v| condition {$conf.s3_available == v}}
 
     helpers do
 
@@ -75,11 +75,11 @@ class Shortener
         end
 
         unless params['max-clicks'] || params['expire'] || params['desired-short']
-          id = check_cache(url)
+          data = check_cache(url)
         end
-        id ||= shorten(url, params)
+        data ||= shorten(url, params)
 
-        return "#{base_url}/#{id}", id
+        data
       end
 
       def set_upload_short(params)
@@ -90,13 +90,14 @@ class Shortener
         hash_key = "data:#{sha}:#{key}"
         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)
+        data = {'url' => url, 's3' => true, 'shortened' => key, 
+          'extension' => ext, 'set-count' => 1}
+        data = params.merge(data)
 
         $redis.set(key, sha)
-        $redis.hmset(hash_key, *data)
+        $redis.hmset(hash_key, *arrayify_hash(data))
 
-        "#{base_url}/#{key}"
+        data
       end
 
       def shorten(url, options = {})
@@ -116,7 +117,7 @@ class Shortener
               if (!prev_set['max-clicks'] && !prev_set['expire'] &&
                 (prev_set['url'] == url.to_s))
                 $redis.hincrby(check_key, 'set-count', 1)
-                return options['desired-short']
+                return prev_set
               end
             end
 
@@ -136,19 +137,19 @@ class Shortener
         sha = Digest::SHA1.hexdigest(url.to_s)
         $redis.set(key, sha)
 
-        hsh_data = ['shortened', key, 'url', url, 'set-count', 1]
-        hsh_data.concat(['max-clicks', options['max-clicks'].to_i]) if options['max-clicks']
+        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.concat(['expire', ttl_key])
+          hsh_data[:expire] = ttl_key
         end
-        $redis.hmset("data:#{sha}:#{key}", *hsh_data)
+        $redis.hmset("data:#{sha}:#{key}", *arrayify_hash(hsh_data))
 
-        key
+        hsh_data
       end
 
       def check_cache(url)
@@ -158,7 +159,7 @@ class Shortener
           short = $redis.hgetall(key)
           unless short == {} || short['expire'] || short['max-clicks']
             $redis.hincrby(key, 'set-count', 1)
-            return short['shortened']
+            return short
           end
         end
         nil
@@ -194,6 +195,10 @@ class Shortener
         ret
       end
 
+      def arrayify_hash(hsh)
+        hsh.keys.map {|k| [k, hsh[k]] }.flatten
+      end
+
     end
 
     before do
@@ -224,17 +229,16 @@ class Shortener
     end
 
     get '/delete/:id.:format' do |id, format|
-      puts "#{id}, #{format}"
       delete_short(id)
       if format == 'json'
         content_type :json
-        {success: true, short: id}.to_json
+        {success: true, shortened: id}.to_json
       else
         redirect :index
       end
     end
 
-    get '/upload', s3_enabled: true do
+    get '/upload', s3_available: true do
       policy = $conf.s3_policy
       signature = $conf.s3_signature(policy)
 
@@ -294,11 +298,12 @@ class Shortener
     end
 
     post '/upload.?:format?' do |format|
-      short = set_upload_short(params['shortener'])
-      puts "set #{short} to #{params['shortener']['file_name']}"
+      @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
-        {url: short}.to_json
+        @data.merge({html: haml(:display, layout: false)}).to_json
       else
         redirect :index
       end
@@ -312,11 +317,12 @@ class Shortener
         # essentally, params = params
       end
 
-      @url, id = set_or_fetch_url(params["shortener"])
+      @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
-        {success: true, short: id, url:  @url, html: haml(:display, :layout => false)}.to_json
+        @data.merge({success: true, html: haml(:display, :layout => false)}).to_json
       else
         haml :display
       end

data/lib/shortener/short.rb

@@ -0,0 +1,147 @@
+
+class Shortener
+  class Short
+
+    SHORT_KEYS = [:url, :shortened, :type, :ext, :s3, :'click-count', :'max-count',
+      :'set-count', :'expire-time', :sha]
+
+    attr_reader :data
+
+    module ClassMethods
+
+      # set a shortened url
+      def shorten(url, conf = nil)
+        opts = {'shortener' =>  {'url' => url}.to_json}
+        response = request(:post, :add, conf, opts)
+        if response.is_a?(Net::HTTPOK)
+          return Short.new(response.body, conf)
+        else
+          raise "OH SHIT! #{response}"
+        end
+      end
+
+      # get data for a short, including full url.
+      def fetch(short, conf = nil)
+        response = request(:get, :fetch, conf, short)
+        Short.new(response.body, conf)
+      end
+
+      # post a file to the configured s3 bucket and set a short.
+      def upload(file)
+      end
+
+      # fetch data on multiple shorts
+      def index(start = 0, stop = nil, conf = nil)
+        response = request(:get, :index, conf)
+        data = JSON.parse(response.body)
+        shorts = data.map {|sh| Short.new(sh, conf)}
+        shorts
+      end
+
+      # delete a short
+      def delete(short, conf = nil)
+        response = request(:get, :delete, conf, short)
+        Short.new(response.body, conf)
+      end
+
+      # build a request based on configurations
+      def request(type, end_point, conf = nil, args = nil)
+        config = conf || Shortener::Configuration.current
+        case type
+        when :post
+          Net::HTTP.post_form(config.uri_for(end_point), args)
+        when :get
+          Net::HTTP.get_response(config.uri_for(end_point, args))
+        end
+      end
+
+    end # => ClassMethods
+
+    class << self; include ClassMethods; end
+
+    # Set up this short. Will:
+    # * store the configuration if necessary
+    # * parse JSON if short is JSON
+    # * symbolize the shorts keys
+    # * turn string numbers in to actual numbers.
+    def initialize(short, conf = nil)
+      @configuration = conf unless conf.nil?
+      short = parse_return(short) unless short.is_a?(Hash)
+      @data = symbolize_keys(short)
+      normalize_data
+    end
+
+    # the configuration that this short will use.
+    def configuration
+      @configuation.nil? ? Shortener::Configuration.current : @configuration
+    end
+
+    # an alternative way to fetch stuff from @data
+    def [](key)
+      @data[key.to_sym]
+    end
+
+    # return a URI of the URL
+    def uri
+      URI.parse(url)
+    end
+
+    # shortened combined with config#shortener_url
+    def short_url
+      "#{configuration.shortener_url}/#{shortened}"
+    end
+
+    # a URI of short url.
+    def short_uri
+      URI.parse(short_url)
+    end
+
+    # allow the updating of a field. considering an arity like:
+    # update(hsh_of_fields_with_values)
+    # and it will create a POST request to send server side.
+    def update
+      #TODO
+    end
+
+    SHORT_KEYS.each do |key|
+      name = key.to_s.include?('-') ? key.to_s.gsub('-', '_').to_sym : key
+      define_method name do
+        @data[key]
+      end
+    end
+
+    def pretty_print
+
+    end
+
+    private
+
+      # used to turn the hash keys of the data hash in to symbols.
+      def symbolize_keys(hash)
+        ret = Hash.new
+        hash.each do |k,v|
+          ret[k.to_sym] = v
+        end
+        ret
+      end
+
+      # turn string numbers in to actual numbers.
+      def normalize_data
+        [:'click-count', :'max-count', :'set-count'].each do |k|
+          @data[k] = @data[k].to_i
+        end
+        @data[:'click-count'] ||= 0
+      end
+
+      # parse JSON safely.
+      def parse_return(json)
+        begin
+          return JSON.parse(json)
+        rescue Exception => boom
+          raise "OH SHIT! #{boom}\n\n #{json}"
+        end
+      end
+
+  end
+end
+require_relative '../shortener'

data/lib/shortener/version.rb

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

data/lib/shortener.rb

@@ -1,9 +1,12 @@
+require 'uri'
+require 'json'
+require 'net/http'
 dir = File.expand_path(File.dirname(__FILE__))
 
 require File.join(dir, 'shortener', 'version')
-require File.join(dir, 'shortener', 'client')
 require File.join(dir, 'shortener', 'configuration')
+require File.join(dir, 'shortener', 'short')
 
 class Shortener
-
+  class << self; include Shortener::Short::ClassMethods; end
 end

data/tasks/heroku.rake

@@ -22,7 +22,7 @@ namespace :heroku do
     require_relative '../lib/shortener'
     $name = ENV['APPNAME'] || "shner-#{`whoami`.chomp}"
     cmd = Dir.pwd =~ /heroku$/ ? "" : "cd heroku && "
-    cmd += "heroku create #{name}"
+    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"

data/test/test_short.rb

@@ -0,0 +1,68 @@
+require 'minitest/autorun'
+require_relative '../lib/shortener/short'
+
+class TestShortenerShort < MiniTest::Unit::TestCase
+
+  def setup
+    @short = Shortener::Short.new('url' => 'http://google.com', 'shortened' => '12345',
+        'set-count' => '12')
+  end
+
+  def test_instance_methods
+    assert @short.shortened == '12345'
+    assert @short.url == 'http://google.com'
+    assert @short.set_count == 12
+  end
+
+  def test_brackets
+    assert @short['shortened'] == '12345'
+    assert @short[:shortened] == '12345'
+    assert @short['set-count'] == 12
+  end
+
+  def test_defaults_ensure_keys
+    short = Shortener.shorten('www.google.com')
+    assert !short.shortened.nil?
+    assert !short.url.nil?
+    assert !short.set_count.nil?
+    assert !short.click_count.nil?
+  end
+
+  def test_short_url
+    assert @short.short_url == "#{@short.configuration.shortener_url}/#{@short.shortened}"
+  end
+
+  def test_uri
+    assert @short.uri == URI.parse(@short.url)
+  end
+
+  def test_add
+    short = Shortener::Short.shorten('www.google.com')
+    assert short.is_a?(Shortener::Short)
+    assert short.shortened.nil? == false
+    assert short.url == 'http://www.google.com'
+    assert short['success']
+  end
+
+  def test_index
+    ind = Shortener::Short.index
+    assert ind.is_a?(Array)
+    assert ind.length >= 1
+    assert ind.first.is_a?(Shortener::Short)
+  end
+
+  def test_fetch
+    short = Shortener.shorten('www.google.com')
+    short2 = Shortener::Short.fetch(short.shortened)
+    assert short.shortened == short2.shortened
+    short = Shortener.fetch('nope')
+    assert short[:success] == false
+  end
+
+  def test_delete
+    add = Shortener.shorten('www.google.com')
+    del = Shortener.delete(add['shortened'])
+    assert del['success']
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: short
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70233398587560 !ruby/object:Gem::Requirement
+  requirement: &70301329586160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233398587560
+  version_requirements: *70301329586160
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70233398586580 !ruby/object:Gem::Requirement
+  requirement: &70301329585240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233398586580
+  version_requirements: *70301329585240
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70233398584580 !ruby/object:Gem::Requirement
+  requirement: &70301329583820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233398584580
+  version_requirements: *70301329583820
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70233398580400 !ruby/object:Gem::Requirement
+  requirement: &70301329582280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233398580400
+  version_requirements: *70301329582280
 description: A (hopefully) easy and handy deployable APIable way to shorten links.
 email:
 - jake@jakewilkins.com
@@ -64,12 +64,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Guardfile
 - README.md
 - Rakefile
 - bin/short
 - config.ru
 - lib/shortener.rb
-- lib/shortener/client.rb
 - lib/shortener/configuration.rb
 - lib/shortener/server.rb
 - lib/shortener/server/Gemfile
@@ -100,12 +100,13 @@ files:
 - lib/shortener/server/views/s3/layout.haml
 - lib/shortener/server/views/s3/video.haml
 - lib/shortener/server/views/upload.haml
+- lib/shortener/short.rb
 - lib/shortener/version.rb
 - short.gemspec
 - tasks/heroku.rake
-- test/test_client.rb
 - test/test_configuration.rb
 - test/test_server.rb
+- test/test_short.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -131,6 +132,6 @@ signing_key:
 specification_version: 3
 summary: A Link Shortener
 test_files:
-- test/test_client.rb
 - test/test_configuration.rb
 - test/test_server.rb
+- test/test_short.rb

data/lib/shortener/client.rb

@@ -1,69 +0,0 @@
-dir = File.expand_path(File.dirname(__FILE__))
-require 'net/http'
-require 'json'
-require File.join(dir, 'configuration')
-
-class Shortener
-  class Client
-
-    attr_accessor :configuration
-
-    def initialize(options = Hash.new)
-      @configuration = Configuration.new(options)
-    end
-
-    # set a shortened url
-    def shorten(url)
-      opts = {'shortener' =>  {'url' => url}.to_json}
-      response= request(:post, :add, opts)
-      if response.is_a?(Net::HTTPOK)
-        return parse_return(response.body)
-      else
-        raise "OH SHIT! #{response}"
-      end
-    end
-
-    # get data for a short, including full url.
-    def fetch(short)
-      response = request(:get, :fetch, short)
-      parse_return(response)
-    end
-
-    # post a file to the configured s3 bucket and set a short.
-    def upload(file)
-    end
-
-    # fetch data on multiple shorts
-    def index(start = 0, stop = nil)
-      response = request(:get, :index)
-      parse_return(response)
-    end
-
-    # delete a short
-    def delete(short)
-      response = request(:get, :delete, short)
-      parse_return(response)
-    end
-
-    private
-
-      # build a request based on configurations
-      def request(type, end_point, args = nil)
-        case type
-        when :post
-          Net::HTTP.post_form(@configuration.uri_for(end_point), args)
-        when :get
-          Net::HTTP.get(@configuration.uri_for(end_point, args))
-        end
-      end
-
-      def parse_return(json)
-        begin
-          return JSON.parse(json)
-        rescue Exception => boom
-          raise "OH SHIT! #{boom}\n\n #{json}"
-        end
-      end
-
-  end # => Client
-end # => Shortener

data/test/test_client.rb

@@ -1,26 +0,0 @@
-require 'minitest/autorun'
-require_relative '../lib/shortener/client'
-
-class TestShortenerClient < MiniTest::Unit::TestCase
-
-  def setup
-    @client = Shortener::Client.new
-  end
-
-  def test_add
-    short = @client.shorten('www.google.com')
-    assert short['success']
-  end
-
-  def test_index
-    ind = @client.index
-    assert ind.is_a?(Array)
-  end
-
-  def test_delete
-    add = @client.shorten('www.google.com')
-    del = @client.delete(add['short'])
-    assert del['success']
-  end
-
-end