infomeme_client 0.1.2 → 0.1.3

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_dependency "oauth"
     gem.add_dependency "json"
     gem.add_dependency "multipart-post"
+    gem.add_dependency "mime-types"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/infomeme_client.rb

@@ -1,6 +1,7 @@
 require "oauth"
 require "json"
 require "net/http/post/multipart"
+require "mime/types"
 
 class InfomemeClient
     require "infomeme_client/errors"

data/lib/infomeme_client/entity_hash/invoice.rb

@@ -0,0 +1,2 @@
+class InfomemeClient::EntityHash::Invoice < InfomemeClient::EntityHash
+end

data/lib/infomeme_client/entity_hash/transaction.rb

@@ -1,3 +1,2 @@
 class InfomemeClient::EntityHash::Transaction < InfomemeClient::EntityHash
-    #todo: invoices
 end

data/lib/infomeme_client/functions/user.rb

@@ -42,6 +42,31 @@ module InfomemeClient::Functions::User
 	handle_response :put, "/users/#{user_id || verified_user}/new_password", {:new_password => new_password}.merge(user_id.nil? ? {} : {:confirm_code => confirm_code})
     end
 
+    def accept_tos
+	return false unless authorized?
+	handle_response :put, "/users/#{verified_user}/accept_tos" do
+	    refresh_settings and return true
+	end
+    end
+
+    def countries
+	handle_response :get, "/users/countries" do |resp|
+	    resp.countries unless resp.error?
+	end
+    end
+
+    def currencies
+	handle_response :get, "/users/currencies" do |resp|
+	    resp.currencies unless resp.error?
+	end
+    end
+
+    def languages
+	handle_response :get, "/users/languages" do |resp|
+	    resp.languages unless resp.error?
+	end
+    end
+
     private
 	attr_accessor :settings
 

data/lib/infomeme_client/functions/user_meme.rb

@@ -21,12 +21,23 @@ module InfomemeClient::Functions::UserMeme
 
     def publish(meme_type, options = {})
 	return false unless can_publish?
-	handle_response :post, "/user/#{verified_user}/memes", options.merge({:meme_type => meme_type.respond_to?(:id) ? meme_type.id : meme_type}) do |resp|
+	skip_upload = options.key?(:skip_upload) && options[:skip_upload]
+	options[:image] = upload_image(options[:image]) if ! skip_upload && options.key?(:image) && ! options[:image].nil? && options[:image] != ""
+	meme_type = meme_type.id if meme_type.is_a?(InfomemeClient::EntityHash::MemeType)
+	meme_id = handle_response :post, "/users/#{verified_user}/memes", options.reject {|k,v| k == :file}.merge({:type => meme_type}) do |resp|
 	    resp.meme_id unless resp.error?
 	end
+	upload(meme_id, options[:file]) if options.key?(:file)
+	meme_id
+    end
+
+    def published_meme(meme_id)
+	return false unless authorized?
+	extract_from_response :meme, :get, "/users/#{verified_user}/memes/#{meme_id}"
     end
 
     def update_meme(meme_id, options = {})
+	options[:image] = upload_image(options[:image]) if options.key?(:image)
 	meme_function meme_id, :put, nil, options
     end
 
@@ -49,25 +60,27 @@ module InfomemeClient::Functions::UserMeme
     def upload_for_meme(meme_id, raw = false)
 	return false unless authorized?
 	handle_response :get, "/users/#{verified_user}/memes/#{meme_id}/upload_url" do |resp|
-	    (raw ? res.upload_url : finalize_get_url(resp.upload_url, generate_signature)) unless resp.error?
+	    (raw ? resp.upload_url : finalize_get_url(resp.upload_url, generate_signature.merge(:meme_id => meme_id))) unless resp.error?
 	end
     end
 
-    def upload(meme_id, file)
-	upload_url = upload_for_meme(meme_id, true)
-	http_multipart(upload_url, generate_signature.merge({:meme_id => meme_id, :file => file})) if upload_url
-    end
-
-    def image_upload_for_meme(meme_id)
+    def image_upload_for_memes
 	return false unless authorized?
-	handle_response :get, "/users/#{verified_user}/memes/#{meme_id}/image_upload_parameters" do |resp|
+	handle_response :get, "/users/#{verified_user}/memes/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
+    def upload(meme_id, file)
+	file = File.new(file) if file.is_a?(String)
+	upload_url = upload_for_meme(meme_id, true)
+	http_multipart(upload_url, generate_signature.merge({:meme_id => meme_id, :file => uploadio(file)})) if upload_url
+    end
+
+    def upload_image(file)
+	file = File.new(file) if file.is_a?(String)
+	upload_params = image_upload_for_memes
+	File.basename(file.path) if upload_params && http_multipart("https://#{upload_params.bucket}.s3.amazonaws.com/", upload_params.to_hash.reject {|k,v| k == :bucket}.merge(:success_action_status => 200).to_a.push([:file, uploadio(file)])) #ensure file comes last (amazon requires the order)
     end
 
     def rate(meme_id, rating)
