bitcoin_active_record 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d85004edd0e6c8f4afb2d16048160b52ca64eca1
-  data.tar.gz: fb52ffaedf41521b369f369ad029582afe7f2421
+  metadata.gz: 209f93b703bd8f1e18fb444af7cf2946fe0cca2b
+  data.tar.gz: 28fae90950ef7feba274d8694c70828d4175e2a2
 SHA512:
-  metadata.gz: 7eda7034c8fd306f05d6d2bb48e90d216f9b08b73514f098bccc2b1b9688d306f7a665543a7d1ea7b06f256d1be7ff4b9a17b241de1f3fc8797a21a4ec718320
-  data.tar.gz: 3f0a7968539441466ec1e2bd41bda7a95bc66fa9cd083dc58b400e46bfc0421e3eec3afbc43016bda79c703e873c48e73337872618f3c044f12b27d4738d12f1
+  metadata.gz: a0594a50dd7ed631e2e48bd9d909331e5c7dc18e8039821031820f9d78869db8935dbcab919755eb5792f3d2cf99ef93f481492b135c5e26a1e825b7ab6c0f0a
+  data.tar.gz: dd1b31153534e7f1e53ea9e459101de9ed2600f231f9c426c154f9ef0bc07a87c19fb84603022cf31c7a389dfc46f281f6b7b37223b0ea1e14c9f7600afe9007

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitcoin_active_record (0.0.2)
+    bitcoin_active_record (0.1.0)
       auto_strip_attributes (>= 2.0.4)
       httparty (>= 0.13.1)
       script_utils (= 0.0.3)

data/README.md

@@ -25,8 +25,8 @@ client = BitcoinActiveRecord::Client.new(
   },
 )
 ```
-* Run client.create_received_payments to create records of received payments
-* Run client.pay(public_key: public_key, amount: BigDecimal.new(1), comment: 'hello') to send a payment and save a record of it in the database
+* Run client.create_received_bitcoin_transactions to create records of received transactions
+* Run client.pay(public_key: public_key, amount: BigDecimal.new(1), comment: 'hello') to send a transaction and save a record of it in the database
 
 ## Usage
 
@@ -38,7 +38,7 @@ column_name | type | description
 --- | --- | ---
 public_key | string | public key of a bitcoin address
 
-payment.rb
+bitcoin_transaction.rb
 
 column_name | type | description
 --- | --- | ---
@@ -46,20 +46,20 @@ btc_address_id | integer | foreign key
 amount | decimal | transaction amount
 txid | string | bitcoin transaction id
 
-received_payment.rb  
+received_bitcoin_transaction.rb  
 
 column_name | type | description
 --- | --- | ---
-payment_id | integer | The btc address associated with this payment id is the address of the person who sent the payment
-btc_address_id | integer | This is the address in your wallet that the payment was sent to
+bitcoin_transaction_id | integer | The btc address associated with this bitcoin transaction id is the address of the person who sent the transaction
+btc_address_id | integer | This is the address in your wallet that the transaction was sent to
 
-sent_payment.rb  
+sent_bitcoin_transaction.rb  
 
 column_name | type | description
 --- | --- | ---
-payment_id | integer | foreign key
+bitcoin_transaction_id | integer | foreign key
 
-Sent payments are only recorded if you send them using the gem's api.
+Sent transactions are only recorded if you send them using the gem's api.
 
 ### BitcoinActiveRecord::Client
 
@@ -73,7 +73,7 @@ client = BitcoinActiveRecord::Client.new(
     username: '',
     password: '',
   },
-  # optional, amounts less than this will be ignored when running create_received_payments
+  # optional, amounts less than this will be ignored when running create_received_bitcoin_transactions
   minimum_amount: BigDecimal.new('0.001'),
   # optional, the wallet account you want to look for received transactions in
   account: :foo,
@@ -99,7 +99,7 @@ Get the public key of the transaction sender for a transaction with id txid
 
 * client.pay
 
-Pay someone and save a record of it as a SentPayment
+Pay someone and save a record of it as a SentBitcoinTransaction
 
 ```ruby
 client.pay(
@@ -109,13 +109,13 @@ client.pay(
   amount: BigDecimal.new('1.23'),
   # optional, transaction comment
   comment: 'foo',
-) do |sent_payment|
+) do |sent_bitcoin_transaction|
   # adding a block is optional
