bitcoin-money 0.1.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced3834d2b76abe44f4f3655bf2f8e90f1bc4f57
-  data.tar.gz: 0c4462c69d7d83b322e899b1dbc41a732b152e6e
+  metadata.gz: f8c2b56d01646ff8f96d38e4821f611286ecbc4e
+  data.tar.gz: 46b67a5e36c48f977d1a056bcb4a825a78c946b8
 SHA512:
-  metadata.gz: 51e4d7e2990907afc61ddefa87ba0779d9d99b149479a50871034de31ef3af403b86c5f54abaf920fc5a35e42fee5094912d37a4925dc8993eb996e6e9a2b512
-  data.tar.gz: 591f6d80dbaef82dd6473974b0ff811d41c3f8f626bcff264e199c90b17b85e506e773a57d1b162f076e029503acf29638cfdb0c6e16216823f475eab17fdc57
+  metadata.gz: 8f2873c30ecedc1f138f2487e3f7aaf47ce19b954eb0d24e12749a0b5d38cf4ae4b50cd9b22c9e044c1af13dc3c7478400a7cb5456dabe598309c28a86308872
+  data.tar.gz: 26678703f1d216e024df5190648c9b8a0a07988f52511e0d6edb24cd3143e7cb1ed5cddcb322f04f6c10dafaa340e7f2d4c853bd063619d03de7e3696ef8278f

data/README.md

@@ -45,9 +45,9 @@ b.btc # => BigDecimal.new('0.012')
 
 Perform operations.
 ~~~ruby
-a + b # == Bitcoin.new(0.024)
-a * a # == Bitcoin.new(0.000144)
-a / c # == Bitcoin.new(1)
+a + b # == Btc.new(0.024)
+a * a # == Btc.new(0.000144)
+a / c # == Btc.new(1)
 # also ** and -
 ~~~
 

data/bitcoin-money.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "bitcoin-money"
-  spec.version       = "0.1.1"
+  spec.version       = "0.5.0"
   spec.authors       = ["James Larisch"]
   spec.email         = ["root@jameslarisch.com"]
   spec.summary       = "Represent BTC like Money, with nice precision."

data/lib/btc.rb

@@ -1,35 +1,50 @@
 require 'bigdecimal'
 
 class Btc
-  SATOSHI = BigDecimal.new('0.00000001')
-  MBTC = BigDecimal.new('0.0001')
   BTC = BigDecimal.new('1.0')
+  MBTC = BigDecimal.new('0.001')
+  UBTC = BigDecimal.new('0.000001')
+  SATOSHI = BigDecimal.new('0.00000001')
+
+  MIN_BTC = SATOSHI.to_f
+  MIN_MBTC = 0.00001
+  MIN_UBTC = 0.01
+  MIN_SATOSHI = 1
 
   def initialize(amt)
-    raise ArgumentError, 'BTC amount must not be less than 0.00000001' unless Btc.valid_btc(amt)
+    raise ArgumentError, "BTC amount must not be less than #{MIN_BTC}" unless Btc.valid_btc(amt)
     @amt = BigDecimal.new(amt.to_f.to_s)
   end
 
   def self.from_mbtc(amt)
-    raise ArgumentError, 'mBTC amount must not be less than 0.00001' unless Btc.valid_mbtc(amt)
+    raise ArgumentError, "mBTC amount must not be less than #{MIN_MBTC}" unless Btc.valid_mbtc(amt)
     Btc.new(BigDecimal.new(amt.to_f.to_s) * MBTC)
   end
 
+  def self.from_ubtc(amt)
+    raise ArgumentError, "uBTC amount must not be less than #{MIN_UBTC}" unless Btc.valid_ubtc(amt)
+    Btc.new(BigDecimal.new(amt.to_f.to_s) * UBTC)
+  end
+
   def self.from_satoshis(amt)
     raise ArgumentError, 'Satoshi amount must be > 1 or 0' unless Btc.valid_satoshis(amt)
     Btc.new(BigDecimal.new(amt.to_i.to_f.to_s) * SATOSHI)
   end
 
-  def self.valid_satoshis(amt)
-    amt.to_i >= 0
+  def self.valid_btc(amt)
+    amt.to_f >= SATOSHI.to_f || amt.to_f == 0.0
   end
 
   def self.valid_mbtc(amt)
-    amt.to_f >= MBTC.to_f || amt.to_f == 0
+    amt.to_f >= MIN_MBTC || amt.to_f == 0.0
   end
 
