bter-ruby 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c011715d8724a1dfe889ba35b4ac5d34c9adf893
-  data.tar.gz: f73e85d0c94534d98c2bd2806a7d0f58e138be63
+  metadata.gz: e450fe92759644777b68b408c8233222342c3368
+  data.tar.gz: 06be7c0ea828bfe0c72d24147b3510befffdc9a4
 SHA512:
-  metadata.gz: 3f1f3e669d2fb8d221cf4f9484fab6224c2de16e82bcfe9da47d167f4d44decb20a7bbc155f01a77069c8c62f8d1fe6779b9115a3ab623a9ccd1d56bd7b51bad
-  data.tar.gz: 1ea2f82d46d3473d262f39cfbe227a9ad5a11c8612632b9dade9f9b9e792c2f82f17f163777f786a96a47c2070525612d52baa127e4a660d87be01c31ad5f518
+  metadata.gz: 950566bd7ab675f5ac58747e17cfc573de427e50ccd41f223dd4c14bff749579ec55efe0c08bb0f63714b9168242d708c5528e4fcb0832118b8d2d7f37d2d89b
+  data.tar.gz: 711817483e659b969d5d9641202b09e127c5aca1f4effedff60e67f6643c2e64d2ce4e97addec9d88b7c0f1e2cb102a9b8f8db824b2c07647cb750109a22d4a2

data/README.md

@@ -10,16 +10,21 @@ require 'bter'
 ```
 The library has two parts , one for the public api and one for the trading one.
 
-The public api has 3 methods which return the ticker , market depth 
-and current trades for a given pair(check bter for the available pairs)
+The public api has the following methods
 
 ```ruby
 bt = Bter::Public.new
-
-puts bt.ticker("btc_cny")
-puts bt.depth("btc_cny")
-puts bt.trades("btc_cny")
+bt.pairs
+bt.tickers
+bt.ticker("btc_cny")
+bt.depth("btc_cny")
+bt.info
+bt.details
+bt.trades("btc_cny", tid) # alias .history
 ```
+tid parameter is optional on trades method and if omitted will return the most recent 80 trade history records.
+
+
 To use the trading api , you need to supply your key and secret
 ```ruby
 bt = Bter::Trade.new
@@ -31,24 +36,13 @@ Then you can use the available methods:
 ```ruby
 bt.get_info
 bt.active_orders
+bt.my_trades(pair)
 bt.order_status(order_id)
 bt.cancel_order(order_id)
 bt.buy(pair, amount, rate)
 bt.sell(pair, amount, rate)
 ```
-
-rate parameter is optional on buy and sell methods.
-
-
-You can enable the logger for public and trading requests.
-It logs successful or failed requests and response info.(off by default)
-```ruby
-bt = Bter::Public.new
-bt.logging :on
-
-bt2 = Bter::Trade.new
-bt2.logging :on
-```
+rate parameter is optional on buy and sell methods and if omitted the current rate will be used.
 
 
 Also check the two examples in the examples folder.

data/lib/bter/public.rb

@@ -1,45 +1,49 @@
+require_relative 'request.rb'
+
 module Bter
   class Public
-  
-    def initialize
-      @logging = false
+    include Request  
+    def pairs
+      query = public_request("pairs")
+      JSON.parse(query, {:symbolize_names => true}) 
     end
-    
-    def logging(p)
-      if p == :on
-        @logging = true
-      end
-    end
-  
-    def public_request(method, pair)
-      request = Typhoeus::Request.new("https://data.bter.com/api/1/#{method}/#{pair}")
-      if @logging
-        RequestLogger.error_log(request)
-      end
-      hydra = Typhoeus::Hydra.hydra
-      hydra.queue(request)       
-      hydra.run
-      response = request.response
-      if @logging
-        RequestLogger.info_log(response.code, response.total_time, response.headers_hash)
-      end
-      response.body
-    end 
-    
+
     def ticker(pair)