-  # modify the sent_payment record before it gets saved
-  sent_payment.custom_attribute = 'foo'
+  # modify the sent_bitcoin_transaction record before it gets saved
+  sent_bitcoin_transaction.custom_attribute = 'foo'
 end
 ```
 
-* client.create_received_payments
+* client.create_received_bitcoin_transactions
 
-Create a ReceivedPayment model for every transaction from client.account that's >= client.minimum_amount. If the latest transaction is already in the database it will assume all earlier transactions have already been saved.
+Create a ReceivedBitcoinTransaction model for every transaction from client.account that's >= client.minimum_amount. If the latest transaction is already in the database it will assume all earlier transactions have already been saved.

data/bitcoin_active_record.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'bitcoin_active_record'
-  gem.version = '0.0.2'
+  gem.version = '0.1.0'
   gem.summary = 'bitcoin activerecord integration'
   gem.author = 'Lihan Li'
   gem.email = 'frankieteardrop@gmail.com'

data/lib/bitcoin_active_record/client.rb

@@ -57,21 +57,21 @@ module BitcoinActiveRecord
     def pay(public_key: raise('public key required'), amount: raise('amount required'), comment: '')
       raise('amount cant be zero or negative') unless amount > 0
 
-      sent_payment = SentPayment.new(
-        payment: Payment.new(
+      sent_bitcoin_transaction = SentBitcoinTransaction.new(
+        bitcoin_transaction: BitcoinTransaction.new(
           btc_address: BtcAddress.find_or_initialize_by(public_key: public_key),
           amount: amount,
           txid: request(:sendtoaddress, public_key, amount, comment),
         ),
       )
-      yield(sent_payment) if block_given?
+      yield(sent_bitcoin_transaction) if block_given?
 
-      sent_payment.save!
+      sent_bitcoin_transaction.save!
 
-      sent_payment
+      sent_bitcoin_transaction
     end
 
-    def create_received_payments
+    def create_received_bitcoin_transactions
       page = 0
 
       while true
@@ -80,14 +80,14 @@ module BitcoinActiveRecord
 
         transactions.each do |transaction|
           txid = transaction['txid']
-          # already created payment for this transaction and all older ones
-          return if Payment.where(txid: txid).count > 0
+          # already created record for this transaction and all older ones
+          return if BitcoinTransaction.where(txid: txid).count > 0
 
           amount = transaction['amount']
           from_key = get_sender_address(txid)
 
-          received_payment = ReceivedPayment.create!(
-            payment: Payment.new(
+          received_bitcoin_transaction = ReceivedBitcoinTransaction.create!(
+            bitcoin_transaction: BitcoinTransaction.new(
               # payment from this address
               btc_address: BtcAddress.find_or_initialize_by(
                 public_key: from_key
@@ -99,7 +99,7 @@ module BitcoinActiveRecord
             btc_address: BtcAddress.find_or_initialize_by(public_key: transaction['address']),
           )
 
-          puts("Received payment #{amount} BTC from #{from_key}: #{received_payment.inspect}")
+          puts("Received transaction #{amount} BTC from #{from_key}: #{received_bitcoin_transaction.inspect}")
         end
 
         page += 1

data/lib/bitcoin_active_record/models/bitcoin_transaction.rb

@@ -0,0 +1,18 @@
+module BitcoinActiveRecord::Models::BitcoinTransaction
+  extend ActiveSupport::Concern
+
+  included do
+    # sender's address for received transactions
+    # payee address for sent transactions
+    belongs_to(:btc_address, inverse_of: :bitcoin_transactions)
+
+    has_one(:received_bitcoin_transaction, inverse_of: :bitcoin_transaction)
+    has_one(:sent_bitcoin_transaction, inverse_of: :bitcoin_transaction)
+
+    validates(:txid, :btc_address, :amount, presence: true)
+    validates(:amount, numericality: { greater_than_or_equal_to: 0 })
+    validates(:txid, uniqueness: true)
+
+    auto_strip_attributes(:txid)
+  end
+end

data/lib/bitcoin_active_record/models/btc_address.rb

@@ -2,8 +2,8 @@ module BitcoinActiveRecord::Models::BtcAddress
   extend ActiveSupport::Concern
 
   included do
-    has_many(:payments, inverse_of: :btc_address)
-    has_many(:received_payments, inverse_of: :btc_address)
+    has_many(:bitcoin_transactions, inverse_of: :btc_address)
+    has_many(:received_bitcoin_transactions, inverse_of: :btc_address)
 
     validates(:public_key, presence: true, uniqueness: { case_sensitive: true })
 

data/lib/bitcoin_active_record/models/received_bitcoin_transaction.rb

@@ -0,0 +1,11 @@
+module BitcoinActiveRecord::Models::ReceivedBitcoinTransaction
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to(:bitcoin_transaction, inverse_of: :received_bitcoin_transaction, dependent: :destroy)
+    belongs_to(:btc_address, inverse_of: :received_bitcoin_transactions) # payment to this address
+
+    validates(:bitcoin_transaction, presence: true)
+    validates(:bitcoin_transaction_id, uniqueness: true)
+  end
+end

data/lib/bitcoin_active_record/models/sent_bitcoin_transaction.rb

@@ -0,0 +1,10 @@
+module BitcoinActiveRecord::Models::SentBitcoinTransaction
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to(:bitcoin_transaction, inverse_of: :sent_bitcoin_transaction, dependent: :destroy)
+
+    validates(:bitcoin_transaction, presence: true)
+    validates(:bitcoin_transaction_id, uniqueness: true)
+  end
+end

data/lib/generators/templates/create_bitcoin_active_record_models.rb

@@ -1,13 +1,13 @@
 class CreateBitcoinActiveRecordModels < ActiveRecord::Migration
   def change
-    create_table "payments" do |t|
+    create_table "bitcoin_transactions" do |t|
       t.integer "btc_address_id", null: false
       t.decimal "amount",         null: false
       t.string  "txid",           null: false
       t.timestamps
     end
-    add_index "payments", ["btc_address_id"]
-    add_index "payments", ["txid"], unique: true
+    add_index "bitcoin_transactions", ["btc_address_id"]
+    add_index "bitcoin_transactions", ["txid"], unique: true
 
     create_table "btc_addresses" do |t|
       t.string  "public_key", null: false
@@ -15,18 +15,18 @@ class CreateBitcoinActiveRecordModels < ActiveRecord::Migration
     end
     add_index "btc_addresses", ["public_key"], unique: true
 
-    create_table "received_payments" do |t|
-      t.integer "payment_id", null: false
+    create_table "received_bitcoin_transactions" do |t|
+      t.integer "bitcoin_transaction_id", null: false
       t.integer "btc_address_id", null: false
       t.timestamps
     end
-    add_index "received_payments", ["payment_id"], unique: true
-    add_index :received_payments, :btc_address_id
+    add_index :received_bitcoin_transactions, :bitcoin_transaction_id, unique: true
+    add_index :received_bitcoin_transactions, :btc_address_id
 
-    create_table "sent_payments" do |t|
-      t.integer "payment_id", null: false
+    create_table "sent_bitcoin_transactions" do |t|
+      t.integer "bitcoin_transaction_id", null: false
       t.timestamps
     end
-    add_index "sent_payments", ["payment_id"], unique: true
+    add_index "sent_bitcoin_transactions", ["bitcoin_transaction_id"], unique: true
   end
 end

data/lib/generators/templates/models/bitcoin_transaction.rb

@@ -0,0 +1,3 @@
+class BitcoinTransaction < ActiveRecord::Base
+  bitcoin_active_record_model
+end

data/lib/generators/templates/models/received_bitcoin_transaction.rb

@@ -0,0 +1,3 @@
+class ReceivedBitcoinTransaction < ActiveRecord::Base
+  bitcoin_active_record_model
+end

data/lib/generators/templates/models/sent_bitcoin_transaction.rb

@@ -0,0 +1,3 @@
+class SentBitcoinTransaction < ActiveRecord::Base
+  bitcoin_active_record_model
+end

data/test/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    bitcoin_active_record (0.0.1)
+    bitcoin_active_record (0.1.0)
       auto_strip_attributes (>= 2.0.4)
       httparty (>= 0.13.1)
       script_utils (= 0.0.3)

data/test/app/models/bitcoin_transaction.rb

@@ -0,0 +1,3 @@
+class BitcoinTransaction < ActiveRecord::Base
+  bitcoin_active_record_model
+end

data/test/app/models/received_bitcoin_transaction.rb

@@ -0,0 +1,3 @@
+class ReceivedBitcoinTransaction < ActiveRecord::Base
+  bitcoin_active_record_model
+end

data/test/app/models/sent_bitcoin_transaction.rb

@@ -0,0 +1,3 @@
+class SentBitcoinTransaction < ActiveRecord::Base
+  bitcoin_active_record_model
+end

data/test/db/migrate/20150429175618_create_bitcoin_active_record_models.rb

@@ -0,0 +1,32 @@
+class CreateBitcoinActiveRecordModels < ActiveRecord::Migration
+  def change
+    create_table "bitcoin_transactions" do |t|
+      t.integer "btc_address_id", null: false
+      t.decimal "amount",         null: false
+      t.string  "txid",           null: false
+      t.timestamps
+    end
+    add_index "bitcoin_transactions", ["btc_address_id"]
+    add_index "bitcoin_transactions", ["txid"], unique: true
+
+    create_table "btc_addresses" do |t|
+      t.string  "public_key", null: false
+      t.timestamps
+    end
+    add_index "btc_addresses", ["public_key"], unique: true
+
+    create_table "received_bitcoin_transactions" do |t|
+      t.integer "bitcoin_transaction_id", null: false
+      t.integer "btc_address_id", null: false
+      t.timestamps
+    end
+    add_index :received_bitcoin_transactions, :bitcoin_transaction_id, unique: true
+    add_index :received_bitcoin_transactions, :btc_address_id
+
+    create_table "sent_bitcoin_transactions" do |t|
+      t.integer "bitcoin_transaction_id", null: false
+      t.timestamps
+    end
+    add_index "sent_bitcoin_transactions", ["bitcoin_transaction_id"], unique: true
+  end
+end

data/test/db/schema.rb

@@ -11,43 +11,43 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150425185338) do
+ActiveRecord::Schema.define(version: 20150429175618) do
 
-  create_table "btc_addresses", force: :cascade do |t|
-    t.string   "public_key", null: false
+  create_table "bitcoin_transactions", force: :cascade do |t|
+    t.integer  "btc_address_id", null: false
+    t.decimal  "amount",         null: false
+    t.string   "txid",           null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "btc_addresses", ["public_key"], name: "index_btc_addresses_on_public_key", unique: true
+  add_index "bitcoin_transactions", ["btc_address_id"], name: "index_bitcoin_transactions_on_btc_address_id"
+  add_index "bitcoin_transactions", ["txid"], name: "index_bitcoin_transactions_on_txid", unique: true
 
-  create_table "payments", force: :cascade do |t|
-    t.integer  "btc_address_id", null: false
-    t.decimal  "amount",         null: false
-    t.string   "txid",           null: false
+  create_table "btc_addresses", force: :cascade do |t|
+    t.string   "public_key", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "payments", ["btc_address_id"], name: "index_payments_on_btc_address_id"
-  add_index "payments", ["txid"], name: "index_payments_on_txid", unique: true
+  add_index "btc_addresses", ["public_key"], name: "index_btc_addresses_on_public_key", unique: true
 
-  create_table "received_payments", force: :cascade do |t|
-    t.integer  "payment_id",     null: false
-    t.integer  "btc_address_id", null: false
+  create_table "received_bitcoin_transactions", force: :cascade do |t|
+    t.integer  "bitcoin_transaction_id", null: false
+    t.integer  "btc_address_id",         null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "received_payments", ["btc_address_id"], name: "index_received_payments_on_btc_address_id"
-  add_index "received_payments", ["payment_id"], name: "index_received_payments_on_payment_id", unique: true
+  add_index "received_bitcoin_transactions", ["bitcoin_transaction_id"], name: "index_received_bitcoin_transactions_on_bitcoin_transaction_id", unique: true
+  add_index "received_bitcoin_transactions", ["btc_address_id"], name: "index_received_bitcoin_transactions_on_btc_address_id"
 
-  create_table "sent_payments", force: :cascade do |t|
-    t.integer  "payment_id", null: false
+  create_table "sent_bitcoin_transactions", force: :cascade do |t|
+    t.integer  "bitcoin_transaction_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "sent_payments", ["payment_id"], name: "index_sent_payments_on_payment_id", unique: true
+  add_index "sent_bitcoin_transactions", ["bitcoin_transaction_id"], name: "index_sent_bitcoin_transactions_on_bitcoin_transaction_id", unique: true
 
 end

data/test/test/integration/bitcoin_payments/client_test.rb

@@ -22,13 +22,13 @@ class BitcoinActiveRecordClientTest < ActiveSupport::TestCase
     @client.instance_variable_set(:@default_transaction_count, count)
   end
 
-  def test_create_received_payments
+  def test_create_received_bitcoin_transactions
     set_default_transaction_count(2)
     @client.account = :test
 
-    @client.create_received_payments
-    received_payments = ReceivedPayment.all.to_a
-    assert_equal(3, received_payments.size)
+    @client.create_received_bitcoin_transactions
+    received_bitcoin_transactions = ReceivedBitcoinTransaction.all.to_a
+    assert_equal(3, received_bitcoin_transactions.size)
 
     [
       {
@@ -50,18 +50,18 @@ class BitcoinActiveRecordClientTest < ActiveSupport::TestCase
         receiver_key: '1AC8jNajH7zYikxRzRKT3otNW72B9qVDFa',
       },
     ].each_with_index do |expected_values, i|
-      received_payment = received_payments[i]
-      payment = received_payment.payment
+      received_bitcoin_transaction = received_bitcoin_transactions[i]
+      bitcoin_transaction = received_bitcoin_transaction.bitcoin_transaction
 
-      assert_equal(expected_values[:sender_key], payment.btc_address.public_key)
-      assert_equal(BigDecimal.new(expected_values[:amount]), payment.amount)
-      assert_equal(expected_values[:txid], payment.txid)
-      assert_equal(expected_values[:receiver_key], received_payment.btc_address.public_key)
+      assert_equal(expected_values[:sender_key], bitcoin_transaction.btc_address.public_key)
+      assert_equal(BigDecimal.new(expected_values[:amount]), bitcoin_transaction.amount)
+      assert_equal(expected_values[:txid], bitcoin_transaction.txid)
+      assert_equal(expected_values[:receiver_key], received_bitcoin_transaction.btc_address.public_key)
     end
 
     # running again shouldnt do anything
-    @client.create_received_payments
-    assert_equal(3, ReceivedPayment.count)
+    @client.create_received_bitcoin_transactions
+    assert_equal(3, ReceivedBitcoinTransaction.count)
   end
 
   def test_get_received_transactions
@@ -104,15 +104,15 @@ class BitcoinActiveRecordClientTest < ActiveSupport::TestCase
     txid = 'kjdksfjlk2323'
     @client.expects(:request).with(:sendtoaddress, public_key, amount, comment).returns(txid)
 
-    sent_payment = @client.pay(public_key: public_key, amount: amount, comment: comment) do |sent_payment|
-      assert_equal(false, sent_payment.persisted?)
+    sent_bitcoin_transaction = @client.pay(public_key: public_key, amount: amount, comment: comment) do |sent_bitcoin_transaction|
+      assert_equal(false, sent_bitcoin_transaction.persisted?)
     end
 
-    payment = sent_payment.payment
+    bitcoin_transaction = sent_bitcoin_transaction.bitcoin_transaction
 
-    assert_equal(true, sent_payment.persisted?)
-    assert_equal(public_key, payment.btc_address.public_key)
-    assert_equal(amount, payment.amount)
-    assert_equal(txid, payment.txid)
+    assert_equal(true, sent_bitcoin_transaction.persisted?)
+    assert_equal(public_key, bitcoin_transaction.btc_address.public_key)
+    assert_equal(amount, bitcoin_transaction.amount)
+    assert_equal(txid, bitcoin_transaction.txid)
   end
 end

data/test/test/integration/bitcoin_payments/generators_test.rb

@@ -18,11 +18,11 @@ class BitcoinActiveRecordGeneratorsTest < ActiveSupport::TestCase
 
   def test_install_generator
     lambda do
-      migration_file_text = "class CreateBitcoinActiveRecordModels < ActiveRecord::Migration\n  def change\n    create_table \"payments\" do |t|\n      t.integer \"btc_address_id\", null: false\n      t.decimal \"amount\",         null: false\n      t.string  \"txid\",           null: false\n      t.timestamps\n    end\n    add_index \"payments\", [\"btc_address_id\"]\n    add_index \"payments\", [\"txid\"], unique: true\n\n    create_table \"btc_addresses\" do |t|\n      t.string  \"public_key\", null: false\n      t.timestamps\n    end\n    add_index \"btc_addresses\", [\"public_key\"], unique: true\n\n    create_table \"received_payments\" do |t|\n      t.integer \"payment_id\", null: false\n      t.integer \"btc_address_id\", null: false\n      t.timestamps\n    end\n    add_index \"received_payments\", [\"payment_id\"], unique: true\n    add_index :received_payments, :btc_address_id\n\n    create_table \"sent_payments\" do |t|\n      t.integer \"payment_id\", null: false\n      t.timestamps\n    end\n    add_index \"sent_payments\", [\"payment_id\"], unique: true\n  end\nend\n"
+      migration_file_text = "class CreateBitcoinActiveRecordModels < ActiveRecord::Migration\n  def change\n    create_table \"bitcoin_transactions\" do |t|\n      t.integer \"btc_address_id\", null: false\n      t.decimal \"amount\",         null: false\n      t.string  \"txid\",           null: false\n      t.timestamps\n    end\n    add_index \"bitcoin_transactions\", [\"btc_address_id\"]\n    add_index \"bitcoin_transactions\", [\"txid\"], unique: true\n\n    create_table \"btc_addresses\" do |t|\n      t.string  \"public_key\", null: false\n      t.timestamps\n    end\n    add_index \"btc_addresses\", [\"public_key\"], unique: true\n\n    create_table \"received_bitcoin_transactions\" do |t|\n      t.integer \"bitcoin_transaction_id\", null: false\n      t.integer \"btc_address_id\", null: false\n      t.timestamps\n    end\n    add_index :received_bitcoin_transactions, :bitcoin_transaction_id, unique: true\n    add_index :received_bitcoin_transactions, :btc_address_id\n\n    create_table \"sent_bitcoin_transactions\" do |t|\n      t.integer \"bitcoin_transaction_id\", null: false\n      t.timestamps\n    end\n    add_index \"sent_bitcoin_transactions\", [\"bitcoin_transaction_id\"], unique: true\n  end\nend\n"
       assert_equal(migration_file_text, File.read(@migration_file))
     end.()
 
-    %w(btc_address payment received_payment sent_payment).each do |model_name|
+    %w(btc_address bitcoin_transaction received_bitcoin_transaction sent_bitcoin_transaction).each do |model_name|
       camel_case_model_name = model_name.camelize
       filename = "app/models/#{model_name}.rb"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin_active_record
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -67,16 +67,16 @@ files:
 - lib/bitcoin_active_record.rb
 - lib/bitcoin_active_record/client.rb
 - lib/bitcoin_active_record/models.rb
+- lib/bitcoin_active_record/models/bitcoin_transaction.rb
 - lib/bitcoin_active_record/models/btc_address.rb
-- lib/bitcoin_active_record/models/payment.rb
-- lib/bitcoin_active_record/models/received_payment.rb
-- lib/bitcoin_active_record/models/sent_payment.rb
+- lib/bitcoin_active_record/models/received_bitcoin_transaction.rb
+- lib/bitcoin_active_record/models/sent_bitcoin_transaction.rb
 - lib/generators/bitcoin_active_record/install_generator.rb
 - lib/generators/templates/create_bitcoin_active_record_models.rb
+- lib/generators/templates/models/bitcoin_transaction.rb
 - lib/generators/templates/models/btc_address.rb
-- lib/generators/templates/models/payment.rb
-- lib/generators/templates/models/received_payment.rb
-- lib/generators/templates/models/sent_payment.rb
+- lib/generators/templates/models/received_bitcoin_transaction.rb
+- lib/generators/templates/models/sent_bitcoin_transaction.rb
 - test/.gitignore
 - test/Gemfile
 - test/Gemfile.lock
@@ -89,12 +89,10 @@ files:
 - test/app/controllers/concerns/.keep
 - test/app/helpers/application_helper.rb
 - test/app/mailers/.keep
-- test/app/models/.keep
+- test/app/models/bitcoin_transaction.rb
 - test/app/models/btc_address.rb
-- test/app/models/concerns/.keep
-- test/app/models/payment.rb
-- test/app/models/received_payment.rb
-- test/app/models/sent_payment.rb
+- test/app/models/received_bitcoin_transaction.rb
+- test/app/models/sent_bitcoin_transaction.rb
 - test/app/views/layouts/application.html.erb
 - test/bin/bundle
 - test/bin/rails
@@ -119,7 +117,7 @@ files:
 - test/config/initializers/wrap_parameters.rb
 - test/config/locales/en.yml
 - test/config/routes.rb
-- test/db/migrate/20150425185338_create_bitcoin_active_record_models.rb
+- test/db/migrate/20150429175618_create_bitcoin_active_record_models.rb
 - test/db/schema.rb
 - test/db/seeds.rb
 - test/lib/assets/.keep
@@ -176,12 +174,10 @@ test_files:
 - test/app/controllers/concerns/.keep
 - test/app/helpers/application_helper.rb
 - test/app/mailers/.keep
-- test/app/models/.keep
+- test/app/models/bitcoin_transaction.rb
 - test/app/models/btc_address.rb
-- test/app/models/concerns/.keep
-- test/app/models/payment.rb
-- test/app/models/received_payment.rb
-- test/app/models/sent_payment.rb
+- test/app/models/received_bitcoin_transaction.rb
+- test/app/models/sent_bitcoin_transaction.rb
 - test/app/views/layouts/application.html.erb
 - test/bin/bundle
 - test/bin/rails
@@ -206,7 +202,7 @@ test_files:
 - test/config/initializers/wrap_parameters.rb
 - test/config/locales/en.yml
 - test/config/routes.rb
-- test/db/migrate/20150425185338_create_bitcoin_active_record_models.rb
+- test/db/migrate/20150429175618_create_bitcoin_active_record_models.rb
 - test/db/schema.rb
 - test/db/seeds.rb
 - test/lib/assets/.keep

data/lib/bitcoin_active_record/models/payment.rb

@@ -1,18 +0,0 @@
-module BitcoinActiveRecord::Models::Payment
-  extend ActiveSupport::Concern
-
-  included do
-    # sender's address for received payments
-    # payee address for sent payments
-    belongs_to(:btc_address, inverse_of: :payments)
-
-    has_one(:received_payment, inverse_of: :payment)
-    has_one(:sent_payment, inverse_of: :payment)
-
-    validates(:txid, :btc_address, :amount, presence: true)
-    validates(:amount, numericality: { greater_than_or_equal_to: 0 })
-    validates(:txid, uniqueness: true)
-
-    auto_strip_attributes(:txid)
-  end
-end

data/lib/bitcoin_active_record/models/received_payment.rb

@@ -1,11 +0,0 @@
-module BitcoinActiveRecord::Models::ReceivedPayment
-  extend ActiveSupport::Concern
-
-  included do
-    belongs_to(:payment, inverse_of: :received_payment, dependent: :destroy)
-    belongs_to(:btc_address, inverse_of: :received_payments) # payment to this address
-
-    validates(:payment, presence: true)
-    validates(:payment_id, uniqueness: true)
-  end
-end

data/lib/bitcoin_active_record/models/sent_payment.rb

@@ -1,10 +0,0 @@
-module BitcoinActiveRecord::Models::SentPayment
-  extend ActiveSupport::Concern
-
-  included do
-    belongs_to(:payment, inverse_of: :sent_payment, dependent: :destroy)
-
-    validates(:payment, presence: true)
-    validates(:payment_id, uniqueness: true)
-  end
-end

data/lib/generators/templates/models/payment.rb

@@ -1,3 +0,0 @@
-class Payment < ActiveRecord::Base
-  bitcoin_active_record_model
-end

data/lib/generators/templates/models/received_payment.rb

@@ -1,3 +0,0 @@
-class ReceivedPayment < ActiveRecord::Base
-  bitcoin_active_record_model
-end

data/lib/generators/templates/models/sent_payment.rb

@@ -1,3 +0,0 @@
-class SentPayment < ActiveRecord::Base
-  bitcoin_active_record_model
-end

data/test/app/models/payment.rb

@@ -1,3 +0,0 @@
-class Payment < ActiveRecord::Base
-  bitcoin_active_record_model
-end

data/test/app/models/received_payment.rb

@@ -1,3 +0,0 @@
-class ReceivedPayment < ActiveRecord::Base
-  bitcoin_active_record_model
-end

data/test/app/models/sent_payment.rb

@@ -1,3 +0,0 @@
-class SentPayment < ActiveRecord::Base
-  bitcoin_active_record_model
-end

data/test/db/migrate/20150425185338_create_bitcoin_active_record_models.rb

@@ -1,32 +0,0 @@
-class CreateBitcoinActiveRecordModels < ActiveRecord::Migration
-  def change
-    create_table "payments" do |t|
-      t.integer "btc_address_id", null: false
-      t.decimal "amount",         null: false
-      t.string  "txid",           null: false
-      t.timestamps
-    end
-    add_index "payments", ["btc_address_id"]
-    add_index "payments", ["txid"], unique: true
-
-    create_table "btc_addresses" do |t|
-      t.string  "public_key", null: false
-      t.timestamps
-    end
-    add_index "btc_addresses", ["public_key"], unique: true
-
-    create_table "received_payments" do |t|
-      t.integer "payment_id", null: false
-      t.integer "btc_address_id", null: false
-      t.timestamps
-    end
-    add_index "received_payments", ["payment_id"], unique: true
-    add_index :received_payments, :btc_address_id
-
-    create_table "sent_payments" do |t|
-      t.integer "payment_id", null: false
-      t.timestamps
-    end
-    add_index "sent_payments", ["payment_id"], unique: true
-  end
-end