cloudapp_api 0.3.1 → 0.3.2

data/README.md

@@ -170,6 +170,7 @@ Authentication is necessary for most actions, the only exceptions being when cre
 ## Author & Contributors
 
 * [Aaron Russell](http://www.aaronrussell.co.uk)
+* [Christian Nicolai](https://github.com/cmur2)
 
 ## Copyright
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/cloudapp_api.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cloudapp_api}
-  s.version = "0.3.1"
+  s.name = "cloudapp_api"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Russell"]
-  s.date = %q{2011-05-17}
-  s.description = %q{A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.}
-  s.email = %q{aaron@gc4.co.uk}
+  s.date = "2011-10-14"
+  s.description = "A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface."
+  s.email = "aaron@gc4.co.uk"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -65,10 +65,10 @@ Gem::Specification.new do |s|
     "spec/stubs/gift_card/redeem",
     "spec/stubs/gift_card/show"
   ]
-  s.homepage = %q{http://github.com/aaronrussell/cloudapp_api}
+  s.homepage = "http://github.com/aaronrussell/cloudapp_api"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.}
+  s.rubygems_version = "1.8.10"
+  s.summary = "A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface."
   s.test_files = [
     "spec/cloudapp_account_spec.rb",
     "spec/cloudapp_api_spec.rb",

data/lib/cloudapp/account.rb

@@ -115,7 +115,8 @@ module CloudApp
     end
         
     attr_reader :id, :email, :domain, :domain_home_page, :private_items,
-                :subscribed, :alpha, :created_at, :updated_at, :activated_at
+                :subscribed, :subscription_expires_at, :alpha,
+                :created_at, :updated_at, :activated_at
     
     # Modify the authenticated accounts details. Can change the default security of newly
     # created drops, the accounts email address, password, and custom domain details.
@@ -153,4 +154,4 @@ module CloudApp
     
   end
   
-end
+end

data/lib/cloudapp/client.rb

@@ -106,7 +106,7 @@ module CloudApp
       if args[0].is_a? Array
         Drop.create(:bookmarks, args)
       else
-        name, url = args[0], (args[1] || "")
+        url, name = args[0], (args[1] || "")
         Drop.create(:bookmark, {:name => name, :redirect_url => url})
       end
     end

data/lib/cloudapp/drop.rb

@@ -104,7 +104,7 @@ module CloudApp
         res = post "/items", {:body => {:items => opts}, :digest_auth => @@auth}
       when :upload
         r = get "/items/new", {:query => ({:item => {:private => opts[:private]}} if opts.has_key?(:private)), :digest_auth => @@auth}
-        return bad_response(res) unless r.ok?
+        return bad_response(r) unless r.ok?
         res = post r['url'], Multipart.new(r['params'].merge!(:file => File.new(opts[:file]))).payload.merge!(:digest_auth => @@auth)
       else
         # TODO raise an error
@@ -151,7 +151,7 @@ module CloudApp
     end
     
     attr_reader :href, :name, :private, :url, :content_url, :item_type, :view_counter,
-                :icon, :remote_url, :redirect_url, :created_at, :updated_at, :deleted_at
+                :icon, :remote_url, :redirect_url, :source, :created_at, :updated_at, :deleted_at
     
     # Modify the drop. Can currently modify it's name or security setting by passing parameters.
     #
@@ -198,4 +198,4 @@ module CloudApp
   # update your code to use the Drop class to ensure future compatibility.
   class Item < Drop; end
   
-end
+end

data/lib/cloudapp/multipart.rb

@@ -22,7 +22,8 @@ module CloudApp
     
     def payload #:nodoc:
       {
-        :headers => {"Content-Type" => "multipart/form-data; boundary=#{boundary}"},
+        :headers => {"User-Agent" => "Ruby.CloudApp.API",
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"},
         :body => @body
       }
     end
@@ -47,4 +48,4 @@ module CloudApp
     
   end
   
-end
+end

data/lib/cloudapp_api.rb

@@ -1,4 +1,6 @@
 require "httparty"
+require "yaml" unless defined?(YAML)
+YAML::ENGINE.yamler = "syck" if defined?(YAML::ENGINE)
 
 ["base", "drop", "account", "gift_card", "client", "multipart", "httparty", "core_ext", "response_error"].each do |inc|
   require File.join(File.dirname(__FILE__), "cloudapp", inc)

data/spec/cloudapp_account_spec.rb

@@ -33,7 +33,11 @@ describe CloudApp::Account do
   end
   
   it "should return a subscribed boolean" do
-    @account.subscribed.should == false
+    @account.subscribed.should == true
+  end
+  
+  it "should return a subscription expiration date" do
+    @account.subscription_expires_at == "2012-05-21"
   end
   
   it "should return a alpha boolean" do

data/spec/cloudapp_drop_spec.rb

@@ -51,6 +51,10 @@ describe CloudApp::Drop do
     @drop.redirect_url == nil
   end
   
+  it "should return a source" do
+    @drop.source == "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)"
+  end
+  
   it "should return timestamps" do
     @drop.created_at.should be_a_kind_of Time
     @drop.updated_at.should be_a_kind_of Time

data/spec/stubs/account/show

@@ -8,9 +8,10 @@ Content-Type: application/json; charset=utf-8
   "domain":           null,
   "domain_home_page": null,
   "private_items":    true,
-  "subscribed":       false,
+  "subscribed":       true,
+  "subscription_expires_at": "2012-05-21",
   "alpha":            false,
   "created_at":       "2010-12-10T17:07:01Z",
   "updated_at":       "2010-12-10T17:12:51Z",
   "activated_at":     "2010-12-10T17:12:51Z"
-}
+}