@@ -84,7 +97,7 @@ module InfomemeClient::Functions::UserMeme
 	def generate_signature
 	    nonce = OAuth::Helper.generate_nonce
 	    timestamp = Time.now.to_i
-	    req_proxy = OAuth::RequestProxy.proxy("method" => "GET", "uri" => consumer.site, "parameters" => {"oauth_consumer_key" => consumer.key, "oauth_token" => token.token, "oauth_nonce" => nonce, "oauth_timestamp" => timestamp, "oauth_signature_method" => "HMAC-SHA1"})
+	    req_proxy = OAuth::RequestProxy.proxy("method" => "GET", "uri" => "https://api.infomeme.com", "parameters" => {"oauth_consumer_key" => consumer.key, "oauth_token" => token.token, "oauth_nonce" => nonce, "oauth_timestamp" => timestamp, "oauth_signature_method" => "HMAC-SHA1"})
 	    signature = req_proxy.sign({:consumer_secret => consumer.secret, :token_secret => token.secret})
 	    {:oauth_token => token.token, :oauth_nonce => nonce, :oauth_timestamp => timestamp, :oauth_signature => signature}
 	end
@@ -102,7 +115,13 @@ module InfomemeClient::Functions::UserMeme
 	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
+	    http = Net::HTTP.new(url.host, url.port)
+	    http.use_ssl = url.scheme == "https"
+	    resp = http.start {|http| http.request(req)}
+	    resp.is_a?(Net::HTTPSuccess)
+	end
+
+	def uploadio(file)
+	    UploadIO.new(file, MIME::Types.type_for(file.path), file.path)
 	end
 end

data/lib/infomeme_client/functions/user_transaction.rb

@@ -4,18 +4,13 @@ module InfomemeClient::Functions::UserTransaction
 	extract_or_response :transactions, :get, "/users/#{verified_user}/transactions", options
     end
 
-    def transaction(transaction_id)
-	return false unless authorized?
-	extract_from_response :transaction, :get, "/users/#{verified_user}/transactions/#{transaction_id}"
-    end
-
     def invoices(options = {})
-	transactions = transactions(options)
-	transactions.collect {|tr| tr.invoice} if transactions
+	return false unless authorized?
+	extract_or_response :invoices, :get, "/users/#{verified_user}/invoices", options
     end
 
-    def invoice(transaction_id)
-	transaction = transaction(transaction_id)
-	transaction.invoice if transaction
+    def invoice(invoice_id)
+	return false unless authorized?
+	extract_from_response :invoice, :get, "/users/#{verified_user}/invoices/#{invoice_id}"
     end
 end

data/lib/infomeme_client/meme_application.rb

@@ -4,12 +4,12 @@ class InfomemeClient::MemeApplication
 	self.token = OAuth::AccessToken.new(consumer)
     end
 
-    def verify_access(meme_id, oauth_token, oauth_nonce, oauth_timestamp, oauth_signature)
-	handle_response :post, "/meme_app/verify_access", {:meme_id => meme_id, :verify_token => oauth_token, :verify_nonce => oauth_nonce, :verify_timestamp => oauth_timestamp, :verify_signature => oauth_signature}
+    def verify_access(access_type, meme_id, oauth_token, oauth_nonce, oauth_timestamp, oauth_signature)
+	handle_response :post, "/meme_app/verify_access", {:access_type => access_type, :meme_id => meme_id, :verify_token => oauth_token, :verify_nonce => oauth_nonce, :verify_timestamp => oauth_timestamp, :verify_signature => oauth_signature}
     end
 
-    def set_has_upload(meme_id, has_upload = true)
-	handle_response :put, "/meme_app/meme/#{meme_id}", {:has_upload => has_upload}
+    def update_meme(meme_id, description, has_upload = true)
+	handle_response :put, "/meme_app/memes/#{meme_id}", {:description => description, :has_upload => has_upload}
     end
 
     private

data/lib/infomeme_client/response.rb

@@ -42,7 +42,8 @@ class InfomemeClient::Response < InfomemeClient::EntityHash
 	    when :meme, :memes then InfomemeClient::EntityHash::Meme
 	    when :meme_types then InfomemeClient::EntityHash::MemeType
 	    when :user then InfomemeClient::EntityHash::User
-	    when :transaction, :transactions then InfomemeClient::EntityHash::Transaction
+	    when :transactions then InfomemeClient::EntityHash::Transaction
+	    when :invoice, :invoices then InfomemeClient::EntityHash::Invoice
 	    else InfomemeClient::EntityHash
 	end
 	stored = to_hash[key]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: infomeme_client
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Infomeme Ltd.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: A RubyGem for implementing both Infomeme client and meme applications.
 email: infomeme@infomeme.com
 executables: []
@@ -81,6 +95,7 @@ files:
 - lib/infomeme_client/communication.rb
 - lib/infomeme_client/entity_hash.rb
 - lib/infomeme_client/entity_hash/comment.rb
+- lib/infomeme_client/entity_hash/invoice.rb
 - lib/infomeme_client/entity_hash/meme.rb
 - lib/infomeme_client/entity_hash/meme_type.rb
 - lib/infomeme_client/entity_hash/transaction.rb