okcoin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d6e50b5d0bf07480589a5c0ace82601a66d604f
-  data.tar.gz: 36026e98e7ff68ec78b02fa5bc72d314de90c626
+  metadata.gz: 52ceb78aea2b8a2c40806cd6c1c71306d2a060c4
+  data.tar.gz: 01faf344026e9f3a924cf1940082fe2a9860be3f
 SHA512:
-  metadata.gz: df673216a9422fa2f8ea644af39b95bcea54e79188e61d5ac7db882a38068ec16f7bc1e31ee2289b945c008667a2fb3892fb1cba833b409e07ad516be7421640
-  data.tar.gz: 89e3c77063db92f9f9507b60a96944718989cba9aea22357c618b077a6f2bafece7f39902bf09c8accf9e59b579ce3a5deef511a7e6fd2adb6ac93d8455560cf
+  metadata.gz: 5ca6eac2e7b68629fc60b55495d004402f984549a0156f1b4b0aca9cca42757d7bcbba85c199ae13894a6eb00c8f1f06f4b8219028a0e04d4088bc5ca1c7a4a1
+  data.tar.gz: 4e9f5c3e55535643b2087cd7eec006b6bce0e366732310cd5b7f3247e37bfe340bc1ed6f36af267f24cd3467f2a05e421bc7bc7efe018937c054becbfce26003

data/README.md

@@ -27,8 +27,14 @@ gem 'okcoin'
 ## 使用
 
 ```ruby
+require 'okcoin'
+
+# 如果要看详细的访问情况，把日志级别设置为debug
+Okcoin::logger.level = Logger::DEBUG
+
 # url可选，默认就是https://www.okcoin.cn/api/，后面两个必选
 client = Okcoin::Client.new url: 'https://www.okcoin.cn/api/', api_key: 'YOUR_OKCOIN_APIKEY', secret_key: 'YOUR_OKCOIN_SECRET'
+
 client.ticker(symbol: "btc_cny")
 client.trades(symbol: 'btc_cny', since: nil)
 ```

data/lib/okcoin/api_define_tool.rb

@@ -1,23 +1,25 @@
-module ApiDefineTool
+module Okcoin
+  module ApiDefineTool
 
-  def define_get_api(*api_names)
-    api_names.each do |api_name|
-      define_method(api_name) do |**params|
-        params.reject! do |k, v| v.blank? end
-        http_get(@url+"v1/#{api_name}.do", params)
+    def define_get_api(*api_names)
+      api_names.each do |api_name|
+        define_method(api_name) do |**params|
+          params.reject! do |k, v| v.blank? end
+          http_get(@url+"v1/#{api_name}.do", params)
+        end
       end
     end
-  end
 
-  def define_post_api(*api_names)
-    api_names.each do |api_name|
-      define_method(api_name) do |**params|
-        params.reject! do |k, v| v.blank? end
-        params[:api_key] = @api_key
-        params[:sign] = sign(params)
-        http_post(@url+"v1/#{api_name}.do", params)
+    def define_post_api(*api_names)
+      api_names.each do |api_name|
+        define_method(api_name) do |**params|
+          params.reject! do |k, v| v.blank? end
+          params[:api_key] = @api_key
+          params[:sign] = sign(params)
+          http_post(@url+"v1/#{api_name}.do", params)
+        end
       end
     end
-  end
 
+  end
 end

data/lib/okcoin/http_utils.rb

@@ -1,39 +1,39 @@
-module HttpUtils
+module Okcoin
+  module HttpUtils
+    # result = http_get("https://www.okcoin.cn/api/v1/trades.do", { symbol: 'btc_usd', since: nil })
+    def http_get(url, params={})
+      uri = URI(url)
+      uri.query = URI.encode_www_form(params)
+      Okcoin::logger.debug( 'GET: ' + (uri.query.blank? ? url : "#{url}?#{uri.query}") )
 
-  # result = http_get("https://www.okcoin.cn/api/v1/trades.do", { symbol: 'btc_usd', since: nil })
-  def http_get(url, params={})
-    uri = URI(url)
-    uri.query = URI.encode_www_form(params)
-    logger.debug( 'GET: ' + (uri.query.blank? ? url : "#{url}?#{uri.query}") )
+      response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
+        request = Net::HTTP::Get.new uri
+        http.request request
+      end
 
-    response = Net::HTTP.start(uri.host, uri.port, :use_ssl => true) do |http|
-      request = Net::HTTP::Get.new uri
-      http.request request
+      if response.is_a?(Net::HTTPOK)
+        JSON.parse(response.body)
+      else
+        Okcoin::logger.error('response code is not 200!')
+        nil # todo: 报个异常
+      end
     end
 
-    if response.is_a?(Net::HTTPOK)
-      JSON.parse(response.body)
-    else
-      logger.error('response code is not 200!')
-      nil # todo: 报个异常
-    end
-  end
+    def http_post(url, params={})
+      uri = URI(url)
+      Okcoin::logger.debug( "POST: #{url}?#{URI.encode_www_form(params)}" )
+      response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => true) do |http|
+          request = Net::HTTP::Post.new(uri)
+          request.set_form_data(params)
+          http.request request
+      end
 
-  def http_post(url, params={})
-    uri = URI(url)
-    logger.debug( "POST: #{url}?#{URI.encode_www_form(params)}" )
-    response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => true) do |http|
-        request = Net::HTTP::Post.new(uri)
-        request.set_form_data(params)
-        http.request request
-    end
-
-    if response.is_a?(Net::HTTPOK)
-      JSON.parse(response.body)
-    else
-      logger.error('response code is not 200!')
-      nil # todo: 报个异常
+      if response.is_a?(Net::HTTPOK)
+        JSON.parse(response.body)
+      else
+        Okcoin::logger.error('response code is not 200!')
+        nil # todo: 报个异常
+      end
     end
   end
 end
-

data/lib/okcoin/version.rb

@@ -1,3 +1,3 @@
 module Okcoin
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/okcoin.rb

@@ -9,15 +9,15 @@ require "okcoin/api_define_tool"
 require 'okcoin/base'
 require "okcoin/client"
 
-def logger
-  if $logger.nil?
-    $logger = Logger.new(STDOUT)
-    $logger.level = Logger::DEBUG
+module Okcoin
+  def self.logger
+    if $logger.nil?
+      $logger = Logger.new(STDOUT)
+      $logger.level = Logger::WARN
+    end
+    return $logger
   end
-  return $logger
-end
 
-module Okcoin
   class Object
 	  def blank?
 	    respond_to?(:empty?) ? !!empty? : !self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: okcoin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Wu Minzhe