cloudapp_api 0.0.1 → 0.0.2

data/README.md

@@ -2,11 +2,8 @@
 
 A simple Ruby wrapper for the [CloudApp API](http://support.getcloudapp.com/faqs/developers/api). Uses [HTTParty](http://github.com/jnunemaker/httparty) with a simple ActiveResource-like interface.
 
-Note: This is functional, but very much a work in progress.
-
 ## TODO
 
-* Get file uploads working
 * Add tests
 * Improve the docs
 
@@ -67,13 +64,11 @@ If you are using the client interface, you must create a client instance.
     
 ### Upload a file
 
-NOTE! This is not working yet
-
     @item = client.upload file_name
     
     # or ..
     
-    @item = CloudApp::Item.create :file, {:path => file_name}
+    @item = CloudApp::Item.create :upload, {:file => file_name}
     
 ### Delete an item
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/cloudapp_api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudapp_api}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Russell"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-05-18}
   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 = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/cloudapp/httparty.rb",
      "lib/cloudapp/monkey_patch/httparty.rb",
      "lib/cloudapp/monkey_patch/net_digest_auth.rb",
+     "lib/cloudapp/multipart.rb",
      "lib/cloudapp_api.rb",
      "test/helper.rb",
      "test/test_cloudly.rb"

data/lib/cloudapp/base.rb

@@ -1,12 +1,18 @@
 require "httparty"
 
 module CloudApp
+  
+  HEADERS = {
+    "User-Agent" => "Ruby.CloudApp.API",
+    "Accept" => "application/json",
+    "Content-Type" => "application/json"
+  }
       
   class Base
     
     include HTTParty
     base_uri "my.cl.ly"
-    headers "Accept" => "application/json", "Content-Type" => "application/json"
+    headers HEADERS
     format :json
     
     def self.authenticate(username, password)
@@ -14,44 +20,40 @@ module CloudApp
     end
     
     def self.find(id)
-      res = get("http://cl.ly/#{id}")
+      res = get "http://cl.ly/#{id}"
       res.ok? ? Item.new(res) : res
     end
     
     def self.all(opts = {})
-      res = get("/items", opts.merge!(:digest_auth => @@auth))
+      res = get "/items", opts.merge!(:digest_auth => @@auth)
       res.ok? ? res.collect{|i| Item.new(i)} : res
     end
     
     def self.create(kind, opts = {})
       case kind
       when :bookmark
-        res = post "/items", {:digest_auth => @@auth, :query => opts}
-        res.ok? ? Item.new(res) : res
-      when :file
-        res = get "/items/new", {:digest_auth => @@auth}
+        res = post "/items", {:query => {:item => opts}, :digest_auth => @@auth}
+      when :upload
+        res = get "/items/new", :digest_auth => @@auth
         return res unless res.ok?
-        res = post res['url'], {
-          :headers => {"Content-Type" => "multipart/form-data"},
-          :params => res['params'].merge!(:file => "@#{opts[:path]}")
-        }
-        res.ok? ? Item.new(res) : res
+        res = post res['url'], Multipart.new(res['params'].merge!(:file => File.new(opts[:file]))).payload.merge!(:digest_auth => @@auth)
       else
-        false
+        return false
       end
+      res.ok? ? Item.new(res) : res
     end
     
-    attr_accessor :attributes
-    
     def initialize(attributes = {})
       load(attributes)
     end
     
     def delete
-      res = self.class.delete(self.href, :digest_auth => @@auth)
+      res = self.class.delete self.href, :digest_auth => @@auth
       res.ok? ? true : res
     end
     
+    private
+    
     def load(attributes = {})
       attributes.each do |key, val|
         self.instance_variable_set("@#{key}", val)

data/lib/cloudapp/client.rb

@@ -21,11 +21,11 @@ module CloudApp
     end
   
     def bookmark(url, name = "")
