block_io 1.0.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9dc992c3a7aa1fc125e1eaf8b16d531318e31fd
-  data.tar.gz: fdf9ae723127d8688e55cdc0c1ffc9f0eb263bda
+  metadata.gz: c7fc111ee1e745f444deeec8b30fa3c3b021fa8e
+  data.tar.gz: d124f3c04d871af2fad451df1488f8569303ff94
 SHA512:
-  metadata.gz: 2ed068c30ce271df8745e66288f050b97f5f3ec3f68f3087c88ed3b7068059e29503edc1043521bb55d56f80dfbb57491ce709033e36ef021e850775ee94501f
-  data.tar.gz: e9c4c14b3c2bbd292a20f8a018bd9089b20d5742115b0ebc9d6c2a707e4fac3583e1dc620fb4a580c5ab284b45a4ce3bc911dbd42ba6853930e93524d0e5e412
+  metadata.gz: 55794be8297122645d9b8b2b978c6377b3aba65b13b3fc155a810d455efc4e4326ac2283553f26e8c7c6bd55ca99bb8191877ad0ef663fcbc61c9b9168464a73
+  data.tar.gz: c05d90965618efe46d3e4dcee968503962fefd6f196ad34e8bc74fda971c11b16b641e6fa69287d0ae75fdbca848bb585aa83125cbf433880071eed014f3a41e

data/.gitignore

@@ -1,2 +1,5 @@
 Gemfile.lock
 pkg
+vendor/
+.bundle/
+*.gem

data/README.md

@@ -14,10 +14,11 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install block_io -v=1.0.6
+    $ gem install block_io -v=1.2.0
 
 ## Changelog
 
+*06/25/18*: Remove support for Ruby < 1.9.3 (OpenSSL::Cipher::Cipher). Remove connection_pool dependency.  
 *01/21/15*: Added ability to sweep coins from one address to another.  
 *11/04/14*: Fix issue with nil parameters in an API call.  
 *11/03/14*: Reduce dependence on OpenSSL. PBKDF2 function is now Ruby-based. Should work well with Heroku's libraries.  

data/block_io.gemspec

@@ -23,7 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ecdsa", "~> 1.2", '>= 1.2.0'
   spec.add_runtime_dependency "httpclient", "~> 2.8", '>= 2.8.0'
   spec.add_runtime_dependency "oj", "~> 3.3", '>= 3.3.5'
-  spec.add_runtime_dependency "oj_mimic_json"
-  spec.add_runtime_dependency "connection_pool", "~> 2.2", '>= 2.2.1'
   spec.add_runtime_dependency "pbkdf2-ruby", '~> 0.2', '>= 0.2.1'
 end

data/examples/basic.rb

@@ -1,9 +1,13 @@
-# creates a new destination address, withdraws from the default label to it, gets sent transactions, and the current price
+# creates a new destination address, withdraws from the default label to it, gets updated address balances, gets sent/received transactions, and the current price
+#
+# basic example: $ API_KEY=TESTNET_API_KEY PIN=YOUR_SECRET_PIN ruby basic.rb
+# bundler example: $ API_KEY=TESTNET_API_KEY PIN=YOUR_SECRET_PIN bundle exec ruby basic.rb
+#
+# adjust amount below if not using the Dogecoin Testnet
 
 require 'block_io'
 
-# please use the Dogecoin Testnet API key here
-puts BlockIo.set_options :api_key => 'YOURDOGECOINTESTNETAPIKEY', :pin => 'YOURSECRETPIN', :version => 2
+puts BlockIo.set_options :api_key => ENV['API_KEY'], :pin => ENV['PIN'], :version => 2
 
 begin
   puts BlockIo.get_new_address(:label => 'testDest')
@@ -12,11 +16,13 @@ rescue Exception => e
   puts e.to_s
 end
 
-puts BlockIo.withdraw_from_labels(:from_labels => 'default', :to_label => 'testDest', :amount => '3.5')
+puts BlockIo.withdraw_from_labels(:from_labels => 'default', :to_label => 'testDest', :amount => '2.5')
 
-puts BlockIo.get_address_by_label(:label => 'default')
+puts BlockIo.get_address_balance(:labels => 'default,testDest')
 
 puts BlockIo.get_transactions(:type => 'sent') # API v2 only
 
+puts BlockIo.get_transactions(:type => 'received') # API v2 only
+
 puts BlockIo.get_current_price(:base_price => 'BTC')
 

