infomeme_client 0.2.8 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.10

data/infomeme_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{infomeme_client}
-  s.version = "0.2.8"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infomeme Ltd."]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-06-09}
   s.description = %q{A RubyGem for implementing both Infomeme client and meme applications.
  More coming soon...}
   s.email = %q{infomeme@infomeme.com}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "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/review.rb",
     "lib/infomeme_client/entity_hash/transaction.rb",
     "lib/infomeme_client/entity_hash/user.rb",
     "lib/infomeme_client/errors.rb",

data/lib/infomeme_client.rb

@@ -4,19 +4,19 @@ require "net/http/post/multipart"
 require "mime/types"
 
 class InfomemeClient
-    require "infomeme_client/errors"
+  require "infomeme_client/errors"
 
-    autoload :EntityHash, "infomeme_client/entity_hash"
-    autoload :Response, "infomeme_client/response"
-    autoload :Base, "infomeme_client/base"
-    autoload :Communication, "infomeme_client/communication"
-    autoload :Permissions, "infomeme_client/permissions"
-    autoload :Functions, "infomeme_client/functions"
+  autoload :EntityHash, "infomeme_client/entity_hash"
+  autoload :Response, "infomeme_client/response"
+  autoload :Base, "infomeme_client/base"
+  autoload :Communication, "infomeme_client/communication"
+  autoload :Permissions, "infomeme_client/permissions"
+  autoload :Functions, "infomeme_client/functions"
 
-    autoload :MemeApplication, "infomeme_client/meme_application"
+  autoload :MemeApplication, "infomeme_client/meme_application"
 
-    include Base
-    include Communication
-    include Permissions
-    include Functions
+  include Base
+  include Communication
+  include Permissions
+  include Functions
 end

data/lib/infomeme_client/base.rb

@@ -1,77 +1,77 @@
 module InfomemeClient::Base
-    def initialize(options = {})
-	self.consumer = OAuth::Consumer.new(options[:api_key] || ::INFOMEME_API_KEY, options[:api_secret] || ::INFOMEME_API_SECRET, :site => options[:site] || ::INFOMEME_API_SITE)
-	self.default_language = options[:language] || "en"
-	case
+  def initialize(options = {})
+  	self.consumer = OAuth::Consumer.new(options[:api_key] || ::INFOMEME_API_KEY, options[:api_secret] || ::INFOMEME_API_SECRET, :site => options[:site] || ::INFOMEME_API_SITE)
+  	self.default_language = options[:language] || "en"
+  	case
 	    when options.key?(:token) && options.key?(:secret) then authorize_with_token(options[:token], options[:secret])
 	    when options.key?(:login) && options.key?(:password) then authorize_with_credentials(options[:login], options[:password])
 	    else deauthorize
-	end
-    end
+  	end
+  end
 
-    def request_authorization
-	response = handle_response :get, consumer.request_token_url
-	response.request_token
-    end
+  def request_authorization
+    response = handle_response :get, consumer.request_token_url
+    response.request_token
+  end
 
-    def authorize_url(token, permissions = [])
-	"https://infomeme.com/authorize?token=#{token}&permissions=#{permissions.join(',')}"
-    end
+  def authorize_url(token, permissions = [])
+	 "https://infomeme.com/authorize?token=#{token}&permissions=#{permissions.join(',')}"
+  end
 
-    def authorize_with_verifier(token, secret, verifier)
-	req_token = OAuth::RequestToken.new(consumer, token, secret)
-	response = token_request(req_token, :get, finalize_get_url(consumer.access_token_url, {:oauth_verifier => verifier})) #do request with request_token
-	return false if response.error?
-	authorize_with_token(response.access_token.token, response.access_token.secret)
-    end
+  def authorize_with_verifier(token, secret, verifier)
+    req_token = OAuth::RequestToken.new(consumer, token, secret)
+    response = token_request(req_token, :get, finalize_get_url(consumer.access_token_url, {:oauth_verifier => verifier})) #do request with request_token
+    return false if response.error?
+    authorize_with_token(response.access_token.token, response.access_token.secret)
+  end
 
-    def authorize_with_token(token, secret)
-	access_token = OAuth::AccessToken.new(consumer, token, secret)
-	response = token_request(access_token, :get, "/oauth/verify_access")
-	return false if response.error?
-	self.verified_user = response.user_id
-	self.token = access_token
-	refresh_user_data
-	self
-    end
+  def authorize_with_token(token, secret)
+    access_token = OAuth::AccessToken.new(consumer, token, secret)
+    response = token_request(access_token, :get, "/oauth/verify_access")
+    return false if response.error?
+    self.verified_user = response.user_id
+    self.token = access_token
+    refresh_user_data
+    self
+  end
 
