infomeme_client 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/infomeme_client/functions/user.rb

@@ -2,8 +2,8 @@ module InfomemeClient::Functions::User
     attr_accessor :default_language, :default_currency
 
     def register(email, username, password, firstname, lastname, optional_fields = {})
-	optional_fields.set(:language_code, optional_fields.key?(:language) ? optional_fields.delete(:language) : default_language) #language is mandatory
-	optional_fields.set(:currency_code, optional_fields.key?(:currency) ? optional_fields.delete(:currency) : default_currency) #currency is mandatory
+	optional_fields.store(:language_code, optional_fields.key?(:language) ? optional_fields.delete(:language) : default_language) #language is mandatory
+	optional_fields.store(:currency_code, optional_fields.key?(:currency) ? optional_fields.delete(:currency) : default_currency) #currency is mandatory
 	handle_response :post, "/users/register", optional_fields.merge({:email => email, :username => username, :password => password, :firstname => firstname, :lastname => lastname}) do
 	    authorize_with_credentials username, password and return true
 	end

data/lib/infomeme_client/functions/user_meme.rb

@@ -55,14 +55,21 @@ module InfomemeClient::Functions::UserMeme
 
     def upload(meme_id, file)
 	upload_url = upload_for_meme(meme_id, true)
-	if upload_url
-	    url = URI.parse(upload_url)
-	    req = Net::HTTP::Post::Multipart.new url.path, generate_signature.merge({:meme_id => meme_id, :file => file})
-	    resp = Net::HTTP.start(url.host, url.port) {|http| http.request(req)}
-	    resp == Net::HTTPSuccess
+	http_multipart(upload_url, generate_signature.merge({:meme_id => meme_id, :file => file})) if upload_url
+    end
+
+    def image_upload_for_meme(meme_id)
+	return false unless authorized?
+	handle_response :get, "/users/#{verified_user}/memes/#{meme_id}/image_upload_parameters" do |resp|
+	    resp.image_upload_parameters unless resp.error?
 	end
     end
 
+    def upload_image(meme_id, file)
+	upload_params = image_upload_for_meme(meme_id)
+	http_multipart("https://#{upload_params.bucket}.s3.amazonaws.com/", upload_params.reject {|k,v| k == :bucket}.merge({:file => file})) if upload_params
+    end
+
     def rate(meme_id, rating)
 	return false unless authorized?
 	handle_response :post, "/users/#{verified_user}/memes/#{meme_id}/rates", {:rating => rating}
@@ -91,4 +98,11 @@ module InfomemeClient::Functions::UserMeme
 	    return false unless authorized?
 	    handle_response method, "/users/#{verified_user}/memes/#{meme_id}" + (cmd.nil? ? "" : "/#{cmd}"), params, headers
 	end
+
+	def http_multipart(url, params)
+	    url = URI.parse(url)
+	    req = Net::HTTP::Post::Multipart.new url.path, params
+	    resp = Net::HTTP.start(url.host, url.port) {|http| http.request(req)}
+	    resp == Net::HTTPSuccess
+	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: infomeme_client
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Infomeme Ltd.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency