mpayer_ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f16f461bac9407c17afcf540d4095a091965ed8d
-  data.tar.gz: 194c8a4618311845f991401be2624d752f9c1bf6
+  metadata.gz: 7b4d99a94ee5c778c3be51edc14a2a13e6a44e93
+  data.tar.gz: 33951faa2cb58c902faf7e9d7502e05064ff125d
 SHA512:
-  metadata.gz: 6aa9d45fe3ce0d126c1b0a453cbe3cbd62da017e6c13387217d24bdb006cd8c370c424ad0bdf40e249f285027940ff0de60ed35d6682423aa06d9a2a1ca49ffe
-  data.tar.gz: 25c7d112955514318ebe54ea7c78f9cf243e65d352a83314e56cd1ebb61b861a3c18820afb99f47be97ff6f6ac1edf5d3e6cc39d2f50818ff029228c9dd749dc
+  metadata.gz: 477d864b4897a932be2ae34c90da8afef2948795c11485a47f1274c535cad8605cd06bbaab6ba382adb42a814117af76207c2a6a0e908a69d938fb674f75fb09
+  data.tar.gz: cb3ee3475cc84284ca7b11d6a1787864553769e408aa7f10cff8be78978a9b6d9a2ea7d80223369ddf04eae5cc4a49b4cb8f5f633efd8a17f20c4f9284063dca

data/README.md

@@ -55,7 +55,7 @@ Mpayer.setup do |config|
 end
 
 #Get all clients in your organisation
-clients = Mpayer::Client.all(per:1,per_page:100)
+clients = Mpayer::Client.all(page:1,per_page:100)
 
 #Get one client in your organisation
 clients = Mpayer::Client.find(123)
@@ -78,7 +78,7 @@ https://app.mpayer.co.ke/api/payables
 All responses are objects and can be accessed with dot notation
 e.g 
 ```ruby
-clients = Mpayer::Client.all(per:1,per_page:100) 
+clients = Mpayer::Client.all(page:1,per_page:100) 
 client = client.first
 client.name #=> "CLark Kent"
 ```
@@ -97,9 +97,9 @@ client = Mpayer::Client.find(id:20284,fetch:false).account(account_id) # Get cli
 client = Mpayer::Client.find(id:20284,fetch:false)
 account = client.account(account_id) # Get clients account with id
 
-client_accounts = Mpayer::Client.find(id:20284,fetch:false).accounts(per:1,per_page:100)
-client_payables = Mpayer::Client.find(id:20284,fetch:false).payables(per:1,per_page:100)
-client_transactions = Mpayer::Client.find(id:20284,fetch:false).transactions(account_id, per:1,per_page:100)
+client_accounts = Mpayer::Client.find(id:20284,fetch:false).accounts(page:1,per_page:100)
+client_payables = Mpayer::Client.find(id:20284,fetch:false).payables(page:1,per_page:100)
+client_transactions = Mpayer::Client.find(id:20284,fetch:false).transactions(account_id, page:1,per_page:100)
 
 ```
 
@@ -195,9 +195,9 @@ Mpayer.setup do |config|
 end
 
 url = "/clients/all_clients"
-Mpayer::Fetch.get(url,query:{per:per,per_page:per_page})
-Mpayer::Fetch.post(url,body:{client:{name:'Kiki Lolo'}}.to_json)
-Mpayer::Fetch.put(url,body:{client:{name:'Kiki Lolo'}}.to_json)
+Mpayer::Fetch.get(url,query:{page:page,per_page:per_page})
+Mpayer::Fetch.post(url,{client:{name:'Kiki Lolo'}})
+Mpayer::Fetch.put(url,{client:{name:'Kiki Lolo'}})
 Mpayer::Fetch.delete(url)
 
 ```

data/lib/mpayer_ruby/endpoints/_endpoint.rb

@@ -32,16 +32,16 @@ module Mpayer
 		end
 
 		# Use this methon in the association reader method witht the same name
-		def find_all(per:1,per_page:100,**options)
+		def find_all(page:1,per_page:100,**options)
 			# gets caller methods as association
 			association =  caller_locations(1,1)[0].label 
 			url = assoc_link(association.to_sym,options)
