cloudapp 0.0.12 → 0.0.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudapp (0.0.12)
+    cloudapp (0.0.13)
       addressable
       faraday (~> 0.8.0.rc2)
       gli

data/bin/cloudapp

@@ -35,6 +35,11 @@ def save_identity(email, password)
   end
 end
 
+def clear_identity
+  return unless File.exist?(config_file)
+  File.delete(config_file)
+end
+
 def color(*args)
   HighLine.new.color *args
 end
@@ -159,7 +164,7 @@ command [:list, :ls] do |c|
     check_for_credentials
 
     count   = options[:count].to_i
-    columns = { name: 'Name', url: 'Link', view_counter: 'Views' }
+    columns = { display_name: 'Name', url: 'Link', view_counter: 'Views' }
     format  = format_from global_options
 
     CloudApp::DropPresenter.print(on:      $stdout,
@@ -170,4 +175,14 @@ command [:list, :ls] do |c|
   end
 end
 
+on_error do |e|
+  if CloudApp::DropService::UNAUTHORIZED === e
+    $stderr.puts color('Email and password given are incorrect.', :bold)
+    clear_identity
+    false
+  else
+    true
+  end
+end
+
 exit GLI.run(ARGV)

data/cloudapp.gemspec

@@ -13,7 +13,7 @@ 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.12'
+  s.version           = '0.0.13'
   s.date              = '2012-02-10'
   s.rubyforge_project = 'cloudapp'
 
@@ -80,12 +80,15 @@ Gem::Specification.new do |s|
     man/cloudapp.1.html
     man/cloudapp.1.ronn
     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/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/upload_file.yml
     spec/cassettes/DropService/upload_public_file.yml
     spec/cloudapp/drop_presenter_spec.rb

data/lib/cloudapp/drop.rb

@@ -3,5 +3,9 @@ module CloudApp
   class Drop < OpenStruct
     def private?() private == true end
     def public? () !private?       end
+
+    def display_name
+      name || redirect_url || url
+    end
   end
 end

data/lib/cloudapp/drop_service.rb

@@ -39,6 +39,10 @@ require 'cloudapp/drop'
 #
 module CloudApp
   class DropService
+
+    # Rased when given credentials are incorrect.
+    class UNAUTHORIZED < StandardError; end
+
     Leadlight.build_connection_common do |c|
       c.request :multipart
       c.request :url_encoded
@@ -117,12 +121,16 @@ module CloudApp
       root.paginated_drops(per_page: count)['items'].map do |drop_data|
         Drop.new drop_data
       end
+    rescue MultiJson::DecodeError => e
+      raise UNAUTHORIZED
     end
 
     def trash(count = 20)
       root.paginated_trash(per_page: count)['items'].map do |drop_data|
         Drop.new drop_data
       end
+    rescue MultiJson::DecodeError => e
+      raise UNAUTHORIZED
     end
 
     def create(attributes)
@@ -136,6 +144,8 @@ module CloudApp
       else
         create_bookmark options
       end
+    rescue MultiJson::DecodeError => e
+      raise UNAUTHORIZED
     end
 
     protected

data/lib/cloudapp.rb

@@ -1,3 +1,3 @@
 module CloudApp
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/cassettes/DropService/create_bookmark_with_bad_credentials.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://ford%40prefect:earthling@my.cl.ly/
+    body: ''
+    headers:
+      Accept:
+      - application/json, text/x-yaml, application/xml, application/xhtml+xml, text/html,
+        text/plain
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Cache-Control:
+      - no-cache
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      - application/json; charset=utf-8
+      Server:
+      - thin 1.2.11 codename Bat-Shit Crazy
+      - thin 1.2.11 codename Bat-Shit Crazy
+      Www-Authenticate:
+      - Digest realm="Application", qop="auth", algorithm=MD5, nonce="MTMyODkwOTU2MDplMzk2NTJkOWFkMTllYzljODkyNGQ5Yjc2MmRiN2I5Mg==",
+        opaque="9eb56ccb2e8b017ae42bdb4739690863"
+      - Digest realm="Application", qop="auth", algorithm=MD5, nonce="MTMyODkwOTU2MDplMzk2NTJkOWFkMTllYzljODkyNGQ5Yjc2MmRiN2I5Mg==",
+        opaque="9eb56ccb2e8b017ae42bdb4739690863"
+      X-Runtime:
+      - '0.004544'
+      - '0.009808'
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      - IE=Edge,chrome=1
+      Transfer-Encoding:
+      - chunked
+      - chunked
+      Connection:
+      - keep-alive
+      - keep-alive
+    body: ! 'HTTP Digest: Access denied.
+
+'
+    http_version: 
+  recorded_at: Fri, 10 Feb 2012 21:32:40 GMT
+recorded_with: VCR 2.0.0.rc1

data/spec/cassettes/DropService/list_drops_with_bad_credentials.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://ford%40prefect:earthling@my.cl.ly/
+    body: ''
+    headers:
+      Accept:
+      - application/json, text/x-yaml, application/xml, application/xhtml+xml, text/html,
+        text/plain
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Cache-Control:
+      - no-cache
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      - application/json; charset=utf-8
+      Server:
+      - thin 1.2.11 codename Bat-Shit Crazy
+      - thin 1.2.11 codename Bat-Shit Crazy
+      Www-Authenticate:
+      - Digest realm="Application", qop="auth", algorithm=MD5, nonce="MTMyODkwOTA5MjpmNDRhMjMzYzU1OThmMzRjNWNhYzE3MjJkODEyODQwYQ==",
+        opaque="9eb56ccb2e8b017ae42bdb4739690863"
+      - Digest realm="Application", qop="auth", algorithm=MD5, nonce="MTMyODkwOTA5MjpmNDRhMjMzYzU1OThmMzRjNWNhYzE3MjJkODEyODQwYQ==",
+        opaque="9eb56ccb2e8b017ae42bdb4739690863"
+      X-Runtime:
+      - '0.009479'
+      - '0.026132'
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      - IE=Edge,chrome=1
+      Transfer-Encoding:
+      - chunked
+      - chunked
+      Connection:
+      - keep-alive
+      - keep-alive
+    body: ! 'HTTP Digest: Access denied.
+
+'
+    http_version: 
+  recorded_at: Fri, 10 Feb 2012 21:24:52 GMT
+recorded_with: VCR 2.0.0.rc1

data/spec/cassettes/DropService/list_trash_with_bad_credentials.yml

@@ -0,0 +1,48 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://ford%40prefect:earthling@my.cl.ly/
+    body: ''
+    headers:
+      Accept:
+      - application/json, text/x-yaml, application/xml, application/xhtml+xml, text/html,
+        text/plain
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Cache-Control:
+      - no-cache
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      - application/json; charset=utf-8
+      Server:
+      - thin 1.2.11 codename Bat-Shit Crazy
+      - thin 1.2.11 codename Bat-Shit Crazy
+      Www-Authenticate:
+      - Digest realm="Application", qop="auth", algorithm=MD5, nonce="MTMyODkwOTUxMzo2OWY2MWQ1YjlmNmMwYzhkNGE0YjhiNDgwZWEyNDM2Ng==",
+        opaque="9eb56ccb2e8b017ae42bdb4739690863"
+      - Digest realm="Application", qop="auth", algorithm=MD5, nonce="MTMyODkwOTUxMzo2OWY2MWQ1YjlmNmMwYzhkNGE0YjhiNDgwZWEyNDM2Ng==",
+        opaque="9eb56ccb2e8b017ae42bdb4739690863"
+      X-Runtime:
+      - '0.001479'
+      - '0.006534'
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      - IE=Edge,chrome=1
+      Content-Length:
+      - '28'
+      Connection:
+      - keep-alive
+      - keep-alive
+      Transfer-Encoding:
+      - chunked
+    body: ! 'HTTP Digest: Access denied.
+
+'
+    http_version: 
+  recorded_at: Fri, 10 Feb 2012 21:31:53 GMT
+recorded_with: VCR 2.0.0.rc1

data/spec/cloudapp/drop_service_spec.rb

@@ -193,4 +193,48 @@ describe CloudApp::DropService do
   describe '#restore' do
     it 'restores a drop from the trash'
   end
+
+  describe 'with bad authentication' do
+    let(:identity) { stub email: 'ford@prefect', password: 'earthling' }
+    let(:service)  { CloudApp::DropService.as_identity identity, service_options }
+
+    describe '#drops' do
+      subject do
+        VCR.use_cassette 'DropService/list_drops_with_bad_credentials' do
+          service.drops
+        end
+      end
+
+      it 'raises an unauthorized error' do
+        lambda { subject }.
+          should raise_error(CloudApp::DropService::UNAUTHORIZED)
+      end
+    end
+
+    describe '#trash' do
+      subject do
+        VCR.use_cassette 'DropService/list_trash_with_bad_credentials' do
+          service.trash
+        end
+      end
+
+      it 'raises an unauthorized error' do
+        lambda { subject }.
+          should raise_error(CloudApp::DropService::UNAUTHORIZED)
+      end
+    end
+
+    describe '#create' do
+      subject do
+        VCR.use_cassette 'DropService/create_bookmark_with_bad_credentials' do
+          service.create url: 'http://getcloudapp.com'
+        end
+      end
+
+      it 'raises an unauthorized error' do
+        lambda { subject }.
+          should raise_error(CloudApp::DropService::UNAUTHORIZED)
+      end
+    end
+  end
 end

data/spec/cloudapp/drop_spec.rb

@@ -3,6 +3,35 @@ require 'helper'
 require 'cloudapp/drop'
 
 describe CloudApp::Drop do
+  describe '#display_name' do
+    describe 'a drop with a name' do
+      let(:name) { stub :name }
+      subject    { CloudApp::Drop.new name: name }
+
+      it 'is its name' do
+        subject.display_name.should eq(name)
+      end
+    end
+
+    describe 'a drop with a redirect url and no a name' do
+      let(:redirect_url) { stub :redirect_url }
+      subject { CloudApp::Drop.new redirect_url: redirect_url }
+
+      it 'is its redirect url' do
+        subject.display_name.should eq(redirect_url)
+      end
+    end
+
+    describe 'a drop with no redirect url and name' do
+      let(:url) { stub :url }
+      subject   { CloudApp::Drop.new url: url }
+
+      it 'is its remote url' do
+        subject.display_name.should eq(url)
+      end
+    end
+  end
+
   describe '#private?' do
     describe 'a private drop' do
       subject { CloudApp::Drop.new private: true }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudapp
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70172752917860 !ruby/object:Gem::Requirement
+  requirement: &70141400566320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172752917860
+  version_requirements: *70141400566320
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70172752917320 !ruby/object:Gem::Requirement
+  requirement: &70141400565780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70172752917320
+  version_requirements: *70141400565780
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70172752916840 !ruby/object:Gem::Requirement
+  requirement: &70141400565300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172752916840
+  version_requirements: *70141400565300
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70172752916360 !ruby/object:Gem::Requirement
+  requirement: &70141400564720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172752916360
+  version_requirements: *70141400564720
 - !ruby/object:Gem::Dependency
   name: leadlight
-  requirement: &70172752915680 !ruby/object:Gem::Requirement
+  requirement: &70141400564140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172752915680
+  version_requirements: *70141400564140
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &70172752915080 !ruby/object:Gem::Requirement
+  requirement: &70141400563500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172752915080
+  version_requirements: *70141400563500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172752914500 !ruby/object:Gem::Requirement
+  requirement: &70141400562960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172752914500
+  version_requirements: *70141400562960
 - !ruby/object:Gem::Dependency
   name: ronn
-  requirement: &70172752914080 !ruby/object:Gem::Requirement
+  requirement: &70141400562520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172752914080
+  version_requirements: *70141400562520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172752913640 !ruby/object:Gem::Requirement
+  requirement: &70141400562000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172752913640
+  version_requirements: *70141400562000
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70172752912680 !ruby/object:Gem::Requirement
+  requirement: &70141400560980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.0.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *70172752912680
+  version_requirements: *70141400560980
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70172752911760 !ruby/object:Gem::Requirement
+  requirement: &70141400560100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172752911760
+  version_requirements: *70141400560100
 description: Experience all the pleasures of sharing with CloudApp now in your terminal.
 email: larry@marburger.cc
 executables:
@@ -158,12 +158,15 @@ files:
 - man/cloudapp.1.html
 - man/cloudapp.1.ronn
 - 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/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/upload_file.yml
 - spec/cassettes/DropService/upload_public_file.yml
 - spec/cloudapp/drop_presenter_spec.rb