lib/bitshares.rb in bitsharesws-0.0.3 vs lib/bitshares.rb in bitsharesws-0.0.4

@@ -1,68 +1,58 @@
 require 'bitshares/version'
 
 module BitShares
 	autoload :WSocket,	'bitshares/wsocket'
+	autoload :RPC,			'bitshares/rpc'
+	autoload :API,			'bitshares/api'
 	autoload :Wallet,		'bitshares/wallet'
 	autoload :Asset,		'bitshares/asset'
 	autoload :Account,	'bitshares/account'
 
+
 	class << self
 
-		attr_accessor :login, :pass
-
 		def config autoconnect=true, &block
 			@node = 'wss://node.testnet.bitshares.eu'
 			@login = ''
 			@pass = ''
 			instance_eval(&block) if block_given?
 			start if autoconnect
 		end
 
-		def node n=nil
-			n ||= @node
-			@node = n
-		end
+		def node(n=nil)		n ||= @node; @node = n;		end
+		def login(n=nil)	n ||= @login; @login = n; end
+		def pass(n=nil)		n ||= @pass; @pass = n;		end
 
 		def start
 			WSocket.start
-			WSocket.send id: 2, method: 'call', params: [1,'login',[@login,@pass]]
+			RPC.new(1,'login',[@login,@pass]).send
 		end
 
 		def stop() WSocket.stop end
 
-		def database_id
-			@database_id ||= WSocket.send(id: 2, method: 'call', params: [1,'database',[]])['result']
-		end
-
 		def account name
-			answer = WSocket.send id: 2, method: "call", params: [database_id,"get_account_by_name",[name]]
-			raise 'Bad request...' if answer.key? 'error'
-			Account.new answer['result']
+			Account[name]
 		end
 
 		def balance name,*ids
-			answer = WSocket.send id: 2, method: "call", params: [database_id,"get_named_account_balances",[name,ids]]
-			raise 'Bad request...' if answer.key? 'error'
-			answer['result'].inject([]) { |m,w| m << Wallet.new(w) } 
+			Wallet[name,*ids]
 		end
 
 		def assets *ids
-			answer = WSocket.send id: 2, method: 'call', params: [database_id,'get_assets',[ids]]
-			raise 'Bad request...' if answer.key? 'error'
-			answer['result'].inject([]) {|m,a| m << Asset.new(a) }
+			Asset[*ids]
 		end
 
-		def list_assets name, limit=10
-			answer = WSocket.send id: 2, method: 'call', params: [database_id,'list_assets',[name,limit]]
-			raise "Bad request...#{answer}" if answer.key? 'error'
-			answer['result'].inject([]) {|m,a| m << Asset.new(a) }
+		def list_assets name, limit=1
+			Asset.search name, limit
 		end
 
 		def subscribe_callback id, clear_filter=true
-			answer = WSocket.send id: 2, method: 'call', params: [database_id,'set_subscribe_callback',[id,clear_filter]]
-			raise "Bad request...#{answer}" if answer.key? 'error'
-			answer['result']
+			RPC.new('set_subscribe_callback', [id, clear_filter]).send
+		end
+
+		def transfer that, amount, from, to
+			RPC.new 'transfer',[]
 		end
 
 	end
 end