-      query = public_request "ticker", pair
-      info = JSON.parse query, {:symbolize_names => true}  
+      query = public_request("ticker", pair)
+      JSON.parse(query, {:symbolize_names => true}) 
+    end
+
+    def tickers
+      query = public_request("tickers")
+      JSON.parse(query, {:symbolize_names => true}) 
     end
     
     def depth(pair)
-      query = public_request "depth", pair
-      info = JSON.parse query, {:symbolize_names => true}   
+      query = public_request("depth", pair)
+      JSON.parse(query, {:symbolize_names => true})   
     end
-    
-    def trades(pair)
-      query = public_request "trade", pair
-      info = JSON.parse query, {:symbolize_names => true}   
+
+    def info
+      query = public_request("marketinfo")
+      JSON.parse(query, {:symbolize_names => true})  
+    end
+
+    def details
+      query = public_request("markelist")
+      JSON.parse(query, {:symbolize_names => true}) 
+    end  
+
+    def trades(pair, tid='')
+      query = public_request("trade", pair + "/#{tid}")
+      JSON.parse(query, {:symbolize_names => true})   
+    end 
+
+    def logging(log)
+      raise "Logger is no longer available , please remove it"
     end
     
+    alias_method :market_info, :info  
+    alias_method :marke_list, :details 
+    alias_method :history, :trades 
   end
 end

data/lib/bter/request.rb

@@ -0,0 +1,38 @@
+module Bter
+  module Request
+  	extend self
+  	PUBLIC_URL = 'https://data.bter.com/api/1'
+  	TRADE_URL  = 'https://bter.com/api/1/private'
+
+    def public_request(method, pair='')
+      HTTParty.get("#{PUBLIC_URL}/#{method}/#{pair}").body
+    end
+
+    def trade_request(method, params=nil)
+      if params.nil?
+        @params = {:method => method}
+      else
+        @params = {:method => method}
+        params.each do |param|
+          @params.merge!(param)
+        end
+      end
+      HTTParty.post(
+      	"#{TRADE_URL}/#{method}",
+        :body => @params,
+        :headers => {
+          'KEY' => @key, 
+          'Sign' => sign,
+          "Content-type" => "application/x-www-form-urlencoded",
+          "Accept" => "application/x-www-form-urlencoded"
+          }
+      ).body
+    end 
+
+    def sign
+      hmac = OpenSSL::HMAC.new(@secret,OpenSSL::Digest::SHA512.new)
+      @params = @params.collect {|k,v| "#{k}=#{v}"}.join('&')
+      hmac.update(@params).to_s    
+    end
+  end
+end

data/lib/bter/trading.rb

@@ -1,68 +1,21 @@
+require_relative 'request.rb'
 
 module Bter
   class Trade
+    include Request
   
     attr_accessor :key, :secret
-    
-    def initialize
-      @logging = false
-    end
-    
-    def logging(p)
-      if p == :on
-        @logging = true
-      end
-    end
-        
-    def trade_request(method, params=nil)
-      if params.nil?
-        @params = {:method => method}
-      else
-        @params = {:method => method}
-        params.each do |param|
-          @params.merge!(param)
-        end
-      end
-      request = Typhoeus::Request.new(
-        "https://bter.com/api/1/private/#{method}",
-        method: :post,
-        body: @params,
-        headers: { Key: @key, Sign: sign }
-        )
-        if @logging
-          RequestLogger.error_log(request)
-        end
-        hydra = Typhoeus::Hydra.hydra
-        hydra.queue(request)
-        hydra.run
-        response = request.response
-        if @logging
-          RequestLogger.info_log(response.code, response.total_time, response.headers_hash)
-        end
-        response.body
-    end
-    
-    def sign
-      hmac = OpenSSL::HMAC.new(@secret,OpenSSL::Digest::SHA512.new)
-      @params = @params.collect {|k,v| "#{k}=#{v}"}.join('&')
-      signed = hmac.update @params      
-    end
        
     def get_info    
