cloudapp 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,17 +1,38 @@
 PATH
   remote: .
   specs:
-    cloudapp (0.0.1)
+    cloudapp (0.0.4)
+      addressable
+      faraday (~> 0.8.0.rc2)
+      formatador
+      leadlight
       main
       typhoeus
-      yajl-ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     arrayfields (4.7.4)
-    chronic (0.6.6)
+    chronic (0.6.7)
+    crack (0.3.1)
+    diff-lcs (1.1.3)
+    fail-fast (1.0.0)
+    faraday (0.8.0.rc2)
+      multipart-post (~> 1.1)
     fattr (2.2.1)
+    formatador (0.2.1)
+    hookr (1.1.1)
+      fail-fast (= 1.0.0)
+    leadlight (0.0.3)
+      addressable
+      faraday
+      fattr
+      hookr
+      link_header
+      mime-types
+      multi_json
+    link_header (0.0.5)
     main (4.8.1)
       arrayfields (~> 4.7.4)
       chronic (~> 0.6.2)
@@ -19,10 +40,23 @@ GEM
       map (~> 5.1.0)
     map (5.1.0)
     mime-types (1.17.2)
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
     rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
     typhoeus (0.3.3)
       mime-types
-    yajl-ruby (1.1.0)
+    vcr (2.0.0.rc1)
+    webmock (1.7.10)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
@@ -30,3 +64,6 @@ PLATFORMS
 DEPENDENCIES
   cloudapp!
   rake
+  rspec
+  vcr (~> 2.0.0.rc1)
+  webmock

data/README.md

@@ -1,23 +1,65 @@
-# CloudApp CLI
+# CloudApp Ruby Client
 
-Experience all the pleasures of sharing with CloudApp now in your terminal.
+Interact with the [CloudApp API][] from Ruby. Comes with a command line
+interface to CloudApp as an added bonus.
 
+[cloudapp api]: http://developer.getcloudapp.com
 
-## Desired Usage
 
-**These commands don't exist yet. They're just here as a wish list of sorts.**
+## Usage
 
-The goal of `cloudapp` is to be Unix-friendly and handle the following uses:
+_Usage from Ruby is still a work in progress._
 
- - Bookmark a link: `cloudapp bookmark http://getcloudapp.com`
- - Share a file: `cloudapp file screenshot.png`
- - Share several files: `cloudapp file *.png`
- - Archive and share several files: `cloudapp file *.png --archive`
- - Encrypt and share a file: `cloudapp file launch_codes.txt --encrypt`
- - Download and decrypt an encrypted drop: `cloudapp http://cl.ly/abc123 def456`
 
+## CLI
 
