cloudapp 2.0.0.beta.4 → 2.0.0.beta.5

data/lib/cloudapp/service.rb

@@ -1,17 +1,14 @@
 require 'leadlight'
-require 'typhoeus'
-require 'cloudapp/authorized_representation'
+require 'cloudapp/authorized'
 require 'cloudapp/collection_json'
-require 'cloudapp/collection_json/tint'
-require 'cloudapp/drop'
-require 'cloudapp/drop_collection'
+require 'uri'
 
 module CloudApp
   class Service
-    Leadlight.build_service(self) do
-      url 'https://api.getcloudapp.com'
-      tints << CollectionJson::Tint
-      tints << AuthorizedRepresentation::Tint
+    Leadlight.build_service self do
+      url 'http://api.getcloudapp.com'
+      tints << CloudApp::CollectionJson::Tint
+      tints << CloudApp::Authorized::Tint
 
       build_connection do |c|
         c.adapter :typhoeus
@@ -20,173 +17,73 @@ module CloudApp
 
     def initialize
       super
-      # logger.level = Logger::INFO
       logger.level = Logger::WARN
     end
 
-    def token=(token)
-      connection.token_auth token
-    end
-
-    def self.using_token(token)
-      new.tap do |service|
-        service.token = token
-      end
-    end
-
-    def self.token_for_account(email, password)
-      representation = new.account_token email, password
-      return if representation.unauthorized?
-
-      representation.items.first.data['token']
-    end
-
-    def account_token(email, password)
-      authenticate_response = root
-      data = authenticate_response.template.
-               fill('email' => email, 'password' => password)
-
-      post(authenticate_response.href, data) do |response|
-        return response
-      end
+    def self.using_token token
+      service = new
+      service.token = token
+      service
     end
 
-    def drops(params = {})
-      params = params.each_with_object({}) {|(key, value), params|
-        params[key.to_s] = value
-      }
-
-      get('/') do |response|
-        return DropCollection.new(response, self) if response.unauthorized?
-
-        drops = response.link('drops').follow
-        return DropCollection.new(drops, self) if params.empty?
-
-        drops_query       = drops.query 'drops-list'
-        href              = Addressable::URI.parse drops_query.href
-        href.query_values = drops_query.fill params
-
-        get(href) do |response| return DropCollection.new(response, self) end
-      end
+    def token= token
+      connection.token_auth token
     end
 
-    def drop(href)
-      DropCollection.new drops_at(href), self
+    def self.token_for_account email, password
+      new.token_for_account(email, password)
     end
 
-    def update(href, options = {})
-      collection = drops_at href
-      drop       = collection.items.first
-      path       = options.fetch :path, nil
-      attributes = drop.data.merge fetch_drop_attributes(options)
-      data       = collection.template.fill attributes
-
-      put(drop.href, data) do |collection|
-        if not path
-          return collection
-        else
-          return upload_file(path, collection)
-        end
+    def token_for_account email, password
+      template = root.template
+                   .fill('email',    email)
+                   .fill('password', password)
+      post template.href, template.data do |representation|
+        return unless representation.authorized?
+        return representation.item.data.fetch('token')
       end
     end
 
-    def bookmark(url, options = {})
-      attributes = fetch_drop_attributes options.merge(url: url)
-      collection = drops_at :root
-      data       = collection.template.fill(attributes)
-
-      post(collection.href, data) do |response|
-        return DropCollection.new response, self
+    def bookmark url
+      template = drops_template.template.
+                   fill('bookmark_url', url)
+      post template.href, template.data do |representation|
+        return representation.item
       end
     end
 
-    def upload(path, options = {})
-      attributes = fetch_drop_attributes options.merge(path: path)
-      collection = drops_at :root
-      data       = collection.template.fill(attributes)
-
-      post(collection.href, data) do |collection|
-        return DropCollection.new upload_file(path, collection), self
+    def upload path
+      template = drops_template.template.
+                   fill('file_size', FileTest.size(path))
+      post template.href, template.data do |representation|
+        return upload_file(path, representation.template)
       end
     end
 
-    def trash_drop(href)
-      update href, trash: true
-    end
-
-    def recover_drop(href)
-      update href, trash: false
-    end
-
-    def delete_drop(href)
-      delete(href) do |response|
-        return response
+    def drops_template
+      root.link('drops-template').get do |representation|
+        return representation
       end
     end
 
   private
 
