cloudapp 1.1.0 → 2.0.0.beta.1

data/lib/cloudapp/service.rb

@@ -0,0 +1,172 @@
+require 'leadlight'
+require 'typhoeus'
+require 'cloudapp/authorized_representation'
+require 'cloudapp/collection_json'
+require 'cloudapp/collection_json/tint'
+
+module CloudApp
+  class Service
+    Leadlight.build_service(self) do
+      url 'https://api.getcloudapp.com'
+      tints << CollectionJson::Tint
+      tints << AuthorizedRepresentation::Tint
+    end
+
+    Leadlight.build_connection_common do |builder|
+      builder.adapter :typhoeus
+    end
+
+    def initialize
+      super
+      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 token_for_account(email, password)
+      authenticate_response = root
+      data = authenticate_response.template.
+               fill('email' => email, 'password' => password)
+
+      post(authenticate_response.href, {}, data) do |response|
+        return response
+      end
+    end
+
+    def drops(options = {})
+      href   = options[:href] || :root
+      params = options.has_key?(:href) ? {} : options
+
+      drops_at href, params
+    end
+
+    def drop_at(href)
+      drops_at href
+    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
+      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 response
+      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 upload_file(path, collection)
+      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
+      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        = drops_query.href
+          params      = drops_query.fill(params)
+        else
+          return response
+        end
+      end
+
+      get(href, params) 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)
+
+      conn = Faraday.new(url: uri.site) {|builder|
+        if collection.template.enctype == Faraday::Request::Multipart.mime_type
+          builder.request :multipart
+        end
+
+        builder.response :logger, logger
+        builder.adapter  :typhoeus
+      }
+
+      conn.post(uri.request_uri, fields).on_complete do |env|
+        location = Addressable::URI.parse env[:response_headers]['Location']
+        get(location) do |upload_response|
+          return upload_response
+        end
+      end
+    end
+  end
+end

data/lib/cloudapp/token.rb

@@ -0,0 +1,27 @@
+# Usage:
+#
+#   # Retrieve an account's token
+#   token = CloudApp::Token.for_account 'arthur@dent.com', 'towel'
+#
+module CloudApp
+  class Token
+    class << self
+      attr_writer :service_source
+    end
+
+    def self.service_source
+      @service_source ||= CloudApp::Service.public_method(:new)
+    end
+
+    def self.service
+      service_source.call
+    end
+
+    def self.for_account(email, password)
+      representation = service.token_for_account email, password
+      return if representation.unauthorized?
+
+      representation.items.first.data['token']
+    end
+  end
+end

data/lib/cloudapp.rb

@@ -1,3 +1,7 @@
+require 'cloudapp/account'
+require 'cloudapp/service'
+require 'cloudapp/token'
+
 module CloudApp
-  VERSION = '1.1.0'
+  VERSION = '2.0.0.beta.1'
 end

data/man/cloudapp.1

@@ -1,25 +1,34 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CLOUDAPP" "1" "February 2012" "" ""
+.TH "CLOUDAPP" "1" "May 2012" "" ""
 .
 .SH "NAME"
 \fBcloudapp\fR \- All the pleasures of CloudApp now at your terminal
 .
 .SH "SYNOPSIS"
-\fBcloudapp\fR [\fB\-\-format\fR=\fIformat\fR] \fIcommand\fR [\fIargs\fR]
+\fBcloudapp\fR [\fIglobal\fR] \fBlist\fR [\fIoptions\fR]
 .
 .br
-\fBcloudapp list\fR [\fB\-\-count\fR=\fIcount\fR]
+\fBcloudapp\fR [\fIglobal\fR] \fBdetails\fR \fIhref\fR [\fIhref\fR\.\.\.]
 .
 .br
-\fBcloudapp bookmark\fR [\fB\-\-private\fR] [\fB\-\-public\fR] \fIurl\fR [\fIurl\fR\.\.\.]
+\fBcloudapp\fR [\fIglobal\fR] \fBbookmark\fR [\fIoptions\fR] \fIurl\fR [\fIurl\fR\.\.\.]
 .
 .br
-\fBcloudapp upload\fR [\fB\-\-private\fR] [\fB\-\-public\fR] \fIfile\fR [\fIfile\fR\.\.\.]
+\fBcloudapp\fR [\fIglobal\fR] \fBupload\fR [\fIoptions\fR] \fIfile\fR [\fIfile\fR\.\.\.]
 .
 .br
-\fBcloudapp download\fR [\fB\-\-output\fR=\fIfile\fR] \fIurl\fR
+\fBcloudapp\fR [\fIglobal\fR] \fBupdate\fR [\fIoptions\fR] \fIhref\fR [\fIhref\fR\.\.\.]
+.
+.br
+\fBcloudapp\fR [\fIglobal\fR] \fBtrash\fR \fIhref\fR [\fIhref\fR\.\.\.]
+.
+.br
+\fBcloudapp\fR [\fIglobal\fR] \fBrecover\fR \fIhref\fR [\fIhref\fR\.\.\.]
+.
+.br
+\fBcloudapp\fR [\fIglobal\fR] \fBdelete\fR \fIhref\fR [\fIhref\fR\.\.\.]
 .
 .SH "DESCRIPTION"
 \fBcloudapp\fR is a simple, Unix\-friendly tool for CloudApp meant to augment the Mac and Web apps\. Sometimes it\'s more convenient to share without leaving the terminal and other times it\'s the only tool available\.
@@ -27,63 +36,95 @@
 .SH "GLOBAL OPTIONS"
 .
 .TP
-\fB\-f\fR \fIformat\fR, \fB\-\-format\fR=\fIformat\fR
+\fB\-f\fR \fIpretty,csv\fR, \fB\-\-format\fR=\fIpretty,csv\fR
 Output using either \fBpretty\fR or \fBcsv\fR format\. (Default: \fBpretty\fR when output to a terminal and \fBcsv\fR when output is piped to another program\.)
 .
 .SH "COMMANDS"
 .
 .TP
-\fBbookmark\fR [\fB\-\-private\fR] [\fB\-\-public\fR] [\fIurl\fR\.\.\.]
-Create a new bookmark to each \fIurl\fR and print each link\.
+\fB\-\-bookmark\fR=\fIurl\fR
+Update the drop converting it into a bookmark to \fIurl\fR\.
+.
+.TP
+\fBbookmark\fR [\fB\-\-private\fR] [\fB\-\-public\fR] \fIurl\fR [\fIurl\fR\.\.\.]
+Create a new bookmark to each \fIurl\fR and print the share links\.
+.
+.TP
+\fBdelete\fR \fIhref\fR [\fIhref\fR\.\.\.]
+Delete each drop at \fIhref\fR immediately and bypass the trash\.
+.
+.TP
+\fBdetails\fR \fIhref\fR [\fIhref\fR\.\.\.]
+View the details of each drop at \fIhref\fR\.
+.
+.TP
+\fBlist\fR, \fBls\fR [\fB\-\-count\fR=\fIcount\fR] [\fB\-\-filter\fR=\fIactive,trash,all\fR]
+List the newest \fIcount\fR of \fIfilter\fR drops\. The default is to list \fB20 active\fR drops\.
+.
+.TP
+\fBrecover\fR \fIhref\fR [\fIhref\fR\.\.\.]
+Recover each drop at \fIhref\fR from the trash\.
 .
 .TP
-\fBdownload\fR [\fB\-\-output\fR=\fIfile\fR] \fIurl\fR
-Download the file at \fIurl\fR to the current directory or to \fIfile\fR if present\.
+\fBtrash\fR \fIhref\fR [\fIhref\fR\.\.\.]
+Send each drop at \fIhref\fR to the trash\.
 .
 .TP
-\fBlist\fR [\fB\-\-count\fR=\fIcount\fR]
-List the most recent \fIcount\fR drops\. The default is to list \fB20\fR drops\.
+\fBupdate\fR [\fB\-\-name\fR=\fIname\fR] [\fB\-\-private\fR] [\fB\-\-public\fR] [\fB\-\-bookmark\fR=\fIurl\fR] [\fB\-\-file\fR=\fIfile\fR] \fIhref\fR [\fIhref\fR\.\.\.]
+Update the name, privacy, bookmark link, or file of each drop at \fIhref\fR\.
 .
 .TP
 \fBupload\fR [\fB\-\-private\fR] [\fB\-\-public\fR] \fIfile\fR [\fIfile\fR\.\.\.]
-Upload each \fIfile\fR and print each link\.
+Upload each \fIfile\fR and print the share links\.
 .
 .SH "COMMAND OPTIONS"
 .
 .TP