-    def authorize_with_credentials(login, password, permissions = nil)
-	req_token = request_authorization
-	response = put(consumer.authorize_url, {:oauth_token => req_token.token, :login => login, :password => password, :permissions => permissions || all_permissions.collect {|perm| perm.id}})
-	return false if response.error?
-	authorize_with_verifier(req_token.token, req_token.secret, response.verifier)
-    end
+  def authorize_with_credentials(login, password, permissions = nil)
+    req_token = request_authorization
+    response = put(consumer.authorize_url, {:oauth_token => req_token.token, :login => login, :password => password, :permissions => permissions || all_permissions.collect {|perm| perm.id}})
+    return false if response.error?
+    authorize_with_verifier(req_token.token, req_token.secret, response.verifier)
+  end
 
-    def deauthorize
-	self.verified_user = nil
-	self.token = OAuth::AccessToken.new(consumer)
-	refresh_user_data
-	self
-    end
+  def deauthorize
+    self.verified_user = nil
+    self.token = OAuth::AccessToken.new(consumer)
+    refresh_user_data
+    self
+  end
 
-    def authorized?
-	! verified_user.nil?
-    end
+  def authorized?
+    ! verified_user.nil?
+  end
 
-    def credentials(just = nil)
-	creds = {
-	    :login => verified_user,
-	    :token => token.token,
-	    :secret => token.secret,
-	}
-	creds.key?(just) ? creds[just] : creds
-    end
+  def credentials(just = nil)
+    creds = {
+        :login => verified_user,
+        :token => token.token,
+        :secret => token.secret,
+    }
+    creds.key?(just) ? creds[just] : creds
+  end
 
-    def inspect
-	@all_permissions ||= all_permissions
-	"#<#{self.class.name}: #{authorized? ? credentials.merge({:permissions => (@all_permissions || []).select {|perm| has_permission?(perm.id)}.collect {|perm| perm.name}}).inspect : 'not authorized'}>"
-    end
+  def inspect
+    @all_permissions ||= all_permissions
+    "#<#{self.class.name}: #{authorized? ? credentials.merge({:permissions => (@all_permissions || []).select {|perm| has_permission?(perm.id)}.collect {|perm| perm.name}}).inspect : 'not authorized'}>"
+  end
 
-    private
-	attr_accessor :consumer, :token, :verified_user
+  private
+  attr_accessor :consumer, :token, :verified_user
 
-	def refresh_user_data
-	    refresh_settings
-	    refresh_permissions
-	end
+  def refresh_user_data
+    refresh_settings
+    refresh_permissions
+  end
 end

data/lib/infomeme_client/entity_hash.rb

@@ -1,66 +1,66 @@
 class InfomemeClient::EntityHash
-    autoload :Comment, "infomeme_client/entity_hash/comment"
-    autoload :Invoice, "infomeme_client/entity_hash/invoice"
-    autoload :Meme, "infomeme_client/entity_hash/meme"
-    autoload :MemeType, "infomeme_client/entity_hash/meme_type"
-    autoload :Transaction, "infomeme_client/entity_hash/transaction"
-    autoload :User, "infomeme_client/entity_hash/user"
+  autoload :Comment, "infomeme_client/entity_hash/comment"
+  autoload :Invoice, "infomeme_client/entity_hash/invoice"
+  autoload :Meme, "infomeme_client/entity_hash/meme"
+  autoload :MemeType, "infomeme_client/entity_hash/meme_type"
+  autoload :Transaction, "infomeme_client/entity_hash/transaction"
+  autoload :User, "infomeme_client/entity_hash/user"
 
-    def initialize(hsh, no_freeze = false)
-	@hsh = hsh.inject({}) {|memo, keyvalue| #ripped from ActiveSupport, http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html#M000904
+  def initialize(hsh, no_freeze = false)
+  	@hsh = hsh.inject({}) {|memo, keyvalue| #ripped from ActiveSupport, http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html#M000904
 	    key, value = keyvalue
 	    memo[(key.to_sym rescue key) || key] = map_values(value)
 	    memo
-	}
-	freeze unless no_freeze
-    end
+    }
+    freeze unless no_freeze
+  end
 
-    def method_missing(sym)
-	@hsh.key?(sym) ? @hsh[sym] : super
-    end
+  def method_missing(sym)
+    @hsh.key?(sym) ? @hsh[sym] : super
+  end
 
-    def respond_to?(sym, include_private = false)
-	@hsh.key?(sym) ? true : super
-    end
+  def respond_to?(sym, include_private = false)
+    @hsh.key?(sym) ? true : super
+  end
 
-    def to_hash
-	@hsh.inject({}) do |memo, (key, value)|
-	    memo[key] = extract_values(value)
-	    memo
-	end
+  def to_hash
+    @hsh.inject({}) do |memo, (key, value)|
+      memo[key] = extract_values(value)
+      memo
     end
+  end
 