-    def drops_at(href, params = {})
-      params = params.each_with_object({}) {|(key, value), params|
-        params[key.to_s] = value
-      }
-
-      if href == :root
-        get('/') do |response|
-          return response if response.__response__.status == 401
-          href = response.link('drops').href
-        end
-      end
-
-      get(href) do |response|
-        return response if response.__response__.status == 401
-        if not params.empty?
-          drops_query = response.query('drops-list')
-          href        = Addressable::URI.parse drops_query.href
-          href.query_values = drops_query.fill params
-        else
-          return response
-        end
-      end
-
-      get(href) do |response|
-        return response if response.__response__.status == 401
-        return response
-      end
-    end
-
-    def fetch_drop_attributes(options)
-      path = options.delete :path
-      options[:file_size] = FileTest.size(path) if path
-      { url:       'bookmark_url',
-        file_size: 'file_size',
-        name:      'name',
-        private:   'private',
-        trash:     'trash'
-      }.each_with_object({}) {|(key, name), attributes|
-        attributes[name] = options.fetch(key) if options.has_key?(key)
-      }
-    end
-
-    def upload_file(path, collection)
-      uri     = Addressable::URI.parse collection.href
-      file    = File.open path
-      file_io = Faraday::UploadIO.new file, 'image/png'
-      fields  = collection.template.fill('file' => file_io)
+    def upload_file(path, template)
+      file     = File.open path
+      file_io  = Faraday::UploadIO.new file, 'image/png'  # TODO: Use correct mime type
+      template = template.fill('file', file_io)
+      uri      = Addressable::URI.parse template.href
 
       conn = Faraday.new(url: uri.site) {|builder|
-        if collection.template.enctype == Faraday::Request::Multipart.mime_type
-          builder.request :multipart
-        end
-
+        builder.request  :multipart
         builder.response :logger, logger
         builder.adapter  :typhoeus
       }
 
-      conn.post(uri.request_uri, fields).on_complete do |env|
+      conn.post(uri.request_uri, template.data).on_complete do |env|
         location = Addressable::URI.parse env[:response_headers]['Location']
-        get(location) do |upload_response|
-          return upload_response
+        get location do |upload_response|
+          return upload_response.item
         end
       end
     end

data/lib/cloudapp.rb

@@ -1,5 +1,3 @@
-require 'cloudapp/service'
-
 module CloudApp
-  VERSION = '2.0.0.beta.4'
+  VERSION = '2.0.0.beta.5'
 end

data/man/cloudapp.1

@@ -0,0 +1,100 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "CLOUDAPP" "1" "December 2012" "" ""
+.
+.SH "NAME"
+\fBcloudapp\fR \- all the pleasures of cloudapp in a cli
+.
+.SH "SYNOPSIS"
+\fBcloudapp bookmark\fR [\fB\-\-direct\fR] \fIurl\fR
+.
+.br
+\fBcloudapp upload\fR [\fB\-\-direct\fR] \fIfile\fR
+.
+.SH "DESCRIPTION"
+Upload a file or share a bookmark with CloudApp\. The drop\'s share link will be printed to standard output\. Account credentials are stored in \fB~/\.netrc\fR\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-d\fR, \fB\-\-direct\fR
+Print the drop\'s direct link after creation\. The direct link is suitable for use in places that expect a link to a file content like an HTML IMG tag\.
+.
+.SH "EXIT STATUS"
+cloudapp may return one of several error codes if it encouters problems\.
+.
+.IP "\(bu" 4
+\fB0\fR Success
+.
+.IP "\(bu" 4
+\fB1\fR File exceeds the limits of the account\'s plan
+.
+.IP "\(bu" 4
+\fB9\fR Something horrible has happened
+.
+.IP "" 0
+.
+.SH "FILES"
+.
+.TP
+\fB$HOME/\.netrc\fR
+Store account authentication token
+.
+.SH "EXAMPLE"
+Upload a file:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp upload screenshot\.png
+http://cl\.ly/abc123
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Copy the drop\'s share link to the clipboard on OS X:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp upload screenshot\.png | pbcopy
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Bookmark a URL:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp bookmark http://getcloudapp\.com
+http://cl\.ly/abc123
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Print the drop\'s direct link:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp upload \-\-direct screenshot\.png
+http://cl\.ly/abc123/screenshot\.png
+.
+.fi
+.
+.IP "" 0
+.
+.SH "SEE ALSO"
+\fBftp\fR(1)