-      Item.create(:bookmark, :item => {:name => name, :redirect_url => url})
+      Item.create(:bookmark, {:name => name, :redirect_url => url})
     end
     
     def upload(file)
-      Item.create(:file, :path => file)
+      Item.create(:upload, :file => file)
     end
   
     def delete(id)

data/lib/cloudapp/httparty.rb

@@ -10,4 +10,21 @@ module HTTParty
       @code == 200
     end
   end
+  
+  class Request
+    private
+    def setup_raw_request
+      # This is a cloudapp hack to ensure the correct headers are set on redirect from S3
+      if @redirect
+        options[:headers] = CloudApp::HEADERS
+        options[:query] = {}
+        options[:body] = {}
+      end
+      @raw_request = http_method.new(uri.request_uri)
+      @raw_request.body = body if body
+      @raw_request.initialize_http_header(options[:headers])
+      @raw_request.basic_auth(username, password) if options[:basic_auth]
+      setup_digest_auth if options[:digest_auth]
+    end
+  end
 end

data/lib/cloudapp/monkey_patch/httparty.rb

@@ -22,14 +22,6 @@ module HTTParty
       credentials[:password]
     end
     
-    def setup_raw_request
-      @raw_request = http_method.new(uri.request_uri)
-      @raw_request.body = body if body
-      @raw_request.initialize_http_header(options[:headers])
-      @raw_request.basic_auth(username, password) if options[:basic_auth]
-      setup_digest_auth if options[:digest_auth]
-    end
-    
     def setup_digest_auth
       res = http.head(uri.request_uri, options[:headers])
       if res['www-authenticate'] != nil && res['www-authenticate'].length > 0

data/lib/cloudapp/multipart.rb

@@ -0,0 +1,49 @@
+require "mime/types"
+
+module CloudApp
+  
+  class Multipart
+    
+    EOL = "\r\n"
+    
+    def initialize(params)
+      @params = params
+      file = @params.delete(:file)
+      bound = "--#{boundary}"
+      @body = bound + EOL
+      @params.each do |key, val|
+        @body += create_regular_field(key, val)
+        @body += EOL + bound + EOL
+      end
+      @body += create_file_field(file)
+      @body += EOL + bound + "--#{EOL}"
+    end
+    
+    def payload
+      {
+        :headers => {"Content-Type" => "multipart/form-data; boundary=#{boundary}"},
+        :body => @body
+      }
+    end
+    
+    def boundary
+      @boundary ||= "#{HEADERS["User-Agent"]}.#{Array.new(16/2) { rand(256) }.pack("C*").unpack("H*").first}"
+    end
+    
+    def create_regular_field(key, val)
+      %Q{Content-Disposition: form-data; name="#{key}"} + EOL + EOL + val
+    end
+    
+    def create_file_field(file)
+      %Q{Content-Disposition: form-data; name="file"; filename="#{File.basename(file.path)}"} + EOL +
+        "Content-Type: #{mime_for(file.path)}" + EOL + EOL +
+        file.read 
+    end
+    
+    def mime_for(path)
+      (MIME::Types.type_for(path)[0] || MIME::Types["application/octet-stream"][0]).simplified
+    end
+    
+  end
+  
+end

data/lib/cloudapp_api.rb

@@ -1,12 +1,12 @@
 require "httparty"
 
-["base", "client", "httparty"].each do |inc|
+["base", "client", "multipart", "httparty"].each do |inc|
   require File.join(File.dirname(__FILE__), "cloudapp", inc)
 end
 
 module CloudApp
   
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   
   def CloudApp.authenticate(username, password)
     Base.authenticate(username, password)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Aaron Russell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 +01:00
+date: 2010-05-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - lib/cloudapp/httparty.rb
 - lib/cloudapp/monkey_patch/httparty.rb
 - lib/cloudapp/monkey_patch/net_digest_auth.rb
+- lib/cloudapp/multipart.rb
 - lib/cloudapp_api.rb
 - test/helper.rb
 - test/test_cloudly.rb