bitflyer 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b7d3681f63edf4ec68d0d5958e386100fdb49771f6e9effc6b02b94c9c5c577
-  data.tar.gz: 12dfafaa76aec07e11c2abc2386ab19cd04cd821c208dd928f36923f9eb102a0
+  metadata.gz: fa057685f2e11b3a0bf9f46f0282f240e57e22c4cfbb507e4d92770b8441a997
+  data.tar.gz: ae4ce59c0e407b7e80d1970b7f716037fcf5c79e09abee07074b019873fcc5f2
 SHA512:
-  metadata.gz: 9b0a95bc8cc1d80d8b3581c36990c076da8d6345a73548e59f54a7d4907f3e665fccf127fe7c503ef175d45d268aa83218e6fb619fa021733914e944b29fc91d
-  data.tar.gz: 63a055d9b5f1e975546d8afccdf434fe210952b10a91847a1d28f260dbc856f393b9564555c6275237eb499819289543767f18c8d8fde93a173a85a9f0c9920e
+  metadata.gz: 68fb55c3fb2bf4e52595ad2574913b425927f0db1b21d59181163306354d4d2fed6cf0d60213732d36a0cf18e59910e21b00a61311a4d0f8497885777414c5e0
+  data.tar.gz: 78819f20b021ffd427837b9525c057fd3f33ef7b9237d274e92fe3089660d8e16255bf2fd70c82d0e2a67a82c22c6aede1e67fb02e1b8b6d15f0578a56549dc2

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @unhappychoice

data/.github/dependabot.yml

@@ -1,23 +1,15 @@
 version: 2
 updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "12:00"
-    timezone: Asia/Tokyo
-  open-pull-requests-limit: 20
-  reviewers:
-  - unhappychoice
-  allow:
-  - dependency-type: direct
-  - dependency-type: indirect
-  ignore:
-  - dependency-name: rubocop
-    versions:
-    - 1.12.0
-    - 1.12.1
-  - dependency-name: regexp_parser
-    versions:
-    - 2.1.0
-    - 2.1.1
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "12:00"
+      timezone: Asia/Tokyo
+    open-pull-requests-limit: 20
+    allow:
+      - dependency-type: direct
+      - dependency-type: indirect
+    ignore:
+      - dependency-name: parallel
+        update-types: ["version-update:semver-major"]

data/Gemfile.lock

@@ -1,9 +1,7 @@
 PATH
   remote: .
   specs:
-    bitflyer (2.0.1)
-      faraday (>= 1.0)
-      faraday_middleware (>= 1.2)
+    bitflyer (2.0.3)
       websocket-client-simple (>= 0.9)
 
 GEM
@@ -14,81 +12,58 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.6.2)
     event_emitter (0.2.6)
-    faraday (1.10.4)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.1)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
-      multipart-post (~> 2.0)
-    faraday-net_http (1.0.2)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.1)
-      faraday (~> 1.0)
-    json (2.12.2)
-    language_server-protocol (3.17.0.5)
+    io-console (0.8.2)
+    json (2.21.1)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     method_source (1.1.0)
-    multipart-post (2.4.1)
     mutex_m (0.3.0)