-			if self.pagination[association]=={per_page:per_page,per:per} 
-				self.send("#{association}=", Mpayer::Fetch.get(url,query:{per:per,per_page:per_page}) ) if instance_variable_get("@#{association}").nil?
+			if self.pagination[association]=={per_page:per_page,page:page} 
+				self.send("#{association}=", Mpayer::Fetch.get(url,query:{page:page,per_page:per_page}) ) if instance_variable_get("@#{association}").nil?
 			else
-				self.send("#{association}=", Mpayer::Fetch.get(url,query:{per:per,per_page:per_page}) )
+				self.send("#{association}=", Mpayer::Fetch.get(url,query:{page:page,per_page:per_page}) )
 			end
-			self.pagination.merge!({"#{association}":{per:per,per_page:per_page}})
+			self.pagination.merge!({"#{association}":{page:page,per_page:per_page}})
 			return instance_variable_get("@#{association}")
 		end
 

data/lib/mpayer_ruby/endpoints/account.rb

@@ -5,16 +5,16 @@ module Mpayer
 		class << self
 
 			# Mpayer::Account.all()
-			def all(per:1,per_page:100)
+			def all(page:1,per_page:100)
 				url = "/accounts/all_accounts"
-				Mpayer::Fetch.get(url,query:{per:per,per_page:per_page})
+				Mpayer::Fetch.get(url,query:{page:page,per_page:per_page})
 			end
 
 			# options = {from_date:nil,to_date:nil, dr_cr:nil, ac_type:nil, category:nil}
 			# Mpayer::Account.aggregate(options)
-			def aggregates(per:1,per_page:100, **options)
+			def aggregates(page:1,per_page:100, **options)
 				url = "/accounts/aggregates"
-				Mpayer::Fetch.get(url,query:{per:per,per_page:per_page}.merge!(options))
+				Mpayer::Fetch.get(url,query:{page:page,per_page:per_page}.merge!(options))
 			end
 
 			# Mpayer::Account.find(account_id)
@@ -29,7 +29,7 @@ module Mpayer
 		# account.update(name:new_name)
 		def update(options)
 			url = "/accounts/#{self.id}"
-			response = Mpayer::Fetch.put(url,body: options.to_json)
+			response = Mpayer::Fetch.put(url,options)
 			self.response = response
 		end
 
@@ -37,14 +37,14 @@ module Mpayer
 			
 		end
 
-		# Mpayer::Account.find(26, fetch:false).members(per:1,per_page:100)
-		def members(per:1,per_page:100)
-			find_all(per:per,per_page:per_page)
+		# Mpayer::Account.find(26, fetch:false).members(page:1,per_page:100)
+		def members(page:1,per_page:100)
+			find_all(page:page,per_page:per_page)
 		end
 
-		# Mpayer::Account.find(26, fetch:false).payable_items(per:1,per_page:100)
-		def payable_items(per:1,per_page:100)
-			find_all(per:per,per_page:per_page)
+		# Mpayer::Account.find(26, fetch:false).payable_items(page:1,per_page:100)
+		def payable_items(page:1,per_page:100)
+			find_all(page:page,per_page:per_page)
 		end
 
 		protected

data/lib/mpayer_ruby/endpoints/client.rb

@@ -5,9 +5,9 @@ module Mpayer
 		class << self
 
 			# Mpayer::Client.all
-			def all(per:1,per_page:100)
+			def all(page:1,per_page:100)
 			  url = "/clients/all_clients"
-				Mpayer::Fetch.get(url,query:{per:per,per_page:per_page})
+				Mpayer::Fetch.get(url,query:{page:page,per_page:per_page})
 			end
 
 			# Mpayer::Client.find(id)
@@ -21,7 +21,8 @@ module Mpayer
 			# Mpayer::Client.create(client_attributes)
 			def create(options={})
 				url = "/clients"
-				response = Mpayer::Fetch.post(url,body: options.to_json)
+				# bp
+				response = Mpayer::Fetch.post(url,options)
 				client = new(options.merge!(id:response.id ,response:response, account: response.account.first))
 			end	
 
@@ -43,22 +44,22 @@ module Mpayer
 		# Mpayer::Client.find(id:20284).create_account(options)
 		def create_account(options={})
       url = "/clients/#{self.id}/accounts/new"
