bter-ruby 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e450fe92759644777b68b408c8233222342c3368
-  data.tar.gz: 06be7c0ea828bfe0c72d24147b3510befffdc9a4
+  metadata.gz: 5cbf624f97dd04ca5004a9f5c387eeda4f7e24f5
+  data.tar.gz: c3519e8129ffcb440b7218765ec388231c220e01
 SHA512:
-  metadata.gz: 950566bd7ab675f5ac58747e17cfc573de427e50ccd41f223dd4c14bff749579ec55efe0c08bb0f63714b9168242d708c5528e4fcb0832118b8d2d7f37d2d89b
-  data.tar.gz: 711817483e659b969d5d9641202b09e127c5aca1f4effedff60e67f6643c2e64d2ce4e97addec9d88b7c0f1e2cb102a9b8f8db824b2c07647cb750109a22d4a2
+  metadata.gz: eecfef2a0ec4b8b4669ae3a0524ef6a17464f5865f020891f4974648e9fdc3d85b77137d1cc5d3fd0c6b7d8f14d50d4db7de684a273a061a9ee381cbb359b819
+  data.tar.gz: 02db7abd32840cbf5f625fa81907a65df6f0bfca6d925dab854f857053fe22d9f82664f69bae7cc1b68014e0fb2b7179c22f0a322e6fb793749bb6d2f0bbc007

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/lib/bter/public.rb

@@ -2,48 +2,24 @@ require_relative 'request.rb'
 
 module Bter
   class Public
-    include Request  
-    def pairs
-      query = public_request("pairs")
-      JSON.parse(query, {:symbolize_names => true}) 
-    end
-
-    def ticker(pair)
-      query = public_request("ticker", pair)
-      JSON.parse(query, {:symbolize_names => true}) 
-    end
+    include Request 
 
-    def tickers
-      query = public_request("tickers")
-      JSON.parse(query, {:symbolize_names => true}) 
-    end
-    
-    def depth(pair)
-      query = public_request("depth", pair)
-      JSON.parse(query, {:symbolize_names => true})   
-    end
+    METHODS = ['pairs', 'ticker', 'tickers', 'depth', 'marketinfo', 'markelist', 'trade'] 
 
-    def info
-      query = public_request("marketinfo")
-      JSON.parse(query, {:symbolize_names => true})  
+    METHODS.each do |method|
+      define_method(method) do |pair=nil, tid=nil|
+        public_request(method, pair, tid)
+      end  
     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 
-
+    #will be removed soon
     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 
+    alias_method :info, :marketinfo 
+    alias_method :details, :markelist 
+    alias_method :trades, :trade
+    alias_method :history, :trade 
   end
 end

data/lib/bter/request.rb

@@ -4,8 +4,11 @@ module Bter
   	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
+    private
+    def public_request(method, pair='', tid=nil)
+      pair = pair + "/#{tid}" if tid.nil? == false
+      response = HTTParty.get("#{PUBLIC_URL}/#{method}/#{pair}").body
+      make_hash(response)
     end
 
     def trade_request(method, params=nil)
@@ -17,7 +20,7 @@ module Bter
           @params.merge!(param)
         end
       end
-      HTTParty.post(
+      response = HTTParty.post(
       	"#{TRADE_URL}/#{method}",
         :body => @params,
         :headers => {
@@ -27,6 +30,7 @@ module Bter
           "Accept" => "application/x-www-form-urlencoded"
           }
       ).body
+      make_hash(response)
     end 
 
     def sign
@@ -34,5 +38,9 @@ module Bter
       @params = @params.collect {|k,v| "#{k}=#{v}"}.join('&')
       hmac.update(@params).to_s    
     end
+
+    def make_hash(json_object)
+      JSON.parse(json_object, {:symbolize_names => true})
+    end
   end
 end

data/lib/bter/trading.rb

@@ -5,17 +5,19 @@ module Bter
     include Request
   
     attr_accessor :key, :secret
-       
-    def get_info    
-      query = trade_request("getfunds")
-      JSON.parse(query, {:symbolize_names => true})
-    end
-    
-    def active_orders
-      query = trade_request("orderlist")
-      JSON.parse(query, {:symbolize_names => true})
-    end 
     
+    METHODS = ['getfunds', 'orderlist', 'getorder', 'cancelorder', 'mytrades'] 
+
+    METHODS.each do |method|
+      define_method(method) do |param=nil|
+        if param.to_i > 0
+          trade_request(method, [{:order_id => param}])
+        else
+          trade_request(method, [{:pair => param}])
+        end
+      end  
+    end
+
     #abstract the trade to buy and sell
     def buy(pair, amount, rate=nil)
       rate ||= get_rate(pair)
@@ -26,21 +28,13 @@ module Bter
       rate ||= get_rate(pair)
       trade({:pair => pair, :type => "SELL", :rate => rate, :amount => amount})
     end
-    
-    def order_status(order_id)
-      query = trade_request("getorder", [{:order_id => order_id}])
-      JSON.parse(query, {:symbolize_names => true})
-    end
-    
-    def cancel_order(order_id)
-      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
+   
+    alias_method :get_info, :getfunds 
+    alias_method :active_orders, :orderlist 
+    alias_method :order_status, :getorder
+    alias_method :cancel_order, :cancelorder
+    alias_method :get_info, :getfunds 
+    alias_method :my_trades, :mytrades    
     
     #soon to be removed
     def logging(log)
@@ -50,7 +44,6 @@ module Bter
     private
     def trade(*params)
       query = trade_request("placeorder", params)
-      JSON.parse(query, {:symbolize_names => true})
     end
 
     def get_rate(pair)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bter-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Zisis Maras
@@ -14,40 +14,40 @@ dependencies:
   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: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.13'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.13.1
 description: Ruby api for the bter.com cryptocurrency exchange
@@ -73,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: []