data/man/cloudapp.1.html

@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>cloudapp(1) - all the pleasures of cloudapp in a cli</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .man-navigation {display:block !important;position:fixed;top:0;left:113ex;height:100%;width:100%;padding:48px 0 0 0;border-left:1px solid #dbdbdb;background:#eee}
+  .man-navigation a,.man-navigation a:hover,.man-navigation a:link,.man-navigation a:visited {display:block;margin:0;padding:5px 2px 5px 30px;color:#999;text-decoration:none}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#EXIT-STATUS">EXIT STATUS</a>
+    <a href="#FILES">FILES</a>
+    <a href="#EXAMPLE">EXAMPLE</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>cloudapp(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>cloudapp(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>cloudapp</code> - <span class="man-whatis">all the pleasures of cloudapp in a cli</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>cloudapp bookmark</code> [<code>--direct</code>] <var>url</var><br />
+<code>cloudapp upload</code>   [<code>--direct</code>] <var>file</var></p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Upload a file or share a bookmark with CloudApp. The drop's share link will be
+printed to standard output. Account credentials are stored in <code>~/.netrc</code>.</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<dl>
+<dt><code>-d</code>, <code>--direct</code></dt><dd>Print the drop's direct link after creation. The direct link is suitable for
+use in places that expect a link to a file content like an HTML IMG tag.</dd>
+</dl>
+
+
+<h2 id="EXIT-STATUS">EXIT STATUS</h2>
+
+<p>cloudapp may return one of several error codes if it encouters problems.</p>
+
+<ul>
+<li><code>0</code> Success</li>
+<li><code>1</code> File exceeds the limits of the account's plan</li>
+<li><code>9</code> Something horrible has happened</li>
+</ul>
+
+
+<h2 id="FILES">FILES</h2>
+
+<dl>
+<dt><code>$HOME/.netrc</code></dt><dd>Store account authentication token</dd>
+</dl>
+
+
+<h2 id="EXAMPLE">EXAMPLE</h2>
+
+<p>Upload a file:</p>
+
+<pre><code>$ cloudapp upload screenshot.png
+http://cl.ly/abc123
+</code></pre>
+
+<p>Copy the drop's share link to the clipboard on OS X:</p>
+
+<pre><code>$ cloudapp upload screenshot.png | pbcopy
+</code></pre>
+
+<p>Bookmark a URL:</p>
+
+<pre><code>$ cloudapp bookmark http://getcloudapp.com
+http://cl.ly/abc123
+</code></pre>
+
+<p>Print the drop's direct link:</p>
+
+<pre><code>$ cloudapp upload --direct screenshot.png
+http://cl.ly/abc123/screenshot.png
+</code></pre>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<p><code>ftp</code>(1)</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'></li>
+    <li class='tc'>December 2012</li>
+    <li class='tr'>cloudapp(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>

data/man/cloudapp.1.ronn

@@ -0,0 +1,56 @@
+cloudapp(1) -- all the pleasures of cloudapp in a cli
+=====================================================
+
+## SYNOPSIS
+
+`cloudapp bookmark` [`--direct`] <url><br>
+`cloudapp upload`   [`--direct`] <file>
+
+## DESCRIPTION
+
+Upload a file or share a bookmark with CloudApp. The drop's share link will be
+printed to standard output. Account credentials are stored in `~/.netrc`.
+
+## OPTIONS
+
+  - `-d`, `--direct`:
+    Print the drop's direct link after creation. The direct link is suitable for
+    use in places that expect a link to a file content like an HTML IMG tag.
+
+## EXIT STATUS
+
+cloudapp may return one of several error codes if it encouters problems.
+
+ - `0` Success
+ - `1` File exceeds the limits of the account's plan
+ - `9` Something horrible has happened
+
+## FILES
+
+  - `$HOME/.netrc`:
+    Store account authentication token
+
+## EXAMPLE
+
+Upload a file:
+
+    $ cloudapp upload screenshot.png
+    http://cl.ly/abc123
+
+Copy the drop's share link to the clipboard on OS X:
+
+    $ cloudapp upload screenshot.png | pbcopy
+
+Bookmark a URL:
+
+    $ cloudapp bookmark http://getcloudapp.com
+    http://cl.ly/abc123
+
+Print the drop's direct link:
+
+    $ cloudapp upload --direct screenshot.png
+    http://cl.ly/abc123/screenshot.png
+
+## SEE ALSO
+
+`ftp`(1)