blockchain 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e743573eea586a756a9be86dd0520a3ef75731ac
-  data.tar.gz: b0e4df9dcaadddbd4ea608ad52a7e7488ddb4372
+  metadata.gz: d95d10a7551162c4df9e3606b1193b24610e88c5
+  data.tar.gz: a60c0069e1a45759f003827ea14a180eb2035ed3
 SHA512:
-  metadata.gz: 776d8f47c6ab6880fc3597990d034f433b0a54075585cd936f8b068a98c9b48407fd14021a8108784dd75ca064efcb9d276af7684f8e1cdfb647e0fa72ab3c6d
-  data.tar.gz: 5b4ef222ccaabc04bdc9cbcd227b32ff1b3a1f5dcd684e7775cb30ee448b597c68f1d76302d1d549c5eb6003d76808b1298576429f6276e892708cd5dab2dc86
+  metadata.gz: b1eca5be6b204c074271055ec0d4946f83c5b833d28b11a67a3cfa7f5e61f067b95c1ff25cbf3fb6ab22794576032538ffb042f369d02168c75755dc971bb966
+  data.tar.gz: ec10af446b6dec13829788b80ebdbb986743865bbd7525b14514d3429bd6267d1b400cebcea197edea7889bdac1a2c344f7ccf3b0797a1d9d5fbc4623d7fc515

data/README.md

@@ -17,6 +17,8 @@ $ cd api-v1-client-ruby
 $ rake install
 ```
 
+To use the `wallet` and `createwallet` functionality, you'll also need an instance of [service-my-wallet][my-wallet].
+
 The gem consists of the following functionality:
 
 * `blockexplorer` ([docs](docs/blockexplorer.md)) ([api/blockchain_api][api1])
@@ -48,6 +50,7 @@ In order to prevent abuse some API methods require an API key approved with some
 
 The same API key can be used to bypass the request limiter.
 
+[my-wallet]: https://github.com/blockchain/service-my-wallet-v3
 [api1]: https://blockchain.info/api/blockchain_api
 [api2]: https://blockchain.info/api/create_wallet
 [api3]: https://blockchain.info/api/exchange_rates_api

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
 
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+end

data/blockchain.gemspec

@@ -15,9 +15,11 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(spec|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-end
+  spec.add_development_dependency 'rspec', '~> 3.4'
+
+end

data/docs/createwallet.md

@@ -7,6 +7,7 @@ Params:
 ```
 password : str - password for the new wallet. At least 10 characters.
 api_code : str - API code with the create wallets permission
+url : str - URL for an instance of service-my-wallet
 priv : str - private key to add to the wallet (optional, keyword)
 label : str - label for the first address in the wallet (optional, keyword)
 email : str - email to associate with the new wallet (optional, keyword)
@@ -16,5 +17,5 @@ Usage:
 ```ruby
 require 'blockchain'
 
-wallet = Blockchain::create_wallet('1234password', '58ck39ajuiw', label: 'Test wallet')
+wallet = Blockchain::create_wallet('1234password', '58ck39ajuiw', 'http://localhost:3000/', label: 'Test wallet')
 ```

data/docs/wallet.md

@@ -6,6 +6,7 @@ Constructor params:
 ```
 identifier : str
 password : str
+url : str
 second_password : str (optional)
 api_code : str (optional)
 ```
@@ -14,7 +15,7 @@ Usage:
 ```ruby
 require 'blockchain'
 
-wallet = Blockchain::Wallet.new('ada4e4b6-3c9f-11e4-baad-164230d1df67', 'password123')
+wallet = Blockchain::Wallet.new('ada4e4b6-3c9f-11e4-baad-164230d1df67', 'password123', 'http://localhost:3000/')
 ```
 
 ####`send`

data/lib/blockchain/createwallet.rb

@@ -3,7 +3,7 @@ require_relative 'util'
 
 module Blockchain
 
-	def self.create_wallet(password, api_code, priv: nil, label: nil, email: nil)
+	def self.create_wallet(password, api_code, url, priv: nil, label: nil, email: nil)
 
 		params = { 'password' => password, 'api_code' => api_code }
 		
@@ -17,22 +17,22 @@ module Blockchain
 			params['email'] = email
 		end
 		
-		response = Blockchain::call_api('api/v2/create_wallet', method: 'post', data: params)
+		response = Blockchain::call_api('api/v2/create', method: 'post', data: params, base_url: url)
 		json_response = JSON.parse(response)
 		return CreateWalletResponse.new(json_response['guid'],
 										json_response['address'],
-										json_response['link'])
+										json_response['label'])
 	end
 
 	class CreateWalletResponse
 		attr_reader :identifier
 		attr_reader :address
-		attr_reader :link
+		attr_reader :label
 
-		def initialize(identifier, address, link)
+		def initialize(identifier, address, label)
 			@identifier = identifier
 			@address = address
-			@link = link
+			@label = label
 		end
 	end
 

data/lib/blockchain/util.rb

@@ -5,14 +5,14 @@ module Blockchain
 	class APIException < StandardError
 	end
 
-	BASE_URL = "https://blockchain.info/"
+	BASE_URL = 'https://blockchain.info/'
 	TIMEOUT_SECONDS = 10
 	
 	def self.call_api(resource, method: 'get', data: nil, base_url: nil)
 		base_url ||= BASE_URL
 		url = URI.parse(base_url + resource)
 		http = Net::HTTP.new(url.host, url.port)
-		http.use_ssl = true
+		http.use_ssl = base_url.start_with? 'https://'
 		http.read_timeout = TIMEOUT_SECONDS
 		
 		request = nil

data/lib/blockchain/version.rb

@@ -1,3 +1,3 @@
 module Blockchain
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/blockchain/wallet.rb

@@ -5,11 +5,12 @@ module Blockchain
 
 	class Wallet
 
-		def initialize(identifier, password, second_password = nil, api_code = nil)
+		def initialize(identifier, password, url, second_password = nil, api_code = nil)
 			@identifier = identifier
 			@password = password
 			@second_password = second_password
 			@api_code = api_code
+			@url = url
 		end
 		
 		def send(to, amount, from_address: nil, fee: nil, note: nil)
@@ -40,7 +41,7 @@ module Blockchain
 				params['note'] = note
 			end
 			
-			response = Blockchain::call_api("merchant/#{@identifier}/#{method}", method: 'post', data: params)
+			response = Blockchain::call_api("merchant/#{@identifier}/#{method}", method: 'post', data: params, base_url: @url)
 			json_response = parse_json(response)
 			return PaymentResponse.new(
 										json_response['message'],
@@ -110,14 +111,6 @@ module Blockchain
 			return json_response['active']
 		end
 		
-		def consolidate(days)
-			params = build_basic_request()
-			params['days'] = days
-			response = Blockchain::call_api("merchant/#{@identifier}/auto_consolidate", method: 'post', data: params)
-			json_response = parse_json(response)
-			return json_response['consolidated']
-		end
-		
 		def build_basic_request()
 			params = { 'password' => @password }
 			if !@second_password.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blockchain
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Blockchain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: Blockchain API library (Ruby, v1)
 email:
 - support@blockchain.zendesk.com