-## Harness the Power
+Experience all the pleasures of sharing with CloudApp now in your terminal. The
+goal of `cloudapp` is to be simple and Unix-friendly.
+
+### Installation
+
+Installation is done via RubyGems: `gem install cloudapp`.
+
+### Usage
+
+ - Bookmark a link: `cloudapp new bookmark http://getcloudapp.com`
+ - Share a file: `cloudapp new file screenshot.png`
+ - List newest drops: `cloudapp list [--count=5]`
+
+### Wish List
+
+Some baseic features that should be added:
+
+ - Download a drop: `cloudapp download http://cl.ly/abc123`
+
+A little more flare would be swell.
+
+ - Share several files: `cloudapp new *.png`
+ - Archive and share several files: `cloudapp new --archive *.png`
+ - Share everything at once: `cloudapp new http://google.com *.png http://bing.com`
+ - Encrypt and share a file: `cloudapp new --encrypt launch_codes.txt`
+ - Download and decrypt and encrypted drop: `cloudapp download http://cl.ly/abc123 def456`
+
+While we're dreaming, what could you do if it kept a local copy of all your
+drops? Bonus points for a light weight daemon that kept everything in sync.
+
+ - Find all your screen shots: `cloudapp list /^screen ?shot.*\.png$/`
+ - Trash all your stale drops: `cloudapp delete --last-viewed="> 1 month ago"`
+ - See your drop views in real time: `cloudapp --tail`
+
+There's bound to be a better way to express some of these commands, but you get
+the picture.
+
+### Authentication
+
+As of right now, `cloudapp` makes use of
+[`main`'s built-in configuration handling][main-config] to store your CloudApp
+credentials **in plain text** at `~/.cloudapp/config.yml`. This file will be
+created and opened in your `$EDITOR` the first time it's needed.
+
+[main-config]: https://github.com/ahoward/main/blob/master/README.erb#L220-232
+
+### Harness the Power
 
 Sure you could copy the new drop's link by piping the output to `pbcopy`, but
 that's a lot of extra key presses. Instead, try setting this super secret

data/Rakefile

@@ -43,13 +43,13 @@ end
 #
 #############################################################################
 
-# require 'rspec'
-# require 'rspec/core/rake_task'
+require 'rspec'
+require 'rspec/core/rake_task'
 
-# desc "Run all specs"
-# task RSpec::Core::RakeTask.new('spec')
+desc "Run all specs"
+task RSpec::Core::RakeTask.new('spec')
 
-# task :default => "spec"
+task :default => "spec"
 
 #############################################################################
 #

data/bin/cloudapp

@@ -1,67 +1,81 @@
 #!/usr/bin/env ruby
 
+require 'formatador'
 require 'main'
-require 'typhoeus'
-require 'yajl'
 
 # Explicitly require yaml because ruby 1.9.2 (and greater?) define YAML which
 # causes main to not require it.
 require 'yaml'
 
+require 'cloudapp/drop_service'
+require 'ostruct'
+
 Main do
+  def identity
+    OpenStruct.new email:    config[:email], password: config[:password]
+  end
+
+  def service
+    CloudApp::DropService.as_identity(identity).tap do |service|
+      service.logger.level = Logger::WARN
+    end
+  end
+
   config email: 'arthur@dent.com', password: 'towel'
 
-  # Bookmark a link: `cloudapp bookmark http://getcloudapp.com`
-  mode :bookmark do
-    argument('uri') { cast :uri }
+  mode :new do
 
-    def run
-      uri      = params[:uri].value
-      body     = Yajl::Encoder.encode item: { redirect_url: uri }
-      response = Typhoeus::Request.post 'http://my.cl.ly/items',
-                   verbose:     ENV.fetch('DEBUG', false),
-                   body:        body,
-                   username:    config[:email],
-                   password:    config[:password],
-                   auth_method: :digest,
-                   headers:     { 'Accept'       => 'application/json',
-                                  'Content-Type' => 'application/json' }
-
-      json = Yajl::Parser.new(symbolize_keys: true).parse(response.body)
-      puts json.fetch :url
+    # Bookmark a link: `cloudapp new bookmark http://getcloudapp.com`
+    mode :bookmark do
+      argument('url') { cast :uri }
+
+      def run
+        response = service.create url: params[:url].value
+        puts response.fetch 'url'
+      end
     end
-  end
 
-  # Share a file: `cloudapp file screenshot.png`
-  mode :file do
-    argument('file') { cast :pathname }
+    # Share a file: `cloudapp new file screenshot.png`
+    mode :file do
+      argument('file') { cast :pathname }
 
-    def run
-      api_params = { username:    config[:email],
-                     password:    config[:password],
-                     auth_method: :digest,
-                     headers:     { 'Accept'       => 'application/json',
-                                    'Content-Type' => 'application/json' }}
+      def run
+        response = service.create path: params[:file].value
+        puts response.fetch 'url'
+      end
+    end
+  end
 
-      details_response = Typhoeus::Request.get 'http://my.cl.ly/items/new',
-                           api_params.merge(verbose: ENV.fetch('DEBUG', false))
+  # List newest drops: `cloudapp list [--count=5]`
+  mode :list do
+    option 'count', 'n' do
+      argument :optional
+      cast :integer
+      default 20
+    end
 
-      details = Yajl::Parser.new(symbolize_keys: true).
-                             parse(details_response.body)
+    def run
+      count = params[:count].value
+      drops = service.drops count
 
-      url = details[:url]
-      upload_params = details[:params].merge file: File.open(params[:file].value)
-      upload_response = Typhoeus::Request.post url,
-                          verbose: ENV.fetch('DEBUG', false),
-                          params:  upload_params
+      name_width  = drops.map {|drop| drop['name'].size }.max
+      views_width = [ 5, drops.map {|drop| drop['view_counter'].to_s.size }.max ].max
+      link_width  = drops.map {|drop| drop['url'].size }.max
 
-      follow_url = upload_response.headers_hash['Location']
+      header = [ "[bold]#{ 'Name' .ljust(name_width)   }[/]",
+                 "[bold]#{ 'Link' .ljust(link_width)   }[/]",
+                 "[bold]#{ 'Views'.center(views_width) }[/]" ].join(' ')
+      Formatador.display_line header
 
-      create_response = Typhoeus::Request.get follow_url,
-                           api_params.merge(verbose: ENV.fetch('DEBUG', false))
+      lines = drops.map do |drop|
+        [ drop['name'].ljust(name_width),
+          drop['url'],
+          drop['view_counter'].to_s.center(views_width)
+        ].join ' '
+      end
 
-      json = Yajl::Parser.new(symbolize_keys: true).parse(create_response.body)
-      puts json.fetch :url
+      Formatador.display_lines lines
     end
   end
+
 end

data/cloudapp.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'cloudapp'
-  s.version           = '0.0.4'
-  s.date              = '2012-02-01'
+  s.version           = '0.0.5'
+  s.date              = '2012-02-06'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,13 +43,19 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
+  s.add_dependency 'addressable'
+  s.add_dependency 'faraday', '~> 0.8.0.rc2'
+  s.add_dependency 'formatador'
+  s.add_dependency 'leadlight'
   s.add_dependency 'main'
   s.add_dependency 'typhoeus'
-  s.add_dependency 'yajl-ruby'
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'vcr', '~> 2.0.0.rc1'
+  s.add_development_dependency 'webmock'
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -64,6 +70,20 @@ Gem::Specification.new do |s|
     bin/cloudapp
     cloudapp.gemspec
     lib/cloudapp.rb
+    lib/cloudapp/digestable_typhoeus.rb
+    lib/cloudapp/drop_service.rb
+    spec/cassettes/CloudApp_DropService/_create/creates_a_bookmark.yml
+    spec/cassettes/CloudApp_DropService/_create/creates_a_bookmark_with_a_name.yml
+    spec/cassettes/CloudApp_DropService/_create/creates_a_file.yml
+    spec/cassettes/CloudApp_DropService/_drops/limits_list_to_the_given_number_of_drops.yml
+    spec/cassettes/CloudApp_DropService/_drops/returns_a_list_of_drops.yml
+    spec/cassettes/CloudApp_DropService/_drops/returns_a_list_of_trashed_drops.yml
+    spec/cloudapp/drop_service_spec.rb
+    spec/helper.rb
+    spec/support/files/favicon.ico
+    spec/support/stub_class_or_module.rb
+    spec/support/vcr.rb
+    spec/support/vcr_rspec.rb
   ]
   # = MANIFEST =
 