data/lib/block_io.rb

@@ -1,7 +1,6 @@
 require 'block_io/version'
 require 'httpclient'
 require 'oj'
-require 'connection_pool'
 require 'ecdsa'
 require 'openssl'
 require 'digest'
@@ -12,9 +11,10 @@ require 'base64'
 module BlockIo
 
   @api_key = nil
-  @base_url = "https://block.io/api/VERSION/API_CALL/?api_key="
+  @base_url = nil
   @pin = nil
   @encryptionKey = nil
+  @client = nil
   @conn_pool = nil
   @version = nil
 
@@ -22,9 +22,15 @@ module BlockIo
     # initialize BlockIo
     @api_key = args[:api_key]
     @pin = args[:pin]
+    
     @encryptionKey = Helper.pinToAesKey(@pin) if !@pin.nil?
 
-    @conn_pool = ConnectionPool.new(size: 1, timeout: 300) { h = HTTPClient.new; h.tcp_keepalive = true; h.ssl_config.ssl_version = :auto; h }
+    hostname = args[:hostname] || "block.io"
+    @base_url = "https://" << hostname << "/api/VERSION/API_CALL/?api_key="
+    
+    @client = HTTPClient.new
+    @client.tcp_keepalive = true
+    @client.ssl_config.ssl_version = :auto
     
     @version = args[:version] || 2 # default version is 2
     
@@ -38,7 +44,6 @@ module BlockIo
     if ['withdraw', 'withdraw_from_address', 'withdraw_from_addresses', 'withdraw_from_user', 'withdraw_from_users', 'withdraw_from_label', 'withdraw_from_labels'].include?(m.to_s) then
       # need to withdraw from an address
       self.withdraw(args.first, m.to_s)
-
     elsif ['sweep_from_address'].include?(m.to_s) then
       # need to sweep from an address
       self.sweep(args.first, m.to_s)
@@ -128,17 +133,13 @@ module BlockIo
 
     body = nil
 
-    @conn_pool.with do |hc|
-      # prevent initiation of HTTPClients every time we make this call, use a connection_pool
-
-      response = hc.post("#{@base_url.gsub('API_CALL',endpoint[0]).gsub('VERSION', 'v'+@version.to_s) + @api_key}", endpoint[1])
+    response = @client.post("#{@base_url.gsub('API_CALL',endpoint[0]).gsub('VERSION', 'v'+@version.to_s) + @api_key}", endpoint[1])
       
-      begin
-        body = Oj.load(response.body)
-        raise Exception.new(body['data']['error_message']) if !body['status'].eql?('success')
-      rescue
-        raise Exception.new('Unknown error occurred. Please report this.')
-      end
+    begin
+      body = Oj.load(response.body)
+      raise Exception.new(body['data']['error_message']) if !body['status'].eql?('success')
+    rescue
+      raise Exception.new('Unknown error occurred. Please report this.')
     end
     
     body
@@ -354,7 +355,7 @@ module BlockIo
       response = nil
 
       begin
-        aes = OpenSSL::Cipher::Cipher.new(cipher_type)
+        aes = OpenSSL::Cipher.new(cipher_type)
         aes.decrypt
         aes.key = Base64.strict_decode64(b64_enc_key)
         aes.iv = iv if iv != nil
@@ -369,7 +370,7 @@ module BlockIo
     
     # Encrypts a block of data given an encryption key
     def self.encrypt(data, b64_enc_key, iv = nil, cipher_type = 'AES-256-ECB')
-      aes = OpenSSL::Cipher::Cipher.new(cipher_type)
+      aes = OpenSSL::Cipher.new(cipher_type)
       aes.encrypt
       aes.key = Base64.strict_decode64(b64_enc_key)
       aes.iv = iv if iv != nil

data/lib/block_io/version.rb

@@ -1,3 +1,3 @@
 module BlockIo
-  VERSION = "1.0.8"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,155 +1,121 @@
 --- !ruby/object:Gem::Specification
 name: block_io
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Atif Nazir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ecdsa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.5
-- !ruby/object:Gem::Dependency
-  name: oj_mimic_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: pbkdf2-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.1
 description: This Ruby Gem is the official reference client for the Block.io payments
@@ -161,7 +127,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -183,17 +149,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An easy to use Dogecoin, Bitcoin, Litecoin wallet API by Block.io. Sign up