-  def self.valid_btc(amt)
-    amt.to_f >= SATOSHI.to_f || amt.to_f == 0
+  def self.valid_ubtc(amt)
+    amt.to_f >= MIN_UBTC || amt.to_f == 0.0
+  end
+
+  def self.valid_satoshis(amt)
+    amt.to_i >= 0
   end
 
   def btc
@@ -40,6 +55,10 @@ class Btc
     @amt / MBTC
   end
 
+  def ubtc
+    @amt / UBTC
+  end
+
   def satoshis
     @amt / SATOSHI
   end
@@ -69,6 +88,6 @@ class Btc
   end
 
   def inspect
-    "#<Btc BTC:#{btc} mBTC:#{mbtc} Satoshis:#{satoshis}>"
+    "#<Btc BTC:#{btc.to_f} mBTC:#{mbtc.to_f} uBTC:#{ubtc.to_f} Satoshis:#{satoshis.to_f}>"
   end
 end

data/spec/btc_spec.rb

@@ -2,21 +2,33 @@ require 'btc'
 
 describe Btc do
 
-  it 'should initialize okay' do
-    b = Btc.new(12345)
-    expect(b.btc).to eq(BigDecimal.new('12345.0'))
+  describe '#new' do
+    it 'should initialize okay' do
+      b = Btc.new(12345)
+      expect(b.btc).to eq(BigDecimal.new('12345.0'))
+    end
+
+    it 'should throw error if invalid btc amount' do
+      expect{ Btc.new(0.00000000000001) }.to raise_error(ArgumentError)
+    end
   end
 
-  it 'should throw error if invalid btc amount' do
-    expect{ Btc.new(0.00000000000001) }.to raise_error(ArgumentError)
+  describe '.from_mbtc' do
+    it 'should throw error if invalid mbtc amount' do
+      expect{ Btc.from_mbtc(Btc::SATOSHI) }.to raise_error(ArgumentError)
+    end
   end
 
-  it 'should throw error if invalid mbtc amount' do
-    expect{ Btc.from_mbtc(Btc::SATOSHI) }.to raise_error(ArgumentError)
+  describe '.from_ubtc' do
+    it 'should throw error if invalid ubtc amount' do
+      expect{ Btc.from_ubtc(Btc::MIN_UBTC - 10) }.to raise_error(ArgumentError)
+    end
   end
 
-  it 'should throw error if invalid satoshi amount' do
-    expect{ Btc.from_satoshis(-1) }.to raise_error(ArgumentError)
+  describe '.from_satoshis' do
+    it 'should throw error if invalid satoshi amount' do
+      expect{ Btc.from_satoshis(-1) }.to raise_error(ArgumentError)
+    end
   end
 
   it 'should convert btc to mbtc and back' do
@@ -30,14 +42,19 @@ describe Btc do
   end
 
   it 'should convert mbtc to satoshis and back' do
-    expect(Btc.from_mbtc(1).satoshis).to eq(BigDecimal.new('10000'))
-    expect(Btc.from_satoshis(1000).mbtc).to eq(BigDecimal.new('0.1'))
+    expect(Btc.from_mbtc(1).satoshis).to eq(BigDecimal.new('100000'))
+    expect(Btc.from_satoshis(10000).mbtc).to eq(BigDecimal.new('0.1'))
+  end
+
+  it 'should convert btc to ubtc and back' do
+    expect(Btc.new(1).ubtc).to eq(BigDecimal.new('1000000'))
+    expect(Btc.from_ubtc(12).btc).to eq(BigDecimal('.000012'))
   end
 
   it 'should use equality correctly' do
-    expect(Btc.new(0.1234)).to eq(Btc.from_mbtc(1234))
-    expect(Btc.new(0.1234)).to eq(Btc.from_satoshis(12340000))
-    expect(Btc.from_mbtc(12)).to eq(Btc.from_satoshis(120000))
+    expect(Btc.new(0.123)).to eq(Btc.from_mbtc(123))
+    expect(Btc.new(0.123)).to eq(Btc.from_satoshis(12300000))
+    expect(Btc.from_mbtc(12)).to eq(Btc.from_satoshis(1200000))
   end
 
   it 'should use multiplication correctly' do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin-money
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Larisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Represent BTC like Money, with nice precision.
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -63,12 +63,12 @@ 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: []