-    def freeze
-	@hsh.each do |key, val|
-	    deep_freeze(val)
-	end
-	@hsh.freeze
-	super
+  def freeze
+  	@hsh.each do |key, val|
+      deep_freeze(val)
     end
+    @hsh.freeze
+    super
+  end
 
-    def id
-	@hsh.key?(:id) ? @hsh[:id] : super
-    end
+  def id
+    @hsh.key?(:id) ? @hsh[:id] : super
+  end
 
-    private
-	def map_values(val)
-	    case
-		when val.is_a?(Hash) then InfomemeClient::EntityHash.new(val)
-		when val.is_a?(Array) then val.collect {|obj| map_values(obj)}
-		else val
-	    end
-	end
+  private
+  def map_values(val)
+    case
+      when val.is_a?(Hash) then InfomemeClient::EntityHash.new(val)
+      when val.is_a?(Array) then val.collect {|obj| map_values(obj)}
+      else val
+    end
+  end
 
 	def extract_values(val)
-	    case
-		when val.is_a?(InfomemeClient::EntityHash) then val.to_hash
-		when val.is_a?(Array) then val.collect {|obj| extract_values(obj)}
-		else val
-	    end
+    case
+      when val.is_a?(InfomemeClient::EntityHash) then val.to_hash
+      when val.is_a?(Array) then val.collect {|obj| extract_values(obj)}
+      else val
+    end
 	end
 
 	def deep_freeze(val)
-	    val.each {|obj| deep_freeze(obj)} if val.is_a?(Array)
-	    val.freeze
+    val.each {|obj| deep_freeze(obj)} if val.is_a?(Array)
+    val.freeze
 	end
 end

data/lib/infomeme_client/entity_hash/meme.rb

@@ -1,45 +1,49 @@
 class InfomemeClient::EntityHash::Meme < InfomemeClient::EntityHash
-    def initialize(meme, client)
-	super(meme, true)
-	@client = client
-	freeze
-    end
+  def initialize(meme, client)
+    super(meme, true)
+    @client = client
+    freeze
+  end
 
-    #todo: have_access?, published_by_me?, confirmed?, inactive?, incomplete?, has_upload?, etc.
+  #todo: have_access?, published_by_me?, confirmed?, inactive?, incomplete?, has_upload?, etc.
 
-    def update(options = {})
-	@client.update_meme(id, options)
-    end
+  def update(options = {})
+    @client.update_meme(id, options)
+  end
 
-    def delete
-	@client.delete_meme(id)
-    end
+  def delete
+    @client.delete_meme(id)
+  end
 
-    def confirm
-	@client.confirm_meme(id)
-    end
+  def confirm
+    @client.confirm_meme(id)
+  end
 
-    def activate
-	@client.activate_meme(id)
-    end
+  def activate
+    @client.activate_meme(id)
+  end
 
-    def deactivate
-	@client.deactivate_meme(id)
-    end
+  def deactivate
+    @client.deactivate_meme(id)
+  end
 
-    def upload_url(raw = false)
-	@client.upload_for_meme(id, raw)
-    end
+  def upload_url(raw = false)
+    @client.upload_for_meme(id, raw)
+  end
 
-    def upload(file)
-	@client.upload(id, file)
-    end
+  def upload(file)
+    @client.upload(id, file)
+  end
 
-    def rate(rating)
-	@client.rate(id, rating)
-    end
+  def review(reveiw)
+    @client.review id, review
+  end
 
-    def comment(comment)
-	@client.comment(id, comment)
-    end
+  def rate(rating)
+    @client.rate(id, rating)
+  end
+
+  def comment(comment)
+    @client.comment(id, comment)
+  end
 end

data/lib/infomeme_client/entity_hash/review.rb

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

data/lib/infomeme_client/functions/meme.rb

@@ -1,23 +1,23 @@
 module InfomemeClient::Functions::Meme
-    def browse(options = {})
-	get_memes "/memes", options
-    end
+  def browse(options = {})
+    get_memes "/memes", options
+  end
 
-    def search(search_token, options = {})
-	get_memes "/memes/search", options.merge({:search_token => search_token})
-    end
+  def search(search_token, options = {})
+    get_memes "/memes/search", options.merge({:search_token => search_token})
+  end
 
-    def meme_types
-	extract_from_response :meme_types, :get, "/memes/types"
-    end
+  def meme_types
+    extract_from_response :meme_types, :get, "/memes/types"
+  end
 
-    def meme(meme_id)
-	handle_response :get, "/memes/#{meme_id}" do |resp|
-	    resp.extract(:meme, self) unless resp.error?
-	end
+  def meme(meme_id)
+    handle_response :get, "/memes/#{meme_id}" do |resp|
+      resp.extract(:meme, self) unless resp.error?
     end
+  end
 