-      query = trade_request "getfunds"
-      info = JSON.parse query, {:symbolize_names => true}    
+      query = trade_request("getfunds")
+      JSON.parse(query, {:symbolize_names => true})
     end
     
     def active_orders
-      query = trade_request "orderlist"
-      info = JSON.parse query, {:symbolize_names => true}
+      query = trade_request("orderlist")
+      JSON.parse(query, {:symbolize_names => true})
     end 
     
-    def trade(*params)
-      query = trade_request "placeorder", params
-      info = JSON.parse query, {:symbolize_names => true}
-    end
-    
     #abstract the trade to buy and sell
     def buy(pair, amount, rate=nil)
       rate ||= get_rate(pair)
@@ -75,17 +28,33 @@ module Bter
     end
     
     def order_status(order_id)
-      query = trade_request "getorder", [{:id => order_id}]
-      info = JSON.parse query, {:symbolize_names => true}
+      query = trade_request("getorder", [{:order_id => order_id}])
+      JSON.parse(query, {:symbolize_names => true})
     end
     
     def cancel_order(order_id)
-      query = trade_request "cancelorder", [{:id => order_id}]
-      info = JSON.parse query, {:symbolize_names => true}
+      query = trade_request("cancelorder", [{:order_id => order_id}])
+      JSON.parse(query, {:symbolize_names => true})
+    end
+
+    def my_trades(pair)
+      query = trade_request("mytrades", [{:pair => pair}])
+      JSON.parse(query, {:symbolize_names => true})
     end
     
+    #soon to be removed
+    def logging(log)
+      raise "Logger is no longer available , please remove it"
+    end
+
+    private
+    def trade(*params)
+      query = trade_request("placeorder", params)
+      JSON.parse(query, {:symbolize_names => true})
+    end
+
     def get_rate(pair)
-      Public.new.ticker(pair).values_at(:last).flatten
+      Public.new.ticker(pair).values_at(:last).flatten.first
     end
     
   end

data/lib/bter.rb

@@ -1,11 +1,11 @@
 require 'bundler/setup'
 require 'json'
-require 'typhoeus'
+require 'httparty'
 require 'openssl'
 
 require_relative 'bter/public.rb'
 require_relative 'bter/trading.rb'
-require_relative 'bter/request_logger.rb'
+require_relative 'bter/request.rb'
 
 module Bter
   

metadata

@@ -1,75 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bter-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zisis Maras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - '>='
+        version: '0.13'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - '>='
+        version: '0.13'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 0.13.1
 description: Ruby api for the bter.com cryptocurrency exchange
 email: zisismaras@gmail.com
 executables: []
@@ -81,7 +61,7 @@ files:
 - README.md
 - lib/bter.rb
 - lib/bter/public.rb
-- lib/bter/request_logger.rb
+- lib/bter/request.rb
 - lib/bter/trading.rb
 homepage: https://github.com/zisismaras/bter-ruby
 licenses:
@@ -93,12 +73,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/bter/request_logger.rb

@@ -1,37 +0,0 @@
-require 'logger'
-
-module Bter
-  module RequestLogger
-    extend self
-  
-    def error_log(request)
-      logger = Logger.new('logfile.log')
-      logger.level = Logger::INFO
-      
-      request.on_complete do |response|
-        if response.success?
-          logger.info("Success")
-          true
-        elsif response.timed_out?
-          logger.error("Got a time out")
-          false
-        elsif response.code == 0
-          logger.error(response.return_message)
-          false
-        else
-          logger.error("HTTP request failed: " + response.code.to_s)
-          false
-        end
-      end
-    end
-    
-    def info_log(code, total_time, header_hash)
-      logger = Logger.new('logfile.log')
-      logger.level = Logger::INFO
-      logger.info("response code : #{code}")
-      logger.info("Total_time: #{total_time}")
-      logger.info("Header_hash: #{header_hash}")
-    end
-     
-  end
-end