data/lib/cloudapp/digestable_typhoeus.rb

@@ -0,0 +1,17 @@
+require 'typhoeus'
+
+class DigestableTyphoeus < Faraday::Adapter::Typhoeus
+  def request(env)
+    super.tap { |request| configure_authentication request, env }
+  end
+
+  def configure_authentication(request, env)
+    authentication = request_options(env)[:authentication]
+
+    request.auth_method = 'digest'
+    request.username    = authentication[:username]
+    request.password    = authentication[:password]
+  end
+end
+
+Faraday.register_middleware :adapter, digestable_typhoeus: DigestableTyphoeus

data/lib/cloudapp/drop_service.rb

@@ -0,0 +1,159 @@
+require 'leadlight'
+require 'addressable/uri'
+require 'cloudapp/digestable_typhoeus'
+
+# Leadlight service for mucking about with drops in the CloudApp API.
+#
+# Usage:
+#
+#   service = DropSerivce.as_identity email:    'arthur@dent.com',
+#                                     password: 'towel'
+#
+#   # List all your drops
+#   service.drops
+#
+#   # Create a bookmark
+#   service.create url: 'http://getcloudapp.com', name: 'CloudApp'
+#
+#   # Upload a file
+#   service.create path: #<Pathname>, name: 'Screen shot'
+#
+#   # List all your trashed drops
+#   service.trash
+#
+#   # Delete a drop
+#   service.drops.get(123).destroy
+#
+#   # Delete a drop from the trash
+#   service.trash.get(123).destroy
+#
+#   # Restore a drop from the trash
+#   service.trash.get(123).restore
+#
+module CloudApp
+  class DropService
+    Leadlight.build_connection_common do |c|
+      c.request :multipart
+      c.request :url_encoded
+      c.adapter :digestable_typhoeus
+    end
+
+    Leadlight.build_service(self) do
+      url 'http://my.cl.ly'
+
+      # Add links present in the response body.
+      #   { links: { self: "...", next: "...", prev: "..." } }
+      tint 'links' do
+        match Hash
+        match { key? 'links' }
+        self['links'].each do |rel, href|
+          add_link href, rel
+        end
+      end
+
+      tint 'root' do
+        match_path '/'
+        add_link '/items?api_version=1.2', 'drops', 'List owned drops'
+        add_link_template '/items?api_version=1.2&per_page={per_page=20}', 'paginated_drops'
+        add_link_template '/items?api_version=1.2&per_page={per_page=20}&deleted=true', 'paginated_trash'
+      end
+
+      tint 'create' do
+        match_path '/items'
+        # use "#{__location__}/new" when api_version isn't required in the query
+        # string.
+        add_link '/items/new', 'create_file', 'Create a new file drop'
+      end
+
+      # Add a rel=child link for each item in the list.
+      #   { items: [{ id: 123, href: "..."}] }
+      tint 'drops' do
+        match_path '/items'
+        match { key? 'items' }
+        add_link_set 'child', :get do
+          self['items'].map do |item|
+            { href: item['href'], title: item['id'] }
+          end
+        end
+      end
+
+      # Add convenience methods on a drop representation to destroy and restore
+      # from the trash.
+      tint 'drop' do
+        match_template '/items/{id}'
+        extend do
+          def destroy
+            link('self').delete.
+              raise_on_error.submit_and_wait
+          end
+
+          def restore
+            link('self').put({}, deleted: true, item: { deleted_at: nil }).
+              raise_on_error.submit_and_wait
+          end
+        end
+      end
+    end
+
+    def identity=(identity)
+      connection.options[:authentication] = { username: identity.email,
+                                              password: identity.password }
+    end
+
+    def self.as_identity(identity, service_options = {})
+      new(service_options).tap do |service|
+        service.identity = identity
+      end
+    end
+
+    def drops(count = 20)
+      root.paginated_drops(per_page: count)['items']
+    end
+
+    def trash(count = 20)
+      root.paginated_trash(per_page: count)['items']
+    end
+
+    def create(attributes)
+      body = { item: {}}
+
+      body[:item][:name]         = attributes[:name] if attributes.key? :name
+      body[:item][:redirect_url] = attributes[:url]  if attributes.key? :url
+
+      if attributes.key? :path
+        create_file attributes[:path], body
+      else
+        create_bookmark body
+      end
+    end
+
+    protected
+
+    def create_bookmark(body)
+      root.link('drops').post({}, body).raise_on_error.
+        submit_and_wait do |new_drop|
+          return new_drop
+        end
+    end
+
+    def create_file(path, body)
+      root.drops.link('create_file').get.raise_on_error.
+        submit_and_wait do |details|
+          uri     = Addressable::URI.parse details['url']
+          file    = Faraday::UploadIO.new File.open(path), 'image/png'
+          payload = details['params'].merge file: file
+
+          conn = Faraday.new(url: uri.site) do |builder|
+            builder.request :multipart
+            builder.request :url_encoded
+            builder.adapter :typhoeus
+          end
+
+          conn.post(uri.request_uri, payload).on_complete do |env|
+            get(env[:response_headers]['Location']).raise_on_error.
+              submit_and_wait { |created| return created }
+          end
+        end
+    end
+  end
+end

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end