bitbank 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,10 +1,14 @@
-### EDGE
+### 0.1.1 / 2011-07-11
+
+* Added direct account lookup
+* Added ability to move / transfer funds between accounts
+
+### 0.1.0 / 2011-07-04
 
 * get_work specifications added
 * block_number
 * connection_count
 
-
 ### 0.0.1 / 2011-06-13
 
 * Initial release

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bitbank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bitbank}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Plante"]
-  s.date = %q{2011-07-04}
+  s.date = %q{2011-07-11}
   s.description = %q{Easy to use Ruby interface to the Bitcoind JSON-RPC API}
   s.email = %q{nap@zerosum.org}
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "spec/client_spec.rb",
     "spec/fixtures/vcr_cassettes/account/address.yml",
     "spec/fixtures/vcr_cassettes/account/balance.yml",
+    "spec/fixtures/vcr_cassettes/account/move.yml",
     "spec/fixtures/vcr_cassettes/account/new_address.yml",
     "spec/fixtures/vcr_cassettes/account/pay.yml",
     "spec/fixtures/vcr_cassettes/account/transactions.yml",

data/lib/bitbank/account.rb

@@ -1,32 +1,59 @@
 module Bitbank
   class Account
-    attr_reader :name, :balance
+    attr_reader :name
 
-    def initialize(client, name, balance=nil)
+    def initialize(client, name, balance=nil, check=false)
       @client = client
       @name = name
-      @balance = balance
+      @balance = balance # currently unused
+
+      # validate the address if a check is requested
+      # (bitcoind creates it if it didn't previous exist)
+      address if check
     end
 
+    # Returns the current bitcoin address for receiving payments to this
+    # account.
     def address
       @client.request('getaccountaddress', name)
     end
 
+    # Returns the balance in this account.
     def balance
       @client.balance(name)
     end
 
+    # Move funds from one account in your wallet to another.
+    # First parameter can either by an account name or an actual account
+    # object.
+    def move(name_or_account, amount)
+      to_name = if name_or_account.is_a?(Bitbank::Account)
+        name_or_account.name
+      else
+        name_or_account
+      end
+
+      @client.request('move', name, to_name, amount)
+    end
+
+    alias :transfer :move
+
+    # Returns a new bitcoin address for receiving payments to this account.
     def new_address
       @client.new_address(name)
     end
 
+    # Send funds from this account to the recipient identified by +address+.
+    # Note that +amount+ is a real and is rounded to 8 decimal places.
+    # Returns the transaction if successful.
     def pay(address, amount)
       txid = @client.request('sendfrom', name, address, amount)
       Transaction.new(@client, txid)
     end
 
-    def transactions
-      @client.transactions(name)
+    # Returns a list of the most recent transactions for this account.
+    def transactions(count = 10)
+      @client.transactions(name, count)
     end
 
     def ==(other)

data/lib/bitbank/client.rb

@@ -6,15 +6,21 @@ module Bitbank
                   "@#{config[:host]}:#{config[:port]}"
     end
 
+    # Retrieve a particular named account.
+    def account(name)
+      Bitbank::Account.new(self, name, nil, true)
+    end
+
     # Returns a list of local accounts.
     def accounts
       account_data = request('listaccounts')
       account_data.map do |account_name, account_value|
-        Account.new(self, account_name, account_value)
+        Account.new(self, account_name, account_value, false)
       end
     end
 
-    # If an account is not specified, returns the server's total available balance.
+    # If an account is not specified, returns the server's total available
+    # balance.
     #
     # If an account is specified, returns the balance in the account.
     def balance(account_name=nil)
@@ -36,15 +42,16 @@ module Bitbank
       request('getconnectioncount')
     end
 
-    # Returns the proof-of-work difficulty as a multiple of the minimum difficulty.
+    # Returns the proof-of-work difficulty as a multiple of the minimum
+    # difficulty.
     def difficulty
       request('getdifficulty')
     end
 
     # If data is not specified, returns formatted hash data to work on.
     #
-    # If data is specified, bitcoind will try to solve the block and will return
-    # true or false indicating whether or not it was successful.
+    # If data is specified, bitcoind will try to solve the block and will
+    # return true or false indicating whether or not it was successful.
     def get_work(data=nil)
       request('getwork', data)
     end
@@ -54,10 +61,17 @@ module Bitbank
       request('getinfo')
     end
 
+    # Returns a new bitcoin account for receiving payments (along with a new
+    # address).
+    def new_account(name)
+      account(name)
+    end
+
     # Returns a new bitcoin address for receiving payments.
     #
     # If an account is specified (recommended), the new address is added to the
-    # address book so payments received with the address are credited to the account.
+    # address book so payments received with the address are credited to the
+    # account.
     def new_address(account_name=nil)
       request('getnewaddress', account_name)
     end

data/spec/account_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Bitbank::Account" do
   before(:each) do
     @client = Bitbank.new(File.join(File.dirname(__FILE__), '..', 'config.yml'))
-    @account = Bitbank::Account.new(@client, 'adent', 0.02)
+    @account = Bitbank::Account.new(@client, 'adent')
   end
 
   it 'should have a name' do
@@ -16,6 +16,11 @@ describe "Bitbank::Account" do
     it 'should retrieve the address for this account' do
       @account.address.should == '1NqwGDRi9Gs4xm1BmPnGeMwgz1CowP6CeQ'
     end
+
+    it 'should be validated on account creation if a check was requested (default)' do
+      Bitbank::Account.any_instance.expects(:address)
+      Bitbank::Account.new(@client, 'trill', nil, true)
+    end
   end
 
   describe 'balance' do
@@ -26,6 +31,24 @@ describe "Bitbank::Account" do
     end
   end
 