data/spec/stubs/drop/create

@@ -13,7 +13,8 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/bookmark.png",
   "remote_url":   null,
   "redirect_url": "http://getcloudapp.com",
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T19:50:24Z",
   "updated_at":   "2010-10-23T19:50:39Z",
   "deleted_at":   null
-}
+}

data/spec/stubs/drop/delete

@@ -13,7 +13,8 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/bookmark.png",
   "remote_url":   null,
   "redirect_url": "http://getcloudapp.com",
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T21:15:21Z",
   "updated_at":   "2010-10-23T21:17:04Z",
   "deleted_at":   "2010-10-25T14:37:43Z"
-}
+}

data/spec/stubs/drop/index

@@ -13,6 +13,7 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/bookmark.png",
   "remote_url":   null,
   "redirect_url": "http://my.cl.ly",
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T20:10:37Z",
   "updated_at":   "2010-10-23T20:10:41Z",
   "deleted_at":   null
@@ -27,6 +28,7 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/bookmark.png",
   "remote_url":   null,
   "redirect_url": "http://getcloudapp.com",
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T19:50:24Z",
   "updated_at":   "2010-10-23T19:50:39Z",
   "deleted_at":   null
@@ -41,7 +43,8 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/image.png",
   "remote_url":   "http://f.cl.ly/items/7c7aea1395c3db0aee18/CloudApp%20Logo.png",
   "redirect_url": null,
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T19:50:13Z",
   "updated_at":   "2010-10-23T19:50:38Z",
   "deleted_at":   null
-}]
+}]

data/spec/stubs/drop/show

@@ -13,7 +13,8 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/image.png",
   "remote_url":   "http://f.cl.ly/items/7c7aea1395c3db0aee18/CloudApp%20Logo.png",
   "redirect_url": null,
+  "source":       "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T19:50:13Z",
   "updated_at":   "2010-10-23T19:50:38Z",
   "deleted_at":   null
-}
+}

data/spec/stubs/drop/show-private

@@ -13,7 +13,8 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/image.png",
   "remote_url":   "http://f.cl.ly/items/7c7aea1395c3db0aee18/CloudApp%20Logo.png",
   "redirect_url": null,
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T19:50:13Z",
   "updated_at":   "2010-10-23T19:50:38Z",
   "deleted_at":   null
-}
+}

data/spec/stubs/drop/update

@@ -13,7 +13,8 @@ Content-Type: application/json; charset=utf-8
   "icon":         "http://my.cl.ly/images/item_types/bookmark.png",
   "remote_url":   null,
   "redirect_url": "http://getcloudapp.com",
+  "source":        "Cloud/1.5.1 CFNetwork/520.0.13 Darwin/11.0.0 (x86_64) (MacBookPro5%2C5)",
   "created_at":   "2010-10-23T21:15:21Z",
   "updated_at":   "2010-10-23T21:17:04Z",
   "deleted_at":   null
-}
+}

metadata

@@ -1,230 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cloudapp_api
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Aaron Russell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70159207985200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  name: httparty
-  prerelease: false
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: mime-types
   prerelease: false
+  version_requirements: *70159207985200
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70159207984440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207984440
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70159207983240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  name: rspec
-  prerelease: false
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: fakeweb
   prerelease: false
+  version_requirements: *70159207983240
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70159207982080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207982080
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70159207981100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  name: yard
-  prerelease: false
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: bluecloth
   prerelease: false
-  type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70159207981100
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &70159207980260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: cucumber
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70159207980260
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70159207979320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207979320
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70159207963980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  prerelease: false
   type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207963980
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70159207962920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.5.1
-  name: jeweler
-  prerelease: false
   type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
   prerelease: false
+  version_requirements: *70159207962920
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70159207962180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207962180
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70159207955720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  name: httparty
-  prerelease: false
   type: :runtime
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207955720
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70159207954400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  name: rspec
-  prerelease: false
   type: :development
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70159207954400
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70159207953080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  name: yard
-  prerelease: false
   type: :development
-  requirement: *id013
-description: A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.
+  prerelease: false
+  version_requirements: *70159207953080
+description: A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple
+  ActiveResource-like interface.
 email: aaron@gc4.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -274,38 +212,33 @@ files:
 - spec/stubs/gift_card/show
 homepage: http://github.com/aaronrussell/cloudapp_api
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1025824897898580958
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.
-test_files: 
+summary: A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like
+  interface.
+test_files:
 - spec/cloudapp_account_spec.rb
 - spec/cloudapp_api_spec.rb
 - spec/cloudapp_client_spec.rb