-			@account = Mpayer::Fetch.post(url,body: options.to_json)
+			@account = Mpayer::Fetch.post(url,options)
 		end
 
-		# Mpayer::Client.find(26, fetch:false).accounts(per:1,per_page:100)
-		def accounts(per:1,per_page:100)
-			find_all(per:per,per_page:per_page)
+		# Mpayer::Client.find(26, fetch:false).accounts(page:1,per_page:100)
+		def accounts(page:1,per_page:100)
+			find_all(page:page,per_page:per_page)
 		end
 
-		# Mpayer::Client.find(26, fetch:false).payables(per:1,per_page:100)
-		def payables(per:1,per_page:100)
-			find_all(per:per,per_page:per_page)
+		# Mpayer::Client.find(26, fetch:false).payables(page:1,per_page:100)
+		def payables(page:1,per_page:100)
+			find_all(page:page,per_page:per_page)
 		end
 
-		# Mpayer::Client.find(26, fetch:false).transactions(account_id, per:1,per_page:100)
-		def transactions(account_id,per:1,per_page:100)
-			find_all(per:per,per_page:per_page,account_id:account_id)
+		# Mpayer::Client.find(26, fetch:false).transactions(account_id, page:1,per_page:100)
+		def transactions(account_id,page:1,per_page:100)
+			find_all(page:page,per_page:per_page,account_id:account_id)
 		end
 
     protected

data/lib/mpayer_ruby/endpoints/message.rb

@@ -6,7 +6,7 @@ module Mpayer
 			# Mpayer::Message.create(message_attributes)
 			def create(options={})
 				url = "/messages"
-				response = Mpayer::Fetch.post(url,body: options.to_json)
+				response = Mpayer::Fetch.post(url,options)
 				message = new(options.merge!(id:response.id ,response:response))
 			end
 

data/lib/mpayer_ruby/endpoints/payable.rb

@@ -4,9 +4,9 @@ module Mpayer
 		class << self
 
 			# Mpayer::Payable.all
-			def all(per:1,per_page:100)
+			def all(page:1,per_page:100)
 				url = "/payables/all"
-				Mpayer::Fetch.get(url,query:{per:per,per_page:per_page})
+				Mpayer::Fetch.get(url,query:{page:page,per_page:per_page})
 			end
 
 			# Mpayer::Payable.find(id)
@@ -18,7 +18,7 @@ module Mpayer
 
 			# Mpayer::Payable.where(ref_id:"KT0041[P]-010000402")
 			def where(ref_id:,fetch:true)
-				url = "/payables/search/#{CGI.escape(ref_id)}"
+				url = "/payables/search/#{CGI.escape(ref_id.to_s)}"
 				response = Mpayer::Fetch.get(url) if fetch
 				payable = new(id:response.id,response:response) unless (response.id rescue nil).nil?
 			end
@@ -26,7 +26,7 @@ module Mpayer
 			# Mpayer::Payable.create(options)
 			def create(options={})
 				url = "/payables"
-				response = Mpayer::Fetch.post(url,body: options.to_json)
+				response = Mpayer::Fetch.post(url,options)
 				payable_id = response.id 
 				payable = new(options.merge!(id:payable_id,response:response))
 			end

data/lib/mpayer_ruby/endpoints/transaction.rb

@@ -4,16 +4,16 @@ module Mpayer
 		class << self
 
 			# Mpayer::Transaction.all(from: Time.now -  (86400*400))
-			def all(per:1,per_page:100,from: nil,to: nil)
+			def all(page:1,per_page:100,from: nil,to: nil)
 				url = "/transactions/all"
 				from = from.strftime("%F %T") unless from.nil?
 				to = to.strftime("%F %T") unless to.nil? 
-				Mpayer::Fetch.get(url,query:{per:per,per_page:per_page,from:from,to:to})
+				Mpayer::Fetch.get(url,query:{page:page,per_page:per_page,from:from,to:to})
 			end
 
 			# Mpayer::Transaction.where(ref_id:"KT0041[P]-010000402")
 			def where(ref_id:,fetch:true)
