cloudapp 1.1.0 → 2.0.0.beta.1

data/CHANGELOG.md

@@ -4,6 +4,9 @@ Below is a complete listing of changes for each revision of `cloudapp`.
 
 ## Unreleased
 
+## 1.1.0
+
+ - Add `download` command
  - General housecleaning in `bin/cloudapp`
  - Fix typo ([#22][] by [Mark Mulder][bittersweet])
  - Extract Config class

data/Gemfile.lock

@@ -1,30 +1,22 @@
 PATH
   remote: .
   specs:
-    cloudapp (1.1.0)
-      addressable
-      faraday (~> 0.8.0.rc2)
-      gli
-      highline
-      leadlight (~> 0.0.5)
-      typhoeus
+    cloudapp (2.0.0.beta.1)
+      leadlight (= 0.0.5)
+      typhoeus (~> 0.3.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
+    addressable (2.3.2)
     crack (0.3.1)
     diff-lcs (1.1.3)
     fail-fast (1.0.0)
-    fakefs (0.4.0)
-    faraday (0.8.0.rc2)
+    faraday (0.8.4)
       multipart-post (~> 1.1)
     fattr (2.2.1)
-    gli (1.5.1)
-    highline (1.6.11)
     hookr (1.1.1)
       fail-fast (= 1.0.0)
-    hpricot (0.8.6)
     leadlight (0.0.5)
       addressable
       faraday
@@ -34,29 +26,23 @@ GEM
       mime-types
       multi_json (~> 1.0.4)
     link_header (0.0.5)
-    mime-types (1.17.2)
+    mime-types (1.19)
     multi_json (1.0.4)
     multipart-post (1.1.5)
-    mustache (0.99.4)
     rake (0.9.2.2)
-    rdiscount (1.6.8)
-    ronn (0.7.3)
-      hpricot (>= 0.8.2)
-      mustache (>= 0.7.0)
-      rdiscount (>= 1.5.8)
-    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)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
     typhoeus (0.3.3)
       mime-types
-    vcr (2.0.0.rc1)
-    webmock (1.7.10)
-      addressable (~> 2.2, > 2.2.5)
+    vcr (2.0.1)
+    webmock (1.8.9)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
 
 PLATFORMS
@@ -64,9 +50,7 @@ PLATFORMS
 
 DEPENDENCIES
   cloudapp!
-  fakefs
   rake
-  ronn
   rspec
-  vcr (~> 2.0.0.rc1)
+  vcr (~> 2.0.0)
   webmock

data/README.md

@@ -26,6 +26,7 @@ goal of `cloudapp` is to be simple and Unix-friendly.
     cloudapp list
     cloudapp bookmark http://douglasadams.com
     cloudapp upload ~/Desktop/screenshot.png
+    cloudapp download http://cl.ly/abc123
 
 ### Examples
 
@@ -36,6 +37,7 @@ goal of `cloudapp` is to be simple and Unix-friendly.
  - List newest drops: `cloudapp list [--count=5]`
  - Copy a new drop's link (OS X): `cloudapp bookmark http://douglasadams.com | pbcopy`
  - Output drops in CSV: `cloudapp --format=csv list`
+ - Download a drop: `cloudapp download http://cl.ly/abc123`
 
 More examples can be found on [the man page][man-page].
 
@@ -45,7 +47,6 @@ More examples can be found on [the man page][man-page].
 
 `cloudapp` could be awesome with a little more flare.
 
- - Download a drop: `cloudapp download http://cl.ly/abc123`
  - Output specific columns: `cloudapp list --columns=name,views,link`
  - Handle bookmarks from STDIN: `pbpaste | cloudapp bookmark`
  - Handle files from STDIN: `find *.png | cloudapp upload`

data/Rakefile

@@ -48,9 +48,13 @@ require 'rspec/core/rake_task'
 
 desc "Run all specs"
 task RSpec::Core::RakeTask.new('spec')
-
 task :default => "spec"
 
+desc 'Run non-integration specs'
+RSpec::Core::RakeTask.new('spec:unit') do |t|
+  t.rspec_opts = "--tag ~integration"
+end
+
 #############################################################################
 #
 # Custom tasks (add your own tasks here)

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           = '1.1.0'
-  s.date              = '2012-02-18'
+  s.version           = '2.0.0.beta.1'
+  s.date              = '2012-08-17'
   s.rubyforge_project = 'cloudapp'
 
   ## Make sure your summary is short. The description may be as long
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   ## If your gem includes any executables, list them here.
-  s.executables = ["cloudapp"]
+  # s.executables = ["cloudapp"]
 
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
@@ -43,20 +43,14 @@ 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 'gli'
-  s.add_dependency 'highline'
-  s.add_dependency 'leadlight', '~> 0.0.5'
-  s.add_dependency 'typhoeus'
+  s.add_dependency 'leadlight', '= 0.0.5'
+  s.add_dependency 'typhoeus',  '~> 0.3.3'
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency 'fakefs'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'ronn'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'vcr', '~> 2.0.0.rc1'
+  s.add_development_dependency 'vcr', '~> 2.0.0'
   s.add_development_dependency 'webmock'
 
   ## Leave this section as-is. It will be automatically generated from the
@@ -70,46 +64,61 @@ Gem::Specification.new do |s|
     MIT-LICENSE
     README.md
     Rakefile
-    bin/cloudapp
     cloudapp.gemspec
     lib/cloudapp.rb
-    lib/cloudapp/config.rb
+    lib/cloudapp/account.rb
+    lib/cloudapp/authorized_representation.rb
+    lib/cloudapp/collection_json.rb
+    lib/cloudapp/collection_json/item.rb
+    lib/cloudapp/collection_json/representation.rb
+    lib/cloudapp/collection_json/template.rb
+    lib/cloudapp/collection_json/tint.rb
     lib/cloudapp/drop.rb
-    lib/cloudapp/drop_content.rb
-    lib/cloudapp/drop_presenter.rb
-    lib/cloudapp/drop_service.rb
-    lib/cloudapp/identity.rb
+    lib/cloudapp/drop_collection.rb
+    lib/cloudapp/service.rb
+    lib/cloudapp/token.rb
     man/cloudapp.1
     man/cloudapp.1.html
     man/cloudapp.1.ronn
-    spec/cassettes/DropContent/download.yml
-    spec/cassettes/DropService/create_bookmark.yml
-    spec/cassettes/DropService/create_bookmark_with_bad_credentials.yml
-    spec/cassettes/DropService/create_bookmark_with_name.yml
-    spec/cassettes/DropService/create_private_bookmark.yml
-    spec/cassettes/DropService/create_public_bookmark.yml
-    spec/cassettes/DropService/drop.yml
-    spec/cassettes/DropService/list_drops.yml
-    spec/cassettes/DropService/list_drops_with_bad_credentials.yml
-    spec/cassettes/DropService/list_drops_with_limit.yml
-    spec/cassettes/DropService/list_trash.yml
-    spec/cassettes/DropService/list_trash_with_bad_credentials.yml
-    spec/cassettes/DropService/retrieve_token.yml
-    spec/cassettes/DropService/retrieve_token_with_bad_credentials.yml
-    spec/cassettes/DropService/upload_file.yml
-    spec/cassettes/DropService/upload_public_file.yml
-    spec/cloudapp/config_spec.rb
-    spec/cloudapp/drop_content_spec.rb
-    spec/cloudapp/drop_presenter_spec.rb
-    spec/cloudapp/drop_service_spec.rb
+    spec/cassettes/create_bookmark.yml
+    spec/cassettes/create_bookmark_with_name.yml
+    spec/cassettes/create_bookmark_with_privacy.yml
+    spec/cassettes/delete_drop.yml
+    spec/cassettes/list_drops.yml
+    spec/cassettes/list_drops_with_bad_token.yml
+    spec/cassettes/list_drops_with_filter.yml
+    spec/cassettes/list_drops_with_href.yml
+    spec/cassettes/list_drops_with_href_and_filter.yml
+    spec/cassettes/list_drops_with_href_and_limit.yml
+    spec/cassettes/list_drops_with_limit.yml
+    spec/cassettes/list_drops_with_nil_href.yml
+    spec/cassettes/purge_drops.yml
+    spec/cassettes/recover_drop.yml
+    spec/cassettes/rename_drop.yml
+    spec/cassettes/setup_drops.yml
+    spec/cassettes/token_for_account.yml
+    spec/cassettes/token_for_account_with_bad_credentials.yml
+    spec/cassettes/trash_drop.yml
+    spec/cassettes/update_drop_bookmark_url.yml
+    spec/cassettes/update_file.yml
+    spec/cassettes/upload_file.yml
+    spec/cassettes/upload_file_with_name.yml
+    spec/cassettes/upload_file_with_privacy.yml
+    spec/cassettes/view_drop.yml
+    spec/cloudapp/account_spec.rb
+    spec/cloudapp/authorized_representation_spec.rb
+    spec/cloudapp/collection_json/item_spec.rb
+    spec/cloudapp/collection_json/representation_spec.rb
+    spec/cloudapp/collection_json/template_spec.rb
+    spec/cloudapp/drop_collection_spec.rb
     spec/cloudapp/drop_spec.rb
-    spec/cloudapp/identity_spec.rb
+    spec/cloudapp/service_spec.rb
+    spec/cloudapp/token_spec.rb
     spec/helper.rb
-    spec/support/fakefs_rspec.rb
+    spec/integration_spec.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/account.rb

@@ -0,0 +1,111 @@
+require 'forwardable'
+require 'cloudapp/drop'
+require 'cloudapp/drop_collection'
+
+# Usage:
+#
+#   # Create a new service passing CloudApp account token:
+#   account = CloudApp::Account.using_token token
+#
+#   # Newest drops
+#   account.drops                  #=> Active drops
+#   account.drops filter: :active  #=> Active drops
+#   account.drops filter: :trash   #=> Trashed drops
+#   account.drops filter: :all     #=> All active and trashed drops
+#
+#   # List specific page of drops:
+#   page1 = account.drops
+#   page2 = account.drops href: page1.link('next')      # Advance to page 2
+#   page1 = account.drops href: page2.link('previous')  # Go back to page 1
+#
+#   # Newest 5 drops
+#   account.drops limit: 5
+#
+#   # View specific drop:
+#   account.drop_at drop.href
+#
+#   # Create a bookmark:
+#   account.bookmark 'http://getcloudapp.com'
+#   account.bookmark 'http://getcloudapp.com', name: 'CloudApp'
+#   account.bookmark 'http://getcloudapp.com', private: false
+#
+#   # Upload a file:
+#   account.upload #<Pathname>
+#   account.upload #<Pathname>, name: 'Screen shot'
+#   account.upload #<Pathname>, private: false
+#
+#   # Update a drop:
+#   account.update drop.href, name: 'CloudApp'
+#   account.update drop.href, private: false
+#
+#   # Trash a drop:
+#   account.trash_drop 42
+#
+#   # Recover a drop from the trash:
+#   account.recover_drop 42
+#
+#   # Delete a drop:
+#   account.delete_drop 42
+#
+module CloudApp
+  class Account
+    extend Forwardable
+    def_delegators :service, :delete_drop
+
+    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 initialize(token = nil)
+      @token = token
+    end
+
+    def self.using_token(token)
+      CloudApp::Account.new token
+    end
+
+    def drops(*args)
+      DropCollection.new service.drops(*args)
+    end
+
+    def drop_at(*args)
+      DropCollection.new service.drop_at(*args)
+    end
+
+    def bookmark(*args)
+      DropCollection.new service.bookmark(*args)
+    end
+
+    def upload(*args)
+      DropCollection.new service.upload(*args)
+    end
+
+    def update(*args)
+      DropCollection.new service.update(*args)
+    end
+
+    def trash_drop(*args)
+      DropCollection.new service.trash_drop(*args)
+    end
+
+    def recover_drop(*args)
+      DropCollection.new service.recover_drop(*args)
+    end
+
+  protected
+
+    def service
+      @service ||= self.class.service.tap do |service|
+        service.token = @token if @token
+      end
+    end
+  end
+end

data/lib/cloudapp/authorized_representation.rb

@@ -0,0 +1,17 @@
+require 'leadlight'
+
+module CloudApp
+  module AuthorizedRepresentation
+    Tint = Leadlight::Tint.new 'authorized', status: [ :success, 401 ] do
+      extend AuthorizedRepresentation
+    end
+
+    def authorized?
+      not unauthorized?
+    end
+
+    def unauthorized?
+      __response__.status == 401
+    end
+  end
+end

data/lib/cloudapp/collection_json/item.rb

@@ -0,0 +1,20 @@
+require 'ostruct'
+
+module CloudApp
+  module CollectionJson
+    class Item
+      attr_reader :href, :links, :data
+      def initialize(item_data)
+        @href  = item_data.fetch('href',  nil)
+        @links = item_data.fetch('links', []).map {|link| OpenStruct.new(link) }
+        @data  = DataCollection.hash_from(item_data.fetch('data'))
+      end
+    end
+
+    class DataCollection
+      def self.hash_from(data)
+        Hash[data.map {|datum| [ datum['name'], datum['value'] ]}]
+      end
+    end
+  end
+end

data/lib/cloudapp/collection_json/representation.rb

@@ -0,0 +1,74 @@
+require 'ostruct'
+
+module CloudApp
+  module CollectionJson
+    module Representation
+      def href
+        collection.fetch('href')
+      end
+
+      def collection_links
+        return [] unless collection.has_key?('links')
+        collection.fetch('links').map {|link| OpenStruct.new(link) }
+      end
+
+      def items(item_source = default_item_source)
+        collection.fetch('items').map {|item|
+          item_source.call(item)
+        }
+      end
+
+      # Ultimately this API would be nice:
+      #
+      #   root.template(email: email, password: password).
+      #     post do |response|
+      #       return response
+      #     end
+      #
+      # The Command Pattern could be nice as well. Template#[] may be a better
+      # solution than faux methods.
+      #
+      #   root.create do |template|
+      #     template.email = email
+      #     template.password = password
+      #   end
+      #
+      # Updates also use the template.
+      #
+      #   root.items.first.update do |template|
+      #     template.name.reverse!
+      #   end
+      def template(template_source = default_template_source)
+        return unless collection.has_key?('template')
+        template_source.call collection.fetch('template')
+      end
+
+      def queries(query_source = default_query_source)
+        return unless collection.has_key?('queries')
+        collection.fetch('queries').map {|query| query_source.call(query) }
+      end
+
+      def query(rel, query_source = default_query_source)
+        Array(queries(query_source)).find {|query| query.rel == rel }
+      end
+
+    protected
+
+      def default_item_source
+        CloudApp::CollectionJson::Item.public_method(:new)
+      end
+
+      def default_template_source
+        CloudApp::CollectionJson::Template.public_method(:new)
+      end
+
+      def default_query_source
+        CloudApp::CollectionJson::Template.public_method(:new)
+      end
+
+      def collection
+        self.fetch('collection')
+      end
+    end
+  end
+end

data/lib/cloudapp/collection_json/template.rb

@@ -0,0 +1,17 @@
+module CloudApp
+  module CollectionJson
+    class Template < Item
+      attr_reader :rel, :enctype
+      def initialize(template_data)
+        super
+        @rel     = template_data.fetch('rel',     nil)
+        @enctype = template_data.fetch('enctype', nil)
+      end
+
+      def fill(template_data)
+        template_data = template_data.select {|key| data.has_key?(key) }
+        data.merge template_data
+      end
+    end
+  end
+end

data/lib/cloudapp/collection_json/tint.rb

@@ -0,0 +1,11 @@
+module CloudApp
+  module CollectionJson
+    Tint = Leadlight::Tint.new 'collection+json', status: [ :success, 401 ] do
+      match_content_type 'application/vnd.collection+json'
+      extend CollectionJson::Representation
+      collection_links.each do |link|
+        add_link link.href, link.rel
+      end
+    end
+  end
+end

data/lib/cloudapp/collection_json.rb

@@ -0,0 +1,3 @@
+require 'cloudapp/collection_json/item'
+require 'cloudapp/collection_json/representation'
+require 'cloudapp/collection_json/template'

data/lib/cloudapp/drop.rb

@@ -1,16 +1,32 @@
+require 'date'
 require 'ostruct'
 
 module CloudApp
   class Drop < OpenStruct
-    def private?() private == true end
-    def public? () !private?       end
+    attr_accessor :href, :data
 
-    def display_name
-      name || redirect_url || url
+    def initialize(collection_item)
+      @href  = collection_item.href
+      @links = collection_item.links
+      @data  = collection_item.data
+      super @data
     end
 
-    def has_content?
-      item_type != 'bookmark'
+    def name()     super || share_url   end
+    def private?() private == true      end
+    def public?() !private?             end
+    def created() DateTime.parse(super) end
+
+    def share_url()     link_for_relation('canonical') end
+    def thumbnail_url() link_for_relation('icon')      end
+    def embed_url()     link_for_relation('embed')     end
+    def download_url()  link_for_relation('download')  end
+
+  protected
+
+    def link_for_relation(relation)
+      link = @links.find {|link| link.rel == relation }
+      link and link.href
     end
   end
 end

data/lib/cloudapp/drop_collection.rb

@@ -0,0 +1,22 @@
+require 'delegate'
+require 'forwardable'
+
+module CloudApp
+  class DropCollection < SimpleDelegator
+    extend Forwardable
+    def_delegators :@representation, :authorized?, :unauthorized?, :link, :links
+
+    def initialize(representation, drop_class = Drop)
+      @representation = representation
+      @drop_class     = drop_class
+      super drops
+    end
+
+  protected
+
+    def drops
+      return [] if unauthorized?
+      @drops ||= @representation.items.map {|drop| @drop_class.new(drop) }
+    end
+  end
+end