coinrpc 1.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e6758d40043fc3414515ea9a7e9e772bb2a1e4fc4aa7fa29eff8e0b81d85254
-  data.tar.gz: d9be85a33cc6844570370b8613a5067857ff10ae1646eed3bad7409a29d970a2
+  metadata.gz: a3493555e3ce9e403bbd0d884396b0c6ccf803f7757e8a6bbab45408df54dfc6
+  data.tar.gz: 35e3547a5fe14792629730f271c0e6148bae8be395f82b76ff5a49994629d299
 SHA512:
-  metadata.gz: e6a72814efa91ef47cb65d4444b9fcaf870be25026b1e423b30603720d2b070ad2cee9899ba6f96e4c883c516257873e7e3d6cb0812e78f86acca06d377be713
-  data.tar.gz: 7790d3f541b1d516e2c6e6285ee42acb63074731a9664059802cd0184a0f1ebc2b5e97d3dd297097e097a7e2813b13a4402aa1a55747daf6e1930b8862291efe
+  metadata.gz: 8849abd81ed97fadc7ce19778cef998b64536af4142cbf0e249d4eea777e386f565a5dc26ccb766cd78d670a627f8dc2b946880f8f24f122a474157b8d11b363
+  data.tar.gz: db827e4d80c96fc4dddcc79e1fea46c2f69aab1aa6afbad68222616c5c91ac21651d39a60853cb85024f22a8c0fbeae56d56c18f9a362b38f653862e06be3b7d

data/README.md

@@ -6,7 +6,7 @@ A simple client for Bitcoin Core style RPC. Supports batch requests.
 
 Add this line to your application's Gemfile:
 
-    gem 'coinrpc'
+    gem "coinrpc"
 
 And then execute:
 
@@ -19,7 +19,7 @@ Or install it yourself as:
 ## Usage
 
 ```
-    require 'coinrpc'
+    require "coinrpc"
     client = CoinRPC::Client.new("http://username:password@hostname:port")
     puts client.getblockchaininfo
 ```
@@ -27,13 +27,13 @@ Or install it yourself as:
 Responses will contain coin values as BigDecimals:
 
 ```
-    puts client.getrawtransaction(txid)['vout'].first['value'].to_s("F")
+    puts client.getrawtransaction(txid)["vout"].first["value"].to_s("F")
 ```
 
 ## Contributing
 
 1. Fork it ( https://github.com/doersf/coinrpc/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
+3. Commit your changes (`git commit -am "Add some feature"`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request

data/coinrpc.gemspec

@@ -1,6 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'coinrpc/version'
+require "coinrpc/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "coinrpc"
@@ -17,11 +17,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.required_ruby_version = ">= 2.4", "< 3.2"
+  spec.required_ruby_version = ">= 2.6", "< 3.2"
   
   spec.add_development_dependency "bundler", ">= 1.6", "< 3.0"
   spec.add_development_dependency "rake", ">= 13.0", "< 14.0"
   spec.add_runtime_dependency "json", "~> 2.0", ">= 2.3.1", "< 3.0"
   spec.add_runtime_dependency "oj", ">= 3.10", "< 4.0"
-  spec.add_runtime_dependency "http", ">= 4.4", "< 5.1"
+  spec.add_runtime_dependency "typhoeus", ">= 1.0", "< 2.0"
 end

data/lib/coinrpc/version.rb

@@ -1,3 +1,3 @@
 module CoinRPC
-  VERSION = "1.0.3"
+  VERSION = "3.0.0".freeze
 end

data/lib/coinrpc.rb

@@ -1,69 +1,74 @@
-require 'http'
-require 'oj'
-require 'json'
-require 'coinrpc/version'
+require "uri"
+require "typhoeus"
+require "oj"
+require "json"
+require "securerandom"
+require "coinrpc/version"
 
 # let OJ mimic JSON
 Oj.mimic_JSON
 
 module CoinRPC
+
+  class TimeoutError < Exception; end
+  class UnsuccessfulError < Exception; end
+  class NoResponseError < Exception; end
+  
   class Client
+
+    JSONRPC_V1_1 = "1.1".freeze
+    JSONRPC_V2_0 = "2.0".freeze
+    TIMEOUT = 60.freeze
+    
     def initialize(url)
 
       urinfo = URI.parse(url)
 
-      @client = HTTP.persistent("http://#{urinfo.host}:#{urinfo.port}").timeout(60).basic_auth({:user => urinfo.user, :pass => urinfo.password})
-      @id = rand(1000000)
-
+      @options = {:timeout => TIMEOUT, :userpwd => "#{urinfo.user}:#{urinfo.password}", :headers => {"User-Agent" => "CoinRPC/#{CoinRPC::VERSION}"}}.freeze
+      @url = "http://#{urinfo.host}:#{urinfo.port}/".freeze
+      
     end
-
+    
+    def random_id
+      SecureRandom.hex(4).to_i(16)
+    end
+    
     def method_missing(method, *args)
 
-      @id += 1
-
       fixed_method = method.to_s.gsub(/\_/,"").freeze
-
       post_data = nil
       
-      if args.first.is_a?(Array) and args.first.size > 0 then
+      if args[0].is_a?(Array) and args[0].size > 0 then
         # batch request
-
-        post_data = []
-
-        args.each do |arg|
-          @id += 1
-          post_data << ({:jsonrpc => "2.0", :method => fixed_method, :params => arg, :id => @id})
-        end
-
+        post_data = args.map{|arg| {:jsonrpc => JSONRPC_V2_0, :method => fixed_method, :params => arg, :id => random_id} }
       else
-
-        post_data = ({
-                       :method => fixed_method,
-                       :params => args,
-                       :jsonrpc => "1.1",
-                       :id => @id
-                     })
-        
+        post_data = {:method => fixed_method, :params => args, :jsonrpc => JSONRPC_V1_1, :id => random_id}
       end
       
-      return api_call(post_data)
+      api_call(post_data)
       
     end
 
     private
     def api_call(params)
 
-      response = @client.post("/", :body => Oj.dump(params, mode: :compat)).to_s
+      response = Typhoeus::Request.post(@url, :body => Oj.dump(params, :mode => :compat), **@options)
+
+      raise CoinRPC::TimeoutError if response.timed_out?
+      raise CoinRPC::NoResponseError if response.code.eql?(0)
+      raise CoinRPC::UnsuccessfulError unless response.success?
 
       # this won't work without Oj.mimic_JSON
-      result = Oj.strict_load(response, :decimal_class => BigDecimal)
+      result = Oj.strict_load(response.body, :decimal_class => BigDecimal)
       
-      raise result['error']['message'] if !result.is_a?(Array) and result['error']
-
-      return result['result'] if result.is_a?(Hash)
+      raise result["error"]["message"] if result.is_a?(Hash) and !result["error"].nil?
 
-      # batch call
-      return result.map{|r| r['result'] || r['error']}
+      if result.is_a?(Hash) then
+        result["result"]
+      else
+        # batch call
+        result.map{|r| r["result"] || r["error"]}
+      end
 
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coinrpc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Atif Nazir
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,25 +97,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '2.0'
 description: This Ruby Gem is a fast RPC client for Bitcoin Core style software, including
   Dogecoin, Litecoin, and other similar software that implements Bitcoin Core RPC
   interfaces.
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
   - - "<"
     - !ruby/object:Gem::Version
       version: '3.2'
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A fast RPC client for Bitcoin Core style software.