+\fB\-\-bookmark\fR=\fIurl\fR
+Update the drop converting it into a bookmark to \fIurl\fR\.
+.
+.TP
+\fB\-\-file\fR=\fIfile\fR
+Update the drop converting it into a file and replacing its content with \fIfile\fR\.
+.
+.TP
+\fB\-\-filter\fR=\fIactive,trash,all\fR
+Show \fIfilter\fR drops\. (Default: \fBactive\fR)
+.
+.TP
 \fB\-n\fR \fIcount\fR, \fB\-\-count\fR=\fIcount\fR
 Display \fIcount\fR drops\. (Default: \fB20\fR)
 .
 .TP
-\fB\-o\fR \fIfile\fR, \fB\-\-output\fR=\fIfile\fR
-Download file as \fIfile\fR\. (Default: current directory using the remote file\'s name)
+\fB\-\-name\fR=\fIname\fR
+Update the drop\'s name to \fIname\fR\.
 .
 .TP
 \fB\-\-private\fR
-Use a private (long) link when creating a new drop\.
+Use a private (long) link for the drop\.
 .
 .TP
 \fB\-\-public\fR
-Use a public (short) link when creating a new drop\.
+Use a public (short) link for the drop\.
 .
 .SH "REQUIREMENTS"
 \fBcloudapp\fR requires Ruby 1\.9\.2 or greater\.
 .
 .SH "EXAMPLES"
-List newest 20 drops:
+List the newest drops:
 .
 .IP "" 4
 .
 .nf
 
 $ cloudapp list
-Name                    Link                  Views
-favicon\.ico             http://cl\.ly/0P28\.\.\.  3
-The Hitchhiker\'s Guide  http://cl\.ly/3I28\.\.\.  4
-CloudApp 1\.5 Released   http://cl\.ly/0s1o\.\.\.  4
-Cover\.jpeg              http://cl\.ly/1x20\.\.\.  1
-Chapter 1\.md            http://cl\.ly/3U3d\.\.\.  7
-CloudApp                http://cl\.ly/2O2J\.\.\.  3
+Name                    Views  Href
+favicon\.ico             1      http://api\.getcloudapp\.com/\.\.\.
+The Hitchhiker\'s Guide  0      http://api\.getcloudapp\.com/\.\.\.
+CloudApp 1\.5 Released   5      http://api\.getcloudapp\.com/\.\.\.
+Cover\.jpeg              23     http://api\.getcloudapp\.com/\.\.\.
+Chapter 1\.md            8      http://api\.getcloudapp\.com/\.\.\.
+CloudApp                3      http://api\.getcloudapp\.com/\.\.\.
   \.\.\.
 .
 .fi
@@ -91,19 +132,35 @@ CloudApp                http://cl\.ly/2O2J\.\.\.  3
 .IP "" 0
 .
 .P
-List newest 5 drops:
+List the 5 newest drops:
 .
 .IP "" 4
 .
 .nf
 
 $ cloudapp list \-\-count=5
-Name                    Link                  Views
-favicon\.ico             http://cl\.ly/0P28\.\.\.  3
-The Hitchhiker\'s Guide  http://cl\.ly/3I28\.\.\.  4
-CloudApp 1\.5 Released   http://cl\.ly/0s1o\.\.\.  4
-Cover\.jpeg              http://cl\.ly/1x20\.\.\.  1
-Chapter 1\.md            http://cl\.ly/3U3d\.\.\.  7
+Name                    Views  Href
+favicon\.ico             1      http://api\.getcloudapp\.com/\.\.\.
+The Hitchhiker\'s Guide  0      http://api\.getcloudapp\.com/\.\.\.
+CloudApp 1\.5 Released   5      http://api\.getcloudapp\.com/\.\.\.
+Cover\.jpeg              23     http://api\.getcloudapp\.com/\.\.\.
+Chapter 1\.md            8      http://api\.getcloudapp\.com/\.\.\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+List newest, deleted drops:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp list \-\-filter=trash
+Name       Views  Href
+Delete Me  0      http://api\.getcloudapp\.com/\.\.\.
+  \.\.\.
 .
 .fi
 .
@@ -117,12 +174,50 @@ List newest 5 drops in CSV format:
 .nf
 
 $ cloudapp \-\-format=csv list \-\-count=5
-Name,Link,Views
-favicon\.ico,http://cl\.ly/0P28\.\.\.,3
-The Hitchhiker\'s Guide to the Galaxy,http://cl\.ly/3I28\.\.\.,4
-2011\-05\-03\-cloudapp\-1\.5\-released\.md,http://cl\.ly/0s1o\.\.\.,4
-Cover\.jpeg,http://cl\.ly/1x20\.\.\.,1
-Chapter 1\.md,http://cl\.ly/3U3d\.\.\.,7
+Name,Href,Share,Views
+favicon\.ico,http://api\.getcloudapp\.com/\.\.\.,http://cl\.ly/0P28\.\.\.,3
+The Hitchhiker\'s Guide to the Galaxy,http://api\.getcloudapp\.com/\.\.\.,http://cl\.ly/3I28\.\.\.,4
+2011\-05\-03\-cloudapp\-1\.5\-released\.md,http://api\.getcloudapp\.com/\.\.\.,http://cl\.ly/0s1o\.\.\.,4
+Cover\.jpeg,http://api\.getcloudapp\.com/\.\.\.,http://cl\.ly/1x20\.\.\.,1
+Chapter 1\.md,http://api\.getcloudapp\.com/\.\.\.,http://cl\.ly/3U3d\.\.\.,7
+.
+.fi
+.
+.IP "" 0
+.
+.P
+View the details of a drop by its \fBhref\fR:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp details http://api\.getcloudapp\.com/drops/12345
+Details
+  Name:     Cover\.jpeg
+  Views:    23
+  Privacy:  Private
+
+Links
+  Share:    http://cl\.ly/1x200A0m3v101d1n2O1u
+  Embed:    http://cl\.ly/1x200A0m3v101d1n2O1u/Cover\.jpeg
+  Download: http://cl\.ly/1x200A0m3v101d1n2O1u/download/Cover\.jpeg
+  Href:     http://api\.getcloudapp\.com/drops/13949858
+.
+.fi
+.
+.IP "" 0
+.
+.P
+View the details of a drop in CSV format:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp \-\-format=csv details http://api\.getcloudapp\.com/drops/12345
+Name,Created,Privacy,Share,Embed,Download
+Cover\.jpg,2012\-01\-12T20:44:58Z,private,http://cl\.ly/1x20\.\.\.,http://cl\.ly/1x20\.\.\.,http://cl\.ly/1x20\.\.\.
 .
 .fi
 .
@@ -185,28 +280,90 @@ http://cl\.ly/1y0j403g3D0c0X1G0R3m
 .IP "" 0
 .
 .P
-Download a drop to the current direcctory:
+Update a drop with a new name and privacy:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp update \-\-public \e
+                  \-\-name=\'The Late, Great Douglas Adams\' \e
+                  http://api\.getcloudapp\.com/drops/12345
+Updating\.\.\. http://cl\.ly/abc123
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Update a drop with a new bookmark URL:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp update \-\-bookmark=http://douglasadams\.com \e
+                  http://api\.getcloudapp\.com/drops/12345
+Updating\.\.\. http://cl\.ly/1y0j403g3D0c0X1G0R3m
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Update a drop with a new file:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp update \-\-file=screenshot\.png \e
+                  http://api\.getcloudapp\.com/drops/12345
+Updating\.\.\. http://cl\.ly/1y0j403g3D0c0X1G0R3m
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Trash a drop:
+.
+.IP "" 4
+.
+.nf
+
+$ cloudapp trash http://api\.getcloudapp\.com/drops/12345
+Trashing http://api\.getcloudapp\.dev/drops/12345\.\.\. done
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Recovering a drop:
 .
 .IP "" 4
 .
 .nf
 
-$ cloudapp download http://cl\.ly/040u2o3X1w0z1z3n2T04
-Downloading screenshot\.png\.\.\. done
+$ cloudapp recover http://api\.getcloudapp\.com/drops/12345
+Recovering http://api\.getcloudapp\.dev/drops/12345\.\.\. http://cl\.ly/1y0j\.\.\.
 .
 .fi
 .
 .IP "" 0
 .
 .P
-Download a drop to another path:
+Deleting a drop:
 .
 .IP "" 4
 .
 .nf
 
-$ cloudapp download \-\-output=/Users/Larry/image\.png http://cl\.ly/040u2o3X1w0z1z3n2T04
-Downloading screenshot\.png to /Users/Larry\.\.\. done
+$ cloudapp trash http://api\.getcloudapp\.com/drops/12345
+Delete http://api\.getcloudapp\.dev/drops/12345 forever? (y/n)
+yes
+Deleting http://api\.getcloudapp\.dev/drops/12345\.\.\. done
 .
 .fi
 .