cf-trade-client 0.1.4 → 0.1.5

data/lib/client/client.rb

@@ -15,116 +15,112 @@ limitations under the License.
 =end
 require 'faye/websocket'
 module Coinfloor
-
-	class CFClient
-		def initialize(domain,uid,pass,pkey=nil)
-	
-			if domain.include?("ws://")||domain.include?("wss://")
-				@messages=[]
-				if uid==0
-				  @con=CFAcon.new(uid,pass)
-				else
-					if pkey
-					  @con=CFcon.new(uid,pass,pkey)
-					else
-					  @con=CFcon.new(uid,pass)
-					end
-				end
-				@domain=domain
-			else
-				puts "domain must be a ws:// or wss:// formatted string, if port is not 80 it must be specified"
-			end
-
-		end
-		def auth(ws,msg)
-		  @messages.push(:auth)
-		  nonce=msg["nonce"]
-		  result=@con.auth(nonce)
-		  ws.send(result)
-		end
-		
-		def begin_connection(sendata)
-		  output=nil
-		  EM.run {
-		    ws = Faye::WebSocket::Client.new(@domain)
-		    ws.on :open do |event|
-		    end
-		    
-		    ws.on :message do |event|
-		      evtdata=event.data
-		      msg=JSON.parse(evtdata)
-		      if msg["notice"]&&msg["notice"]=="Welcome"
-		        auth(ws,msg)
-		      elsif msg["notice"].nil?
-		        ret_msg=@messages.delete_at(0)
-		        case ret_msg
-		        when nil
-		          ws.close
-		          ws=nil
-		          EM.stop
-		        when :auth
-		          if msg["error_code"]==0
-		            @messages.push(:reply)
-		            ws.send(sendata)
-		          else
-		            ws.close
-		            ws=nil
-		            EM.stop
-		          end
-		        when :reply
-		          if msg["error_code"]==0
-		            output=msg
-		            ws.close
-		            EM.stop
-		          else
-		            output=msg
-		            ws.close
-		            EM.stop
-		          end
-		        else
-		          ws.close
-		          EM.stop
-		          raise "Reply for unknown action"
-		        end
-		      elsif msg["notice"] && (@messages.count > 0)
-		        #we just ignore this until we get a message we want
-		      elsif msg["notice"] && (@messages.count == 0)
-		        ws.close
-		        EM.stop
-		      else
-		        raise "Somethings gone wrong with the client"
-		      end
-		    end# end of on message event 
-
-		    ws.on :error do |event|
-					EM.stop
-		      ws = nil
-		    end
-		 
-		    ws.on :close do |event|
-					EM.stop
-		      ws = nil
-		    end
-		  }
-		  return output
-		end
-
-		def exec(cfcon_method,arguments)
-		  
-				  data=@con.send(cfcon_method.to_s,arguments)
-
-		      begin_connection(data)
-		end
-
-		def get_balance
-				self.exec(:getbalance,{})
-#						data=@con.getbalance(nil)
-#						begin_connection(data)
-		end
-
-		def public_key
-		  @con.public_key
-		end
-	end
-
+  class CFClient
+    def initialize(domain,uid,api_key,pass,pkey=nil)
+      
+      if domain.include?("ws://")||domain.include?("wss://")
+        @messages=[]
+        if uid==0
+          @con=CFAcon.new(uid,pass)
+        else
+          if pkey
+            @con=CFcon.new(uid,pass,api_key,pkey)
+          else
+            @con=CFcon.new(uid,api_key,pass)
+          end
+        end
+        @domain=domain
+      else
+        puts "domain must be a ws:// or wss:// formatted string, if port is not 80 it must be specified"
+      end
+      
+    end
+    def auth(ws,msg)
+      @messages.push(:auth)
+      nonce=msg["nonce"]
+      result=@con.auth(nonce)
+      ws.send(result)
+    end
+    
+    def begin_connection(sendata)
+      output=nil
+      EM.run {
+        ws = Faye::WebSocket::Client.new(@domain)
+        ws.on :open do |event|
+        end
+        
+        ws.on :message do |event|
+          evtdata=event.data
+          msg=JSON.parse(evtdata)
+          if msg["notice"]&&msg["notice"]=="Welcome"
+            auth(ws,msg)
+          elsif msg["notice"].nil?
+            ret_msg=@messages.delete_at(0)
+            case ret_msg
+            when nil
+              ws.close
+              ws=nil
+              EM.stop
+            when :auth
+              if msg["error_code"]==0
+                @messages.push(:reply)
+                ws.send(sendata)
+              else
+                ws.close
+                ws=nil
+                EM.stop
+              end
+            when :reply
+              if msg["error_code"]==0
+                output=msg
+                ws.close
+                EM.stop
+              else
+                output=msg
+                ws.close
+                EM.stop
+              end
+            else
+              ws.close
+              EM.stop
+              raise "Reply for unknown action"
+            end
+          elsif msg["notice"] && (@messages.count > 0)
+            #we just ignore this until we get a message we want
+          elsif msg["notice"] && (@messages.count == 0)
+            ws.close
+            EM.stop
+          else
+            raise "Somethings gone wrong with the client"
+          end
+        end# end of on message event 
+        
+        ws.on :error do |event|
+          EM.stop
+          ws = nil
+        end
+        
+        ws.on :close do |event|
+          EM.stop
+          ws = nil
+        end
+      }
+      return output
+    end
+    
+    def exec(cfcon_method,arguments)
+      
+      data=@con.send(cfcon_method.to_s,arguments)
+      
+      begin_connection(data)
+    end
+    
+    def get_balance
+      self.exec(:getbalance,{})
+    end
+    
+    def public_key
+      @con.public_key
+    end
+  end
 end

data/lib/trade_api/trade_api.rb

@@ -22,7 +22,7 @@ module Coinfloor
   # All method calls return json which is to be sent to the API.
   class CFcon
     # coinfloor user trade id, password
-    def initialize(uid,password,pkey=nil)
+    def initialize(uid,password,api_key,pkey=nil)
       @uid=uid
       @uid_byte=LibEcp.gen_uid(uid)
       if pkey
@@ -33,7 +33,7 @@ module Coinfloor
 
       end
       @public_key=LibEcp.gen_pub(@private_key)
-      @cookie=LibEcp.gen_cookie(@uid_byte)
+      @cookie=api_key
       @password=nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-trade-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ files:
 - lib/trade_client.rb
 - lib/client/client.rb
 - lib/trade_api/trade_api.rb
-homepage: https://github.com/coinfloor/trade-client
+homepage: http://coinfloor.co.uk
 licenses:
 - APACHE 2.0
 post_install_message: 
@@ -94,6 +94,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A ruby client library to trade on the Coinfloor platform using their API
+summary: An example ruby client library to trade on the Coinfloor platform using their
+  API
 test_files: []
 has_rdoc: