infomeme_client 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/infomeme_client/base.rb

@@ -2,7 +2,6 @@ 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"
-	self.default_currency = options[:currency] || "usd"
 	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])
@@ -64,7 +63,8 @@ module InfomemeClient::Base
     end
 
     def inspect
-	"#<#{self.class.name}: #{authorized? ? credentials.merge({:permissions => (all_permissions || []).select {|perm| has_permission?(perm.id)}.collect {|perm| perm.name}}).inspect : 'not authorized'}>"
+	@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

data/lib/infomeme_client/entity_hash.rb

@@ -1,5 +1,6 @@
 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"

data/lib/infomeme_client/functions/user.rb

@@ -1,9 +1,8 @@
 module InfomemeClient::Functions::User
-    attr_accessor :default_language, :default_currency
+    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
-	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_transaction.rb → user_order.rb}

@@ -1,4 +1,19 @@
-module InfomemeClient::Functions::UserTransaction
+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_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 transactions(options = {})
 	return false unless authorized?
 	extract_or_response :transactions, :get, "/users/#{verified_user}/transactions", options

data/lib/infomeme_client/functions.rb

@@ -2,12 +2,12 @@ module InfomemeClient::Functions
     autoload :Meme, "infomeme_client/functions/meme"
     autoload :User, "infomeme_client/functions/user"
     autoload :UserMeme, "infomeme_client/functions/user_meme"
-    autoload :UserTransaction, "infomeme_client/functions/user_transaction"
+    autoload :UserOrder, "infomeme_client/functions/user_order"
 
     include Meme
     include User
     include UserMeme
-    include UserTransaction
+    include UserOrder
 
     private
 	def get_memes(path, options = {}, headers = {})

data/test/fixtures/users/invoice.json

@@ -0,0 +1 @@
+{"status":0,"message":"Success.","invoice":{"amount_user":10.0,"meme":{"name":"test meme 1"}}}

data/test/fixtures/users/invoices.json

@@ -0,0 +1 @@
+{"status":0,"message":"Success.","invoices":[{"amount_user":10.0,"meme":{"name":"test meme 1"}},{"amount_user":2.0,"meme":{"name":"test meme 2"}},{"amount_user":1.3,"meme":{"name":"test meme 3"}},{"amount_user":14.3,"meme":{"name":"test meme 4"}}],"pages":1,"count":4}

data/test/fixtures/users/order_paypal.json

@@ -0,0 +1 @@
+{"status":0,"message":"Success.","paypal_url":"test_paypal_url"}

data/test/fixtures/users/transactions.json

@@ -0,0 +1 @@
+{"status":0,"message":"Success.","transactions":[{"amount_user":10.0,"meme":{"name":"test meme 1"}},{"amount_user":2.0,"meme":{"name":"test meme 2"}},{"amount_user":1.3,"meme":{"name":"test meme 3"}},{"amount_user":14.3,"meme":{"name":"test meme 4"}}],"pages":1,"count":4}

data/test/test_user_order_functions.rb

@@ -0,0 +1,45 @@
+require "helper"
+
+class TestUserOrderFunctions < Test::Unit::TestCase
+    def test_order_with_balance
+	fake_request(:post, "/users/test_user/memes/1/order", :body => fixture("response/ok"), :content_type => "application/json")
+	authorize
+	assert_nothing_raised do
+	    assert @im_client.order_with_balance(1)
+	end
+    end
+
+    def test_order_with_paypal
+	fake_request(:post, "/users/test_user/memes/1/order", :body => fixture("users/order_paypal"), :content_type => "application/json")
+	authorize
+	assert_nothing_raised do
+	    assert_equal "test_paypal_url", @im_client.order_with_paypal(1)
+	end
+    end
+
+    def test_transactions
+	fake_request(:get, "/users/test_user/transactions?page=1&pageSize=25", :body => fixture("users/transactions"), :content_type => "application/json")
+	authorize
+	check_paged :transactions, @im_client.transactions(:page => 1, :pageSize => 25, :no_extract => true)
+	check_list :transactions, @im_client.transactions(:page => 1, :pageSize => 25)
+    end
+
+    def test_invoices
+	fake_request(:get, "/users/test_user/invoices?page=1&pageSize=25", :body => fixture("users/invoices"), :content_type => "application/json")
+	authorize
+	check_paged :invoices, @im_client.invoices(:page => 1, :pageSize => 25, :no_extract => true)
+	check_list :invoices, @im_client.invoices(:page => 1, :pageSize => 25)
+    end
+
+    def test_invoice
+	fake_request(:get, "/users/test_user/invoices/1", :body => fixture("users/invoice"), :content_type => "application/json")
+	authorize
+	invoice = @im_client.invoice(1)
+	check_eh :invoice, invoice
+	assert_respond_to invoice, :amount_user
+	assert_equal 10.0, invoice.amount_user
+	assert_respond_to invoice, :meme
+	assert_respond_to invoice.meme, :name
+	assert_equal "test meme 1", invoice.meme.name
+    end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: infomeme_client
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Infomeme Ltd.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,7 @@ files:
 - lib/infomeme_client/functions/meme.rb
 - lib/infomeme_client/functions/user.rb
 - lib/infomeme_client/functions/user_meme.rb
-- lib/infomeme_client/functions/user_transaction.rb
+- lib/infomeme_client/functions/user_order.rb
 - lib/infomeme_client/meme_application.rb
 - lib/infomeme_client/permissions.rb
 - lib/infomeme_client/response.rb
@@ -122,8 +122,12 @@ files:
 - test/fixtures/response/ok.json
 - test/fixtures/response/test.json
 - test/fixtures/response/test_extract.json
+- test/fixtures/users/invoice.json
+- test/fixtures/users/invoices.json
 - test/fixtures/users/memes.json
+- test/fixtures/users/order_paypal.json
 - test/fixtures/users/permissions.json
+- test/fixtures/users/transactions.json
 - test/fixtures/users/user.json
 - test/fixtures/users/user_public.json
 - test/helper.rb
@@ -134,6 +138,7 @@ files:
 - test/test_permissions.rb
 - test/test_user_functions.rb
 - test/test_user_meme_functions.rb
+- test/test_user_order_functions.rb
 has_rdoc: true
 homepage: https://api.infomeme.com
 licenses: []
@@ -177,3 +182,4 @@ test_files:
 - test/test_permissions.rb
 - test/test_user_functions.rb
 - test/test_user_meme_functions.rb
+- test/test_user_order_functions.rb