cloudapp_api 0.0.2 → 0.0.3

data/.gitignore

@@ -17,5 +17,7 @@ tmtags
 coverage
 rdoc
 pkg
+.autotest
 
 ## PROJECT::SPECIFIC
+test/test_config.yml

data/README.md

@@ -87,9 +87,10 @@ If you are using the client interface, you must create a client instance.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-## Author
+## Author & Contributors
 
 * [Aaron Russell](http://www.aaronrussell.co.uk)
+* [Wade West](http://github.com/wadewest)
 
 ## Copyright
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.}
     gem.email = "aaron@gc4.co.uk"
     gem.homepage = "http://github.com/aaronrussell/cloud_app"
-    gem.authors = ["Aaron Russell"]
+    gem.authors = ["Aaron Russell", "Wade West"]
     gem.add_dependency "httparty", ">= 0.5.2"
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
@@ -48,7 +48,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "cloudly #{version}"
+  rdoc.title = "cloudapp_api #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/cloudapp_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudapp_api}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Russell"]
-  s.date = %q{2010-05-18}
+  s.authors = ["Aaron Russell", "Wade West"]
+  s.date = %q{2010-11-13}
   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.extra_rdoc_files = [
@@ -32,23 +32,29 @@ Gem::Specification.new do |s|
      "lib/cloudapp/multipart.rb",
      "lib/cloudapp_api.rb",
      "test/helper.rb",
-     "test/test_cloudly.rb"
+     "test/helper/faking_setup.rb",
+     "test/helper/methods.rb",
+     "test/test_base.rb",
+     "test/test_cloudapp_api.rb"
   ]
   s.homepage = %q{http://github.com/aaronrussell/cloud_app}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_cloudly.rb"
+    "test/helper/faking_setup.rb",
+     "test/helper/methods.rb",
+     "test/helper.rb",
+     "test/test_base.rb",
+     "test/test_cloudapp_api.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0.5.2"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else

data/lib/cloudapp/base.rb

@@ -24,8 +24,9 @@ module CloudApp
       res.ok? ? Item.new(res) : res
     end
     
-    def self.all(opts = {})
-      res = get "/items", opts.merge!(:digest_auth => @@auth)
+    def self.all(opts = nil)
+      opts = opts.nil? ? "" : "?#{opts.to_params}"
+      res = get "/items#{opts}", :digest_auth => @@auth
       res.ok? ? res.collect{|i| Item.new(i)} : res
     end
     

data/lib/cloudapp/client.rb

@@ -29,7 +29,8 @@ module CloudApp
     end
   
     def delete(id)
-      Item.find(id).delete
+      item = Item.find(id)
+      item.class == Item ? item.delete : item
     end
         
   end

data/lib/cloudapp/httparty.rb

@@ -7,7 +7,7 @@ end
 module HTTParty
   class Response < HTTParty::BasicObject
     def ok?
-      @code == 200
+      self.code == 200
     end
   end
   

data/test/helper/faking_setup.rb

@@ -0,0 +1,15 @@
+require 'fakeweb'
+require 'helper/methods'
+
+FakeWeb.allow_net_connect = false
+
+FakeWeb.register_uri :head, %r\^http://(my|f).cl.ly(/items)?\, auth_response
+FakeWeb.register_uri :get,  "http://my.cl.ly/items", item_listing_response
+FakeWeb.register_uri :post, %r|^http://my.cl.ly/items|, new_bookmark_response
+
+FakeWeb.register_uri :get, %r|^http://cl.ly|, get_item_response
+
+FakeWeb.register_uri :delete, "http://my.cl.ly/items/1234", [ ok_response, not_found_response ]
+
+FakeWeb.register_uri :get,  "http://my.cl.ly/items/new", new_item_response
+FakeWeb.register_uri :post, "http://f.cl.ly", ok_response

data/test/helper/methods.rb

@@ -0,0 +1,81 @@
+require 'json'
+require 'json/add/rails'
+
+def slug_character
+  characters = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a
+  characters[ rand(characters.size) ]
+end
+
+def random_slug
+  slug_character + slug_character + slug_character + slug_character
+end
+
+def build_item( params = {} )
+  params = {
+    :type => 'image',
+    :public_slug => random_slug
+  }.merge(params)
+  {
+    "href"          => "http://my.cl.ly/items/1234",
+    "content_url"   => "http://cl.ly/#{params[:public_slug]}/content",
+    "redirect_url"  => params[:type] == 'bookmark' ? "http://cloudapp.com" : nil,
+    "public_slug"   => params[:public_slug],
+    "private"       => false,
+    "deleted_at"    => nil,
+    "url"           => "http://cl.ly/#{params[:public_slug]}",
+    "remote_url"    => params[:type] != 'bookmark' ? "http://f.cl.ly/items/1d1a7310f29c96/Item_Name.png" : nil,
+    "last_viewed"   => nil,
+    "icon"          => "http://my.cl.ly/images/item_types/#{params[:type]}.png",
+    "item_type"     => params[:type]
+  }
+end
+
+def ok_response
+  { :status => ["200", "OK"] }
+end
+
+def auth_response
+  { :status => ["401", "Unauthorized"] }
+end
+
+def not_found_response
+  { :status => ["404", "Not Found"] }
+end
+
+def json_response
+  {:content_type => "application/json; charset=utf-8"}.merge(ok_response)
+end
+
+def item_listing_response
+  {
+    :body => [build_item, build_item, build_item(:type=>'bookmark')].to_json
+  }.merge(json_response)
+end
+
+def get_item_response
+  {
+    :body => build_item.to_json
+  }.merge(json_response)
+end
+
+def new_item_response
+  {
+    :body => {
+      "url" =>"http://f.cl.ly",
+      "params" => {
+        "success_action_redirect" => "http://my.cl.ly/items/s3",
+        "acl"                     => "public-read",
+        "AWSAccessKeyId"          => "AKIABHXGSHSBEOFS6Q",
+        "key"                     => "items/dcb0aa186du4450478f0/${filename}",
+        "signature"               => "Cm5S8VMo8fcyi4heVXqRqpYj6sE=",
+        "policy"                  => "eyJRoLXJhbmdlIiwwLDI2MjE0NDAeSIsIml0ZW1zL2RjYjBhYTE1Y2NjNDQ1MDQ3OGYwLyJdXX0=",
+      }
+    }.to_json
+  }.merge(json_response)
+end
+
+def new_bookmark_response
+  {
+    :body => build_item(:type => 'bookmark' ).to_json
+  }.merge(json_response)
+end

data/test/helper.rb

@@ -1,10 +1,24 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'treetop'
+require 'yaml'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+TEST_DIR = File.join(File.dirname(__FILE__))
+
+$LOAD_PATH.unshift(File.join(TEST_DIR, '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'cloudly'
+require 'helper/faking_setup'
+require 'cloudapp_api'
 
 class Test::Unit::TestCase
+  
+  def cloudapp_config
+    @@cloudapp_config ||= {:username=> 'fake@example.com', :password=>'foobar'}
+  end
+  
+  def client
+    @@client ||= CloudApp::Client.new cloudapp_config
+  end
+  
 end

data/test/test_base.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+class TestBase < Test::Unit::TestCase
+  def setup
+    @auth = CloudApp::Base.authenticate( cloudapp_config[:username], cloudapp_config[:password] )
+  end
+  
+  should "be able to enter authentication info" do
+    setup
+    assert @auth, "CloudApp::Base.authenticate shouldn't have returned falsey value"
+  end
+  
+  should "be able to find an item by public slug" do
+    setup
+    item = CloudApp::Base.find random_slug
+    assert_instance_of CloudApp::Item, item
+  end
+  
+end

data/test/test_cloudapp_api.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+class TestCloudAppAPI < Test::Unit::TestCase
+
+  should "be able to create a client" do
+    assert_instance_of CloudApp::Client, client, "Couldn't create client."
+  end
+
+  should "test retreiving a listing of my uploaded files." do
+    items = client.items
+    assert_instance_of Array, items, "Couldn't retrieve the items."
+  end
+  
+  should "test creating a bookmark" do
+    b = client.bookmark("CloudApp","http://cloudapp.com")
+    assert_instance_of CloudApp::Item, b, "Failed to create a bookmark."
+  end
+  
+  should "be able to delete an item" do
+    res = client.delete "rAnD"
+    assert_same true, res, "Couldn't delete an item"
+    
+    bad_res = client.delete "rAnD"
+    message = "Shouldn't be able to delete the same item"
+    assert_not_same true, bad_res, message
+    # HTTParty::Response has no instance_of? method so
+    # we can't use assert_instance_of
+    assert bad_res.class == HTTParty::Response, message
+  end
+  
+  should "be able to upload a file" do
+    res = client.upload "README.md"
+    assert_instance_of CloudApp::Item, res, "Couldn't upload the file"
+  end
+
+  ### Can't think of any other test to add at the moment
+
+end

metadata

@@ -1,29 +1,33 @@
 --- !ruby/object:Gem::Specification 
 name: cloudapp_api
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Aaron Russell
+- Wade West
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +01:00
+date: 2010-11-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
@@ -35,9 +39,11 @@ dependencies:
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,7 +74,10 @@ files:
 - lib/cloudapp/multipart.rb
 - lib/cloudapp_api.rb
 - test/helper.rb
-- test/test_cloudly.rb
+- test/helper/faking_setup.rb
+- test/helper/methods.rb
+- test/test_base.rb
+- test/test_cloudapp_api.rb
 has_rdoc: true
 homepage: http://github.com/aaronrussell/cloud_app
 licenses: []
@@ -79,26 +88,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple Ruby wrapper for the CloudApp API. Uses HTTParty with a simple ActiveResource-like interface.
 test_files: 
+- test/helper/faking_setup.rb
+- test/helper/methods.rb
 - test/helper.rb
-- test/test_cloudly.rb
+- test/test_base.rb
+- test/test_cloudapp_api.rb

data/test/test_cloudly.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestCloudAppAPI < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end