-    parallel (1.27.0)
-    parser (3.3.8.0)
+    parallel (1.28.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
-    pry (0.15.2)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+      reline (>= 0.6.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.0)
-    regexp_parser (2.10.0)
-    rspec (3.13.1)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.4)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    rubocop (1.77.0)
+    rspec-support (3.13.7)
+    rubocop (1.88.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
     websocket (1.2.11)
     websocket-client-simple (0.9.0)
       base64

data/README.md

@@ -3,11 +3,10 @@
 [![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Gem Version](https://badge.fury.io/rb/bitflyer.svg)](https://badge.fury.io/rb/bitflyer)
-[![Circle CI](https://circleci.com/gh/unhappychoice/bitflyer.svg?style=shield)](https://circleci.com/gh/unhappychoice/bitflyer)
-[![Code Climate](https://codeclimate.com/github/unhappychoice/bitflyer/badges/gpa.svg)](https://codeclimate.com/github/unhappychoice/bitflyer)
-[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/unhappychoice/bitflyer.svg)](https://libraries.io/github/unhappychoice/bitflyer)
+[![Code Climate](https://codeclimate.com/github/bitflyer-tools/bitflyer/badges/gpa.svg)](https://codeclimate.com/github/bitflyer-tools/bitflyer)
+[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/bitflyer-tools/bitflyer.svg)](https://libraries.io/github/bitflyer-tools/bitflyer)
 ![](http://ruby-gem-downloads-badge.herokuapp.com/bitflyer?type=total)
-![GitHub](https://img.shields.io/github/license/unhappychoice/bitflyer.svg)
+![GitHub](https://img.shields.io/github/license/bitflyer-tools/bitflyer.svg)
 
 bitflyer is a wrapper interface of [Bitflyer lightning API](https://lightning.bitflyer.jp/docs)  
 
@@ -115,3 +114,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+
+## Author
+
+[@unhappychoice](https://unhappychoice.com)

data/bitflyer.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '>= 1.0'
-  spec.add_dependency 'faraday_middleware', '>= 1.2'
   spec.add_dependency 'websocket-client-simple', '>= 0.9'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry'

data/lib/bitflyer/http.rb

@@ -3,46 +3,62 @@
 require 'bitflyer'
 require 'bitflyer/http/public'
 require 'bitflyer/http/private'
-require 'faraday'
-require 'faraday_middleware'
+require 'net/http'
+require 'uri'
+require 'json'
 require 'openssl'
 
 module Bitflyer
   module HTTP
-    class Connection
-      extend Forwardable
+    BASE_URL = 'https://api.bitflyer.jp'
 
-      def_delegators :@connection, :get, :post
+    Response = Struct.new(:body)
 
+    class Connection
       def initialize(key, secret)
-        @connection = Faraday::Connection.new(url: 'https://api.bitflyer.jp') do |f|
-          f.request :json
-          f.response :json
-          f.use Authentication, key, secret
-          f.adapter Faraday.default_adapter
-        end
-      end
-    end
-
-    class Authentication < Faraday::Middleware
-      def initialize(app, key, secret)
-        super(app)
         @key = key
         @secret = secret
+        @uri = URI.parse(BASE_URL)
+      end
+
+      def get(path, params = {})
+        query = URI.encode_www_form(params.compact)
+        full_path = query.empty? ? path : "#{path}?#{query}"
+        request = Net::HTTP::Get.new(full_path, default_headers)
+        sign_request(request, full_path)
+        Response.new(execute(request))
       end
 
-      def call(env)
-        return @app.call(env) if @key.nil? || @secret.nil?
+      def post(path, body = {})
+        request = Net::HTTP::Post.new(path, default_headers.merge('Content-Type' => 'application/json'))
+        request.body = JSON.generate(body.compact)
+        sign_request(request, path, request.body)
+        Response.new(execute(request))
+      end
+
+      private
+
+      def default_headers
+        { 'Accept' => 'application/json' }
+      end
+
+      def sign_request(request, path, body = '')
+        return if @key.nil? || @secret.nil?
 
         timestamp = Time.now.to_i.to_s
-        method = env[:method].to_s.upcase
-        path = env[:url].path + (env[:url].query ? "?#{env[:url].query}" : '')
-        body = env[:body] || ''
-        signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @secret, timestamp + method + path + body)
-        env[:request_headers]['ACCESS-KEY'] = @key if @key
-        env[:request_headers]['ACCESS-TIMESTAMP'] = timestamp
-        env[:request_headers]['ACCESS-SIGN'] = signature
-        @app.call env
+        method = request.method.upcase
+        text = timestamp + method + path + (body || '')
+        signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), @secret, text)
+        request['ACCESS-KEY'] = @key
+        request['ACCESS-TIMESTAMP'] = timestamp
+        request['ACCESS-SIGN'] = signature
+      end
+
+      def execute(request)
+        response = Net::HTTP.start(@uri.host, @uri.port, use_ssl: true) { |http| http.request(request) }
+        JSON.parse(response.body)
+      rescue JSON::ParserError
+        response.body
       end
     end
   end

data/lib/bitflyer/realtime/client.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'forwardable'
 require_relative 'websocket'
 
 module Bitflyer
@@ -15,6 +16,7 @@ module Bitflyer
 
     class Client
       extend Forwardable
+
       def_delegators :@websocket_client, :ready=, :disconnected=
       attr_accessor :websocket_client, :ping_interval, :ping_timeout, :last_ping_at, :last_pong_at
 

data/lib/bitflyer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitflyer
-  VERSION = '2.0.1'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitflyer
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Yuji Ueki
@@ -9,34 +9,6 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +101,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".all-contributorsrc"
+- ".github/CODEOWNERS"
 - ".github/dependabot.yml"
 - ".github/workflows/release.yaml"
 - ".github/workflows/test.yml"