-				url = "/transactions/#{CGI.escape(ref_id)}"
+				url = "/transactions/#{CGI.escape(ref_id.to_s)}"
 				response = Mpayer::Fetch.get(url) if fetch
 				transaction = new(id:response.id,response:response)
 			end
@@ -22,7 +22,7 @@ module Mpayer
 			# Mpayer::Transaction.deposit(body)
 			def deposit(**options)
 				url = "/transactions/deposit"
-				response = Mpayer::Fetch.put(url,body: mpayer_refs.merge!(options).to_json)
+				response = Mpayer::Fetch.put(url,mpayer_refs.merge!(options))
 				transaction = new(id:response.id,response:response)
 			end
 
@@ -30,7 +30,7 @@ module Mpayer
 			# Mpayer::Transaction.withdraw(body)
 			def withdraw(**options)
 				url = "/transactions/withdraw"
-				response = Mpayer::Fetch.delete(url,body: mpayer_refs.merge!(options).to_json)
+				response = Mpayer::Fetch.delete(url,mpayer_refs.merge!(options))
 				transaction = new(id:response.id,response:response)
 			end
 
@@ -38,7 +38,7 @@ module Mpayer
 			# Mpayer::Transaction.transfer(body)
 			def transfer(**options)
 				url = "/transactions/transfer"
-				response = Mpayer::Fetch.post(url,body: mpayer_refs.merge!(options).to_json)
+				response = Mpayer::Fetch.post(url,mpayer_refs.merge!(options))
 				transaction = new(id:response.id,response:response)
 			end
 

data/lib/mpayer_ruby/fetch.rb

@@ -14,9 +14,10 @@ module Mpayer
 
 			%w(get put post delete).each do |m|
 				define_method m do |path, options={}, &block|
+					options = {body: options.to_json}
 					res = perform_request Net::HTTP::Put, path, options, &block if m == 'put'
-					res = perform_request Net::HTTP::Get, path, options, &block if m == 'get'
 					res = perform_request Net::HTTP::Post, path, options, &block if m == 'post'
+					res = perform_request Net::HTTP::Get, path, options, &block if m == 'get'
 					res = perform_request Net::HTTP::Delete, path, options, &block if m == 'delete'
 					save_json(res) if load_json?
 					res
@@ -26,7 +27,7 @@ module Mpayer
 			def save_json(response)
 				request_method = response.request.http_method.name.split('::').last.upcase
 				file_path = response.request.path.to_s
-				slash,model,*file_name = file_path.split(/\/|\?/)
+				slash,model,*file_name = file_path.split('?')[0].split(/\/|\?/)
 				file_location = "lib/mpayer_ruby/support/fake_mpayer/#{model}/#{request_method}_#{file_name.join('_')}.json"
 				File.write(file_location, response.body)
 			end

data/lib/mpayer_ruby/support/fake_mpayer.rb

@@ -8,7 +8,7 @@ class FakeMpayer < Sinatra::Base
       if (request.env['HTTP_X_WSSE'].empty? rescue true)
         [200, {}, [{base:["Authentication Failed"]}.to_json]]
       else
-        slash,api,model,*path = request.path_info.split(/\/|\?/)
+        slash,api,model,*path = request.path_info.split('?')[0].split(/\/|\?/)
         json_response 200, "#{model}/#{request.request_method}_#{path.join('_')}.json"
       end
     end

data/lib/mpayer_ruby/version.rb

@@ -1,3 +1,3 @@
 module Mpayer
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/mpayer_ruby.rb

@@ -34,7 +34,7 @@ module Mpayer
     end
 
     def login
-     Mpayer::Fetch.post('/login',post: {user_no: ENV['MPAYER_USER'],password:ENV['MPAYER_PASSWORD']}.to_json)
+     Mpayer::Fetch.post('/login',{user: ENV['MPAYER_USER'],password:ENV['MPAYER_PASSWORD']})
    end
  end
 

data/mpayer_ruby.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "coveralls", '~> 0'
   spec.add_development_dependency "webmock", '~> 1.21'
   spec.add_development_dependency "sinatra", '~> 1.4'
+  spec.add_development_dependency "faker", '~> 1.4'
 
   spec.add_dependency 'httparty', "~> 0.13"
   spec.add_dependency 'wsse', "~> 0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpayer_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Kariuki Gathitu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement