bit_wallet 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZGFiM2Y3MGRkNjFjYjY2YzIxZWFhNDc0MzNkODE4ZmM2NjhmMTc2MA==
+  data.tar.gz: !binary |-
+    MTJjZjFhZjVjNjk3MTVkNGQ2MDQ1MjYzYzRiMjRkNWQzNTZkZDFiMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTIxMjJkNzFiYjllYWVmNDMyYThmYzU5NjVjYWE0NWI0M2IyYWJjZmVmZTgw
+    YTEzMDY2NzQ2ODgwMDRjODRhNTk5YmNiZDM5MjU2ZDY2MzQ3OWQ0YjZkMDQy
+    MWM0MWIzMTAyMDg3MzlkNDdmOWRhYzg4Y2Y0MjYxMzBiZmZmZDA=
+  data.tar.gz: !binary |-
+    NDE3YTI0YTFhZDM5ZWZjZmE2N2YyMTU3ZGI3N2NkM2RkNTVkZWU3NmE5Yjg1
+    MmIwNDg3ZDA3YmQ0OWY3MDMwNTgxYmU3N2NkNGNjZDNjZjg5YzMzYTRkZDcx
+    YWY5MzUzNzIwMWRjMTM2ZjBiMGVlZGY5ZGE4ZTQ4ODQ2ZmRiMzY=

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p286

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# v0.5.0
+
+- Allow to set the host, and ssl (true/false) of Bitcoin client
+- Remove version constraint on activesupport

data/Gemfile

@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bit_wallet.gemspec
 gemspec
-
-# Override what gem is included until dcd70a686162fad41e5bd4bddc0ee67565227ec6
-# is released in rubygems
-gem('bitcoin-client',
-    git: 'git@github.com:sinisterchipmunk/bitcoin-client.git',
-    ref: 'dcd70a686162fad41e5bd4bddc0ee67565227ec6')

data/README.md

@@ -19,6 +19,8 @@ Or install it yourself as:
 ## Usage
 
     wallet = BitWallet.new(:username => 'username', :password => 'password')
+    # You can also pass :port and :host
+
     wallet.accounts.with_balance # returns array of the accounts with balance > 0
     account = wallet.accounts.new('account name')
     account.addresses.count # 1, as it already comes with an address
@@ -48,6 +50,10 @@ A transaction has the following methods:
 - `occurred_at`: Ruby Time object for the `time` value returned by bitcoind
 - `received_at`: Ruby Time object for the `timereceived` value returned by bitcoind
 
+## Tests
+
+- You must set up bitcoind, and it must be in the executable path. See README.txt in `spec/testnet` as to what version to install.
+
 ## Contributing
 
 1. Fork it

data/bit_wallet.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'bitcoin-client'
-  gem.add_dependency 'activesupport', '~> 3.0'
-  gem.add_development_dependency 'rspec', '2.12.0'
+  gem.add_dependency 'activesupport'
+  gem.add_development_dependency 'rspec', '~> 2.12'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'factory_girl', '4.2.0'
-  gem.add_development_dependency 'bitcoin_testnet', '0.4.0'
-  gem.add_development_dependency 'vcr', '2.4.0'
+  gem.add_development_dependency 'bitcoin_testnet', '0.5.0'
+  gem.add_development_dependency 'vcr', '~> 2.4'
   gem.add_development_dependency 'webmock', '1.9.0'
 end

data/lib/bit_wallet/account.rb

@@ -29,8 +29,8 @@ module BitWallet
                       options[:to],
                       amount,
                       BitWallet.config.min_conf)
-    rescue RestClient::InternalServerError => e
-      parse_error e.response
+    rescue Bitcoin::Errors::RPCError => e
+      parse_error e.message
     end
 
     def total_received
@@ -70,16 +70,8 @@ module BitWallet
 
     private
 
-    def parse_error(response)
-      json_response = JSON.parse(response)
-      hash = json_response.with_indifferent_access
-      error = if hash[:error]
-                case hash[:error][:code]
-                when -6
-                  InsufficientFunds.new("cannot send an amount more than what this account (#{self.name}) has")
-                end
-              end
-      fail error if error
+    def parse_error(message)
+      HandlesError.from(message)
     end
 
   end

data/lib/bit_wallet/errors.rb

@@ -1,4 +1,5 @@
 module BitWallet
   class StandardError < ::StandardError; end
   class InsufficientFunds < StandardError; end