-    def meme_comments(meme_id, options = {})
-	extract_or_response :comments, :get, "/memes/#{meme_id}/comments", options
-    end
+  def meme_comments(meme_id, options = {})
+    extract_or_response :comments, :get, "/memes/#{meme_id}/comments", options
+  end
 end

data/lib/infomeme_client/functions/user.rb

@@ -1,79 +1,78 @@
 module InfomemeClient::Functions::User
-    attr_accessor :default_language
-
-    def register(email, username, password, firstname, lastname, optional_fields = {})
-	optional_fields.store(:language_code, optional_fields.key?(:language) ? optional_fields.delete(:language) : default_language) #language 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
+  attr_accessor :default_language
+  def register(email, username, password, firstname, lastname, optional_fields = {})
+    optional_fields.store(:language_code, optional_fields.key?(:language) ? optional_fields.delete(:language) : default_language) #language 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
+  end
 
-    def user(user_id = nil)
-	return false if ! authorized? && user_id.nil?
-	extract_from_response :user, :get, "/users/#{user_id || verified_user}"
-    end
+  def user(user_id = nil)
+    return false if ! authorized? && user_id.nil?
+    extract_from_response :user, :get, "/users/#{user_id || verified_user}"
+  end
 
-    def update_settings(attribs = {})
-	return false unless authorized?
-	handle_response :put, "/users/#{verified_user}", attribs do
-	    refresh_settings and return true
-	end
+  def update_settings(attribs = {})
+    return false unless authorized?
+    handle_response :put, "/users/#{verified_user}", attribs do
+      refresh_settings and return true
     end
+  end
 
-    def confirm(confirm_code)
-	return false unless authorized?
-	handle_response :put, "/users/#{verified_user}/confirm", {:confirm_code => confirm_code} do
-	    refresh_settings and return true
-	end
+  def confirm(confirm_code)
+    return false unless authorized?
+    handle_response :put, "/users/#{verified_user}/confirm", {:confirm_code => confirm_code} do
+      refresh_settings and return true
     end
+  end
 
-    def confirmed?
-	authorized? && settings && settings.confirmed
-    end
+  def confirmed?
+    authorized? && settings && settings.confirmed
+  end
 
-    def reset_password(user_id = nil)
-	return false if ! authorized? && user_id.nil?
-	handle_response :get, "/users/#{user_id || verified_user}/reset_password"
-    end
+  def reset_password(user_id = nil)
+    return false if ! authorized? && user_id.nil?
+    handle_response :get, "/users/#{user_id || verified_user}/reset_password"
+  end
 
-    def new_password(new_password, user_id = nil, confirm_code = "")
-	return false if ! authorized? && user_id.nil?
-	handle_response :put, "/users/#{user_id || verified_user}/new_password", {:new_password => new_password}.merge(user_id.nil? ? {} : {:confirm_code => confirm_code})
-    end
+  def new_password(new_password, user_id = nil, confirm_code = "")
+    return false if ! authorized? && user_id.nil?
+    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
+  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
+  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
+  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
+  def languages
+    handle_response :get, "/users/languages" do |resp|
+      resp.languages unless resp.error?
     end
+  end
 
-    private
-	attr_accessor :settings
+  private
+  attr_accessor :settings
 
-	def refresh_settings
-	    self.settings = nil
-	    return false unless authorized?
-	    response = get("/users/#{verified_user}")
-	    return false if response.error?
-	    self.settings = response.user
-	end
+  def refresh_settings
+    self.settings = nil
+    return false unless authorized?
+    response = get("/users/#{verified_user}")
+    return false if response.error?
+    self.settings = response.user
+  end
 end

data/lib/infomeme_client/functions/user_meme.rb

@@ -83,6 +83,16 @@ module InfomemeClient::Functions::UserMeme
     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 review(meme_id, review)
+    return false unless authorized?
+    handle_response :post, "/users/#{verified_user}/memes/#{meme_id}/reviews", {:review => review}
+  end
+  
+  def review(meme_id, rating, comment)
+    return false unless authorized?
+    handle_response :post, "/users/#{verified_user}/memes/#{meme_id}/reviews", {:rating => rating, :comment => comment}
+  end
+
   def rate(meme_id, rating)
     return false unless authorized?
     handle_response :post, "/users/#{verified_user}/memes/#{meme_id}/rates", {:rating => rating}

data/lib/infomeme_client/functions/user_order.rb

@@ -1,31 +1,31 @@
 module InfomemeClient::Functions::UserOrder
-    def order(meme_id, source, options = {})
-	return false unless authorized?
-	handle_response :post, "/users/#{verified_user}/memes/#{meme_id}/order", options.merge(:source => source)
-    end
+  def order(meme_id, source, options = {})
+    return false unless authorized?
+    handle_response :post, "/users/#{verified_user}/memes/#{meme_id}/order", options.merge(:source => source)
+  end
 