+  describe 'move' do
+    use_vcr_cassette 'account/move'
+
+    before(:each) do
+      @to_account = Bitbank::Account.new(@client, 'prefect')
+    end
+
+    it 'should move funds between accounts using an account name' do
+      @account.move('prefect', 0.01).should be_true
+      @to_account.balance.should == 0.01
+    end
+
+    it 'should move funds between accounts using an account object' do
+      @account.move(@to_account, 0.01).should be_true
+      @to_account.balance.should == 0.01
+    end
+  end
+
   describe 'new_address' do
     use_vcr_cassette 'account/new_address'
 

data/spec/client_spec.rb

@@ -22,6 +22,13 @@ describe "Bitbank::Client" do
     end
   end
 
+  describe 'account' do
+    it 'should retrieve a named account' do
+      Bitbank::Account.any_instance.expects(:address).returns(true) # check
+      @client.account('newaccount').should == Bitbank::Account.new(@client, 'newaccount')
+    end
+  end
+
   describe 'accounts' do
     use_vcr_cassette 'client/accounts'
 
@@ -133,8 +140,15 @@ describe "Bitbank::Client" do
     end
   end
 
+  describe 'new_account' do
+    it 'should create a new account and a new address' do
+      Bitbank::Account.any_instance.expects(:address).returns(true) # check
+      @client.new_account('newname').should == Bitbank::Account.new(@client, 'newname')
+    end
+  end
+
   describe 'new_address' do
-    use_vcr_cassette 'client/new_address', :record => :new_episodes
+    use_vcr_cassette 'client/new_address'
 
     it 'should create a new address and return it' do
       @client.new_address.should == '1EzxbYD4rFvZBjUEbtnKZ9KJdrqHB7mkZE'

data/spec/fixtures/vcr_cassettes/account/move.yml

@@ -0,0 +1,59 @@
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"move","params":["adent","prefect",0.01]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '66'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 14:40:40 +0000
+      content-length:
+      - '44'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":true,"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
+    method: :post
+    uri: http://testuser:testpass@localhost:8332/
+    body: ! '{"id":"jsonrpc","method":"getbalance","params":["prefect"]}'
+    headers:
+      accept:
+      - ! '*/*; q=0.5, application/xml'
+      accept-encoding:
+      - gzip, deflate
+      content-length:
+      - '59'
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
+      code: 200
+      message: OK
+    headers:
+      date:
+      - Mon, 11 Jul 2011 14:40:40 +0000
+      content-length:
+      - '50'
+      content-type:
+      - application/json
+      server:
+      - bitcoin-json-rpc/0.3.21-beta
+    body: ! '{"result":0.01000000,"error":null,"id":"jsonrpc"}
+
+'
+    http_version: '1.1'

data/spec/fixtures/vcr_cassettes/client/new_address.yml

@@ -17,7 +17,7 @@
       message: OK
     headers:
       date:
-      - Mon, 13 Jun 2011 04:36:13 +0000
+      - Mon, 11 Jul 2011 15:06:23 +0000
       content-length:
       - '76'
       content-type:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitbank
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-04 00:00:00.000000000 -04:00
+date: 2011-07-11 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2156491140 !ruby/object:Gem::Requirement
+  requirement: &2156535100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156491140
+  version_requirements: *2156535100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156490540 !ruby/object:Gem::Requirement
+  requirement: &2156533820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2156490540
+  version_requirements: *2156533820
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156489940 !ruby/object:Gem::Requirement
+  requirement: &2156532820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156489940
+  version_requirements: *2156532820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156489380 !ruby/object:Gem::Requirement
+  requirement: &2156531960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156489380
+  version_requirements: *2156531960
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156488760 !ruby/object:Gem::Requirement
+  requirement: &2156530920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156488760
+  version_requirements: *2156530920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156488240 !ruby/object:Gem::Requirement
+  requirement: &2156529420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156488240
+  version_requirements: *2156529420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156487640 !ruby/object:Gem::Requirement
+  requirement: &2156527580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *2156487640
+  version_requirements: *2156527580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2156487020 !ruby/object:Gem::Requirement
+  requirement: &2156526680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156487020
+  version_requirements: *2156526680
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2156486420 !ruby/object:Gem::Requirement
+  requirement: &2156525400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 1.10.0
   type: :development
   prerelease: false
-  version_requirements: *2156486420
+  version_requirements: *2156525400
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156485820 !ruby/object:Gem::Requirement
+  requirement: &2156524120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2156485820
+  version_requirements: *2156524120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156485220 !ruby/object:Gem::Requirement
+  requirement: &2156522940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156485220
+  version_requirements: *2156522940
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &2156484580 !ruby/object:Gem::Requirement
+  requirement: &2156521480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *2156484580
+  version_requirements: *2156521480
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2156483980 !ruby/object:Gem::Requirement
+  requirement: &2156520680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: 4.4.6
   type: :development
   prerelease: false
-  version_requirements: *2156483980
+  version_requirements: *2156520680
 description: Easy to use Ruby interface to the Bitcoind JSON-RPC API
 email: nap@zerosum.org
 executables: []
@@ -184,6 +184,7 @@ files:
 - spec/client_spec.rb
 - spec/fixtures/vcr_cassettes/account/address.yml
 - spec/fixtures/vcr_cassettes/account/balance.yml
+- spec/fixtures/vcr_cassettes/account/move.yml
 - spec/fixtures/vcr_cassettes/account/new_address.yml
 - spec/fixtures/vcr_cassettes/account/pay.yml
 - spec/fixtures/vcr_cassettes/account/transactions.yml
@@ -221,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2105660465701470600
+      hash: -404184776927923942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: