Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass url query for GET request instead of request.body #16

Merged
merged 4 commits into from
Dec 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
/spec/reports/
/tmp/
test_example.rb
.env
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in ruby_coincheck_client.gemspec
gemspec

group :development, :test do
gem 'dotenv'
end
11 changes: 11 additions & 0 deletions examples/private.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
require_relative '../lib/ruby_coincheck_client'
require 'dotenv'
Dotenv.load ".env"

cc = CoincheckClient.new(ENV['API_KEY'], ENV['SECRET_KEY'])
puts cc.read_balance.body
puts cc.read_leverage_balance.body
puts cc.read_accounts.body
puts cc.read_transactions.body
puts cc.read_positions.body
puts cc.read_orders.body
8 changes: 8 additions & 0 deletions examples/public.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
require_relative '../lib/ruby_coincheck_client'

cc = CoincheckClient.new
puts cc.read_ticker.body
puts cc.read_trades.body
puts cc.read_rate.body
puts cc.read_order_books.body
puts cc.read_orders_rate(order_type: 'sell', price: 100000).body
4 changes: 2 additions & 2 deletions lib/ruby_coincheck_client.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require "ruby_coincheck_client/version"
require "ruby_coincheck_client/coincheck_client"
require_relative "./ruby_coincheck_client/version"
require_relative "./ruby_coincheck_client/coincheck_client"

module RubyCoincheckClient
# Your code goes here...
Expand Down
41 changes: 23 additions & 18 deletions lib/ruby_coincheck_client/coincheck_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class CoincheckClient
include Currency

@@base_url = "https://coincheck.jp/"
@@base_url = "https://coincheck.com/"
@@ssl = true

def initialize(key = nil, secret = nil, params = {})
Expand Down Expand Up @@ -45,10 +45,10 @@ def read_transactions
request_for_get(uri, headers)
end

def read_positions(body = {})
def read_positions(params = {})
uri = URI.parse @@base_url + "api/exchange/leverage/positions"
headers = get_signature(uri, @key, @secret, body.to_json)
request_for_get(uri, headers, body)
headers = get_signature(uri, @key, @secret)
request_for_get(uri, headers, params)
end

def read_orders
Expand Down Expand Up @@ -80,8 +80,7 @@ def delete_orders(id: )
def read_orders_rate(order_type:, pair: Pair::BTC_JPY, price: nil, amount: nil)
uri = URI.parse @@base_url + "api/exchange/orders/rate"
params = { order_type: order_type, pair: pair, price: price, amount: amount }
uri.query = URI.encode_www_form(params)
request_for_get(uri)
request_for_get(uri, {}, params)
end

def create_send_money(address:, amount:)
Expand All @@ -95,17 +94,17 @@ def create_send_money(address:, amount:)
end

def read_send_money(currency: "BTC")
body = { currency: currency }
params = { currency: currency }
uri = URI.parse @@base_url + "api/send_money"
headers = get_signature(uri, @key, @secret, body.to_json)
request_for_get(uri, headers, body)
headers = get_signature(uri, @key, @secret)
request_for_get(uri, headers, params)
end

def read_deposit_money(currency: "BTC")
body = { currency: currency }
params = { currency: currency }
uri = URI.parse @@base_url + "api/deposit_money"
headers = get_signature(uri, @key, @secret, body.to_json)
request_for_get(uri, headers, body)
headers = get_signature(uri, @key, @secret)
request_for_get(uri, headers, params)
end

def create_deposit_money_fast(id: )
Expand Down Expand Up @@ -227,29 +226,35 @@ def http_request(uri, request)
end
end

def request_for_get(uri, headers = {}, body = nil)
request = Net::HTTP::Get.new(uri.request_uri, initheader = headers)
request.body = body.to_json if body
def request_for_get(uri, headers = {}, params = nil)
uri.query = URI.encode_www_form(params) if params
request = Net::HTTP::Get.new(uri.request_uri, initheader = custom_header(headers))
http_request(uri, request)
end

def request_for_delete(uri, headers)
request = Net::HTTP::Delete.new(uri.request_uri, initheader = headers)
request = Net::HTTP::Delete.new(uri.request_uri, initheader = custom_header(headers))
http_request(uri, request)
end

def request_for_post(uri, headers, body)
request = Net::HTTP::Post.new(uri.request_uri, initheader = headers)
request = Net::HTTP::Post.new(uri.request_uri, initheader = custom_header(headers))
request.body = body.to_json
http_request(uri, request)
end

def custom_header(headers = {})
headers.merge!({
"Content-Type" => "application/json",
"User-Agent" => "RubyCoincheckClient v#{RubyCoincheckClient::VERSION}"
})
end

def get_signature(uri, key, secret, body = "")
nonce = (Time.now.to_f * 1000000).to_i.to_s
message = nonce + uri.to_s + body
signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("sha256"), secret, message)
headers = {
"Content-Type" => "application/json",
"ACCESS-KEY" => key,
"ACCESS-NONCE" => nonce,
"ACCESS-SIGNATURE" => signature
Expand Down