-    def order_with_balance(meme_id, options = {})
-	order(meme_id, 1, options)
-	refresh_settings
-	true
-    end
+  def order_with_balance(meme_id, options = {})
+    order(meme_id, 1, options)
+    refresh_settings
+    true
+  end
 
-    def order_with_paypal(meme_id, options = {})
-	order(meme_id, 3, options).paypal_url
-    end
+  def order_with_paypal(meme_id, options = {})
+    order(meme_id, 3, options).paypal_url
+  end
 
-    def transactions(options = {})
-	return false unless authorized?
-	extract_or_response :transactions, :get, "/users/#{verified_user}/transactions", options
-    end
+  def transactions(options = {})
+    return false unless authorized?
+    extract_or_response :transactions, :get, "/users/#{verified_user}/transactions", options
+  end
 
-    def invoices(options = {})
-	return false unless authorized?
-	extract_or_response :invoices, :get, "/users/#{verified_user}/invoices", options
-    end
+  def invoices(options = {})
+    return false unless authorized?
+    extract_or_response :invoices, :get, "/users/#{verified_user}/invoices", options
+  end
 
-    def invoice(invoice_id)
-	return false unless authorized?
-	extract_from_response :invoice, :get, "/users/#{verified_user}/invoices/#{invoice_id}"
-    end
+  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

@@ -1,18 +1,18 @@
 class InfomemeClient::MemeApplication
-    def initialize(options = {})
-	self.consumer = OAuth::Consumer.new(options[:api_key] || ::INFOMEME_API_KEY, options[:api_secret] || ::INFOMEME_API_SECRET, :site => options[:site] || ::INFOMEME_API_SITE)
-	self.token = OAuth::AccessToken.new(consumer)
-    end
+  def initialize(options = {})
+    self.consumer = OAuth::Consumer.new(options[:api_key] || ::INFOMEME_API_KEY, options[:api_secret] || ::INFOMEME_API_SECRET, :site => options[:site] || ::INFOMEME_API_SITE)
+    self.token = OAuth::AccessToken.new(consumer)
+  end
 
-    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 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 update_meme(meme_id, description, has_upload = true)
-	handle_response :put, "/meme_app/memes/#{meme_id}", {:description => description, :has_upload => has_upload}
-    end
+  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
-	attr_accessor :consumer, :token
-	include InfomemeClient::Communication
+  private
+  attr_accessor :consumer, :token
+  include InfomemeClient::Communication
 end

data/lib/infomeme_client/permissions.rb

@@ -1,22 +1,22 @@
 module InfomemeClient::Permissions
-    def all_permissions
-	handle_response :get, "/oauth/permissions" do |resp|
-	    resp.permissions unless resp.error?
-	end
+  def all_permissions
+    handle_response :get, "/oauth/permissions" do |resp|
+      resp.permissions unless resp.error?
     end
+  end
 
-    def has_permission?(perm)
-	authorized? && permissions && permissions.include?(perm)
-    end
+  def has_permission?(perm)
+    authorized? && permissions && permissions.include?(perm)
+  end
 
-    private
-	attr_accessor :permissions
+  private
+  attr_accessor :permissions
 
-	def refresh_permissions
-	    self.permissions = nil
-	    return false unless authorized?
-	    response = get "/users/#{verified_user}/permissions"
-	    return false if response.error?
-	    self.permissions = response.permissions
-	end
+  def refresh_permissions
+    self.permissions = nil
+    return false unless authorized?
+    response = get "/users/#{verified_user}/permissions"
+    return false if response.error?
+    self.permissions = response.permissions
+  end
 end

data/lib/infomeme_client/response.rb

@@ -1,52 +1,52 @@
 class InfomemeClient::Response < InfomemeClient::EntityHash
-    STATUS_FAILED = -1
-    STATUS_OK = 0
-    STATUS_ERROR = 1
+  STATUS_FAILED = -1
+  STATUS_OK = 0
+  STATUS_ERROR = 1
 
-    ERRORS = {
-	"request_failed" => InfomemeClient::Error::RequestFailed,
-	"error" => InfomemeClient::Error,
-	"internal_error" => InfomemeClient::Error::InternalError,
-	"no_access" => InfomemeClient::Error::NoAccess,
-	"not_found" => InfomemeClient::Error::NotFound,
-    }.freeze
+  ERRORS = {
+    "request_failed" => InfomemeClient::Error::RequestFailed,
+    "error" => InfomemeClient::Error,
+    "internal_error" => InfomemeClient::Error::InternalError,
+    "no_access" => InfomemeClient::Error::NoAccess,
+    "not_found" => InfomemeClient::Error::NotFound,
+  }.freeze
 