+  class InvalidAmount < StandardError; end
 end

data/lib/bit_wallet/handles_error.rb

@@ -0,0 +1,16 @@
+module BitWallet
+  class HandlesError
+
+    def self.from(message)
+      error = if message.include?("-6")
+        InsufficientFunds.new("cannot send an amount more than what this account has")
+              elsif message.include?("-3")
+                InvalidAmount.new("amount is invalid")
+      else
+        ArgumentError.new("unknown error: #{message}")
+      end
+      fail error if error
+    end
+
+  end
+end

data/lib/bit_wallet/instantiates_bitcoin_client.rb

@@ -0,0 +1,10 @@
+module BitWallet
+  class InstantiatesBitcoinClient
+
+    def self.execute(config)
+      Bitcoin::Client.new(config.fetch(:username),
+                          config.fetch(:password),
+                          config.slice(:host, :port, :ssl))
+    end
+  end
+end

data/lib/bit_wallet/version.rb

@@ -1,3 +1,3 @@
 module BitWallet
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/bit_wallet/wallet.rb

@@ -42,9 +42,7 @@ module BitWallet
     private
 
     def client
-      @client ||= Bitcoin::Client.new(@config[:username],
-                                      @config[:password],
-                                      @config.slice(:port))
+      @client ||= InstantiatesBitcoinClient.execute(@config)
     end
 
   end

data/lib/bit_wallet.rb

@@ -3,6 +3,7 @@ require 'ostruct'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string'
 require 'bitcoin'
 
@@ -13,6 +14,8 @@ require 'bit_wallet/addresses'
 require 'bit_wallet/address'
 require 'bit_wallet/transaction'
 require 'bit_wallet/errors'
+require 'bit_wallet/instantiates_bitcoin_client'
+require 'bit_wallet/handles_error'
 
 module BitWallet
 

data/spec/bit_wallet/account_spec.rb

@@ -87,7 +87,7 @@ describe BitWallet::Account, vcr: true do
         expect {
           default_account.send_amount(default_account.balance+10,
                                       to: nona_address_str)
-        }.to raise_error(BitWallet::InsufficientFunds, "cannot send an amount more than what this account () has")
+        }.to raise_error(BitWallet::InsufficientFunds, "cannot send an amount more than what this account has")
       end
     end
   end

data/spec/bit_wallet/accounts_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe BitWallet::Accounts, vcr: true do
+describe BitWallet::Accounts, vcr: {record: :once} do
 
   let(:wallet) do
     build(:wallet)
@@ -39,10 +39,6 @@ describe BitWallet::Accounts, vcr: true do
       accounts_with_balance.should include(default_account)
       accounts_with_balance.should_not include(account_1)
       accounts_with_balance.should include(account_2)
-
-      account_1.send_amount account_1.balance, to: default_account.addresses.first
-
-      subject.with_balance.should_not include(account_1)
     end
   end
 

data/spec/bit_wallet/handles_error_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+module BitWallet
+  describe HandlesError do
+    describe ".from" do
+      context "error is -3" do
+        it "raises InvalidAmount error" do
+          expect { described_class.from("does not matter -3 meh") }.
+            to raise_error(InvalidAmount, "amount is invalid")
+        end
+      end
+
+      context "error is -6" do
+        it "raises InsufficientFunds error" do
+          expect { described_class.from("-6 message") }.
+            to raise_error(InsufficientFunds, "cannot send an amount more than what this account has")
+        end
+      end
+
+      context "error is unknown" do
+        it "raises an ArgumentError" do
+          expect { described_class.from("-99 I do not know") }.
+            to raise_error(ArgumentError, "unknown error: -99 I do not know")
+        end
+      end
+    end
+  end
+end

data/spec/bit_wallet/instantiates_bitcoin_client_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+module BitWallet
+  describe InstantiatesBitcoinClient, ".execute" do
+
+    context "a hash config with username, password, host, port, ssl" do
+      it "returns a Bitcoin::Client given a hash config" do
+        client = double
+
+        allow(Bitcoin::Client).to receive(:new).
+          with("username", "password", host: "myhost", port: 8288, ssl: false).
+          and_return(client)
+
+        resulting_client = described_class.execute(
+          username: "username",
+          password: "password",
+          host: "myhost",
+          port: 8288,
+          ssl: false
+        )
+
+        expect(resulting_client).to eq(client)
+      end
+    end
+
+  end
+end