-    def initialize(response)
-	super(response.is_a?(Exception) ? {:status => STATUS_FAILED, :message => "Request failed.", :error_code => "request_failed", :errors => {:base => {response.class.name.to_sym => response.message}}} : response, true)
-	ERRORS.each do |key, val|
-	    instance_eval "def #{val.name.split('::').last.sub(/\b\w/) { $&.downcase }}Error?; error_code == #{key}; end"
-	end
-	freeze
+  def initialize(response)
+    super(response.is_a?(Exception) ? {:status => STATUS_FAILED, :message => "Request failed.", :error_code => "request_failed", :errors => {:base => {response.class.name.to_sym => response.message}}} : response, true)
+    ERRORS.each do |key, val|
+      instance_eval "def #{val.name.split('::').last.sub(/\b\w/) { $&.downcase }}Error?; error_code == #{key}; end"
     end
+    freeze
+  end
 
-    def failed?
-	status == STATUS_FAILED
-    end
+  def failed?
+    status == STATUS_FAILED
+  end
 
-    def error?
-	status != STATUS_OK
-    end
+  def error?
+    status != STATUS_OK
+  end
 
-    def raise_error(options = {})
-	return false unless error?
-	return false if options.key?(:only) && ! options[:only].include?(error_code)
-	return false if options.key?(:except) && options[:except].include?(error_code)
-	err = ERRORS.key?(error_code) ? ERRORS[error_code] : InfomemeClient::Error
-	raise err, [(respond_to?(:errors) ? errors.to_hash : nil), message]
-    end
+  def raise_error(options = {})
+    return false unless error?
+    return false if options.key?(:only) && ! options[:only].include?(error_code)
+    return false if options.key?(:except) && options[:except].include?(error_code)
+    err = ERRORS.key?(error_code) ? ERRORS[error_code] : InfomemeClient::Error
+    raise err, [(respond_to?(:errors) ? errors.to_hash : nil), message]
+  end
 
-    def extract(key, *extra_args)
-	return nil unless @hsh.key?(key)
-	klass = case key
-	    when :comments then InfomemeClient::EntityHash::Comment
-	    when :meme, :memes then InfomemeClient::EntityHash::Meme
-	    when :meme_types then InfomemeClient::EntityHash::MemeType
-	    when :user then InfomemeClient::EntityHash::User
-	    when :transactions then InfomemeClient::EntityHash::Transaction
-	    when :invoice, :invoices then InfomemeClient::EntityHash::Invoice
-	    else InfomemeClient::EntityHash
-	end
-	stored = to_hash[key]
-	stored.is_a?(Array) ? stored.collect {|val| klass.new *[val, extra_args]} : klass.new(*[stored, extra_args])
+  def extract(key, *extra_args)
+    return nil unless @hsh.key?(key)
+    klass = case key
+    when :comments then InfomemeClient::EntityHash::Comment
+    when :meme, :memes then InfomemeClient::EntityHash::Meme
+    when :meme_types then InfomemeClient::EntityHash::MemeType
+    when :user then InfomemeClient::EntityHash::User
+    when :transactions then InfomemeClient::EntityHash::Transaction
+    when :invoice, :invoices then InfomemeClient::EntityHash::Invoice
+    else InfomemeClient::EntityHash
     end
+    stored = to_hash[key]
+    stored.is_a?(Array) ? stored.collect {|val| klass.new *[val, extra_args]} : klass.new(*[stored, extra_args])
+  end
 end

data/test/test_entity_hash.rb

@@ -1,15 +1,15 @@
 require "helper"
 
 class TestEntityHash < Test::Unit::TestCase
-    def test_entity_hash_attributes_available
-	eh = InfomemeClient::EntityHash.new({:foo => "bar"})
-	assert_respond_to eh, :foo
-	assert_equal "bar", eh.foo
-    end
+  def test_entity_hash_attributes_available
+    eh = InfomemeClient::EntityHash.new({:foo => "bar"})
+    assert_respond_to eh, :foo
+    assert_equal "bar", eh.foo
+  end
 
-    def test_entity_hash_retrieve_hash
-	hash = {:foo => "bar", :bar => [{:foo => "bar"}]}
-	eh = InfomemeClient::EntityHash.new(hash)
-	assert_equal hash, eh.to_hash
-    end
+  def test_entity_hash_retrieve_hash
+    hash = {:foo => "bar", :bar => [{:foo => "bar"}]}
+    eh = InfomemeClient::EntityHash.new(hash)
+    assert_equal hash, eh.to_hash
+  end
 end

data/test/test_meme_functions.rb

@@ -1,46 +1,46 @@
 require "helper"
 
 class TestMemeFunctions < Test::Unit::TestCase
-    def test_browse
-	fake_request(:get, "/memes?page=1&pageSize=25&sort=date-asc", :body => fixture("memes/memes"), :content_type => "application/json")
-	check_paged :memes, @im_client.browse(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
-	check_list :memes, @im_client.browse(:page => 1, :pageSize => 25, :sort => "date-asc")
-    end
+  def test_browse
+    fake_request(:get, "/memes?page=1&pageSize=25&sort=date-asc", :body => fixture("memes/memes"), :content_type => "application/json")
+    check_paged :memes, @im_client.browse(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
+    check_list :memes, @im_client.browse(:page => 1, :pageSize => 25, :sort => "date-asc")
+  end
 
-    def test_search
-	fake_request(:get, "/memes/search?search_token=a&page=1&pageSize=25&sort=date-asc", :body => fixture("memes/memes"), :content_type => "application/json")
-	check_paged :memes, @im_client.search("a", :page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
-	check_list :memes, @im_client.search("a", :page => 1, :pageSize => 25, :sort => "date-asc")
-    end
+  def test_search
+    fake_request(:get, "/memes/search?search_token=a&page=1&pageSize=25&sort=date-asc", :body => fixture("memes/memes"), :content_type => "application/json")
+    check_paged :memes, @im_client.search("a", :page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
+    check_list :memes, @im_client.search("a", :page => 1, :pageSize => 25, :sort => "date-asc")
+  end
 
-    def test_meme_types
-	fake_request(:get, "/memes/types", :body => fixture("memes/types"), :content_type => "application/json")
-	types = @im_client.meme_types
-	check_list :meme_types, types
-	assert types.size > 0
-	assert_respond_to types[0], :id
-	assert_respond_to types[0], :name
-	assert_respond_to types[0], :url
-	assert_respond_to types[0], :summary
-	assert_respond_to types[0], :description
-	assert_equal 1, types[0].id
-	assert_equal "TEST", types[0].name
-	assert_equal "http://test.url", types[0].url
-	assert_equal "test summary", types[0].summary
-	assert_equal "test description", types[0].description
-    end
+  def test_meme_types
+    fake_request(:get, "/memes/types", :body => fixture("memes/types"), :content_type => "application/json")
+    types = @im_client.meme_types
+    check_list :meme_types, types
+    assert types.size > 0
+    assert_respond_to types[0], :id
+    assert_respond_to types[0], :name
+    assert_respond_to types[0], :url
+    assert_respond_to types[0], :summary
+    assert_respond_to types[0], :description
+    assert_equal 1, types[0].id
+    assert_equal "TEST", types[0].name
+    assert_equal "http://test.url", types[0].url
+    assert_equal "test summary", types[0].summary
+    assert_equal "test description", types[0].description
+  end
 
-    def test_meme
-	fake_request(:get, "/memes/1", :body => fixture("memes/meme"), :content_type => "application/json")
-	meme = @im_client.meme(1)
-	check_eh :meme, meme
-	assert_respond_to meme, :name
-	assert_equal "test meme 1", meme.name
-    end
+  def test_meme
+    fake_request(:get, "/memes/1", :body => fixture("memes/meme"), :content_type => "application/json")
+    meme = @im_client.meme(1)
+    check_eh :meme, meme
+    assert_respond_to meme, :name
+    assert_equal "test meme 1", meme.name
+  end
 
-    def test_meme_comments
-	fake_request(:get, "/memes/1/comments?page=1&pageSize=25", :body => fixture("memes/comments"), :content_type => "application/json")
-	check_paged :comments, @im_client.meme_comments(1, :page => 1, :pageSize => 25, :no_extract => true)
-	check_list :comments, @im_client.meme_comments(1, :page => 1, :pageSize => 25)
-    end
+  def test_meme_comments
+    fake_request(:get, "/memes/1/comments?page=1&pageSize=25", :body => fixture("memes/comments"), :content_type => "application/json")
+    check_paged :comments, @im_client.meme_comments(1, :page => 1, :pageSize => 25, :no_extract => true)
+    check_list :comments, @im_client.meme_comments(1, :page => 1, :pageSize => 25)
+  end
 end

data/test/test_user_functions.rb

@@ -1,15 +1,15 @@
 require "helper"
 
 class TestUserFunctions < Test::Unit::TestCase
-    def test_user
-	fake_request(:get, "/users/test_user", :body => fixture("users/user_public"), :content_type => "application/json")
-	user = @im_client.user("test_user")
-	check_eh :user, user
-	assert_respond_to user, :username
-	assert_equal "test_user", user.username
-	assert_respond_to user, :comments
-	assert_equal 3, user.comments
-	assert_respond_to user, :ratings
-	assert_equal 3, user.ratings
-    end
+  def test_user
+    fake_request(:get, "/users/test_user", :body => fixture("users/user_public"), :content_type => "application/json")
+    user = @im_client.user("test_user")
+    check_eh :user, user
+    assert_respond_to user, :username
+    assert_equal "test_user", user.username
+    assert_respond_to user, :comments
+    assert_equal 3, user.comments
+    assert_respond_to user, :ratings
+    assert_equal 3, user.ratings
+  end
 end

data/test/test_user_meme_functions.rb

@@ -1,47 +1,55 @@
 require "helper"
 
 class TestUserMemeFunctions < Test::Unit::TestCase
-    def test_library
-	fake_request(:get, "/users/test_user/memes?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
-	authorize
-	check_paged :memes, @im_client.library(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
-	check_list :memes, @im_client.library(:page => 1, :pageSize => 25, :sort => "date-asc")
-    end
+  def test_library
+    fake_request(:get, "/users/test_user/memes?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
+    authorize
+    check_paged :memes, @im_client.library(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
+    check_list :memes, @im_client.library(:page => 1, :pageSize => 25, :sort => "date-asc")
+  end
 
-    def test_published
-	fake_request(:get, "/users/test_user/memes/published?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
-	authorize
-	check_paged :memes, @im_client.published(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
-	check_list :memes, @im_client.published(:page => 1, :pageSize => 25, :sort => "date-asc")
-    end
+  def test_published
+    fake_request(:get, "/users/test_user/memes/published?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
+    authorize
+    check_paged :memes, @im_client.published(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
+    check_list :memes, @im_client.published(:page => 1, :pageSize => 25, :sort => "date-asc")
+  end
 
-    def test_inactive
-	fake_request(:get, "/users/test_user/memes/inactive?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
-	authorize
-	check_paged :memes, @im_client.inactive(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
-	check_list :memes, @im_client.inactive(:page => 1, :pageSize => 25, :sort => "date-asc")
-    end
+  def test_inactive
+    fake_request(:get, "/users/test_user/memes/inactive?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
+    authorize
+    check_paged :memes, @im_client.inactive(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
+    check_list :memes, @im_client.inactive(:page => 1, :pageSize => 25, :sort => "date-asc")
+  end
 
-    def test_incomplete
-	fake_request(:get, "/users/test_user/memes/incomplete?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
-	authorize
-	check_paged :memes, @im_client.incomplete(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
-	check_list :memes, @im_client.incomplete(:page => 1, :pageSize => 25, :sort => "date-asc")
-    end
+  def test_incomplete
+    fake_request(:get, "/users/test_user/memes/incomplete?page=1&pageSize=25&sort=date-asc", :body => fixture("users/memes"), :content_type => "application/json")
+    authorize
+    check_paged :memes, @im_client.incomplete(:page => 1, :pageSize => 25, :sort => "date-asc", :no_extract => true)
+    check_list :memes, @im_client.incomplete(:page => 1, :pageSize => 25, :sort => "date-asc")
+  end
 
-    def test_comment
-	fake_request(:post, "/users/test_user/memes/1/comments", :body => fixture("response/ok"), :content_type => "application/json")
-	authorize
-	assert_nothing_raised do
-	    assert @im_client.comment(1, "test comment")
-	end
+  def test_comment
+    fake_request(:post, "/users/test_user/memes/1/comments", :body => fixture("response/ok"), :content_type => "application/json")
+    authorize
+    assert_nothing_raised do
+      assert @im_client.comment(1, "test comment")
     end
+  end
 
-    def test_rate
-	fake_request(:post, "/users/test_user/memes/1/rates", :body => fixture("response/ok"), :content_type => "application/json")
-	authorize
-	assert_nothing_raised do
-	    assert @im_client.rate(1, 1)
-	end
+  def test_rate
+    fake_request(:post, "/users/test_user/memes/1/rates", :body => fixture("response/ok"), :content_type => "application/json")
+    authorize
+    assert_nothing_raised do
+      assert @im_client.rate(1, 1)
+    end
+  end
+  
+  def test_review
+    fake_request(:post, "/user/test_user/memes/1/reviews", :body => fixture("response/ok"), :content_type => "application/json")
+    authorize
+    assert_nothing_raised do
+      assert @im_client.rate(1, {:rate => 1, :comment => "lajos"})
     end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infomeme_client
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-26 00:00:00.000000000 +02:00
+date: 2011-06-09 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &22466900 !ruby/object:Gem::Requirement
+  requirement: &21418220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22466900
+  version_requirements: *21418220
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &22466400 !ruby/object:Gem::Requirement
+  requirement: &21417700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22466400
+  version_requirements: *21417700
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &22465900 !ruby/object:Gem::Requirement
+  requirement: &21417160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22465900
+  version_requirements: *21417160
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &22465400 !ruby/object:Gem::Requirement
+  requirement: &21416660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22465400
+  version_requirements: *21416660
 description: ! "A RubyGem for implementing both Infomeme client and meme applications.\n
   More coming soon..."
 email: infomeme@infomeme.com
@@ -79,6 +79,7 @@ files:
 - 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/review.rb
 - lib/infomeme_client/entity_hash/transaction.rb
 - lib/infomeme_client/entity_hash/user.rb
 - lib/infomeme_client/errors.rb