bitsy-bitcoin 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c26cf7efb987d8ef064760813c6970d732bc78dc
-  data.tar.gz: fc16a22ed352160268df3ebd94dae09fe0505bf9
+  metadata.gz: adab618db67cc442d07bd8aae043d23f49de69fd
+  data.tar.gz: e2feaaffeec1dc22b19d3b7129aa6b8fa01199b6
 SHA512:
-  metadata.gz: bd4d28f79c15c3e001d00094f19110c3a021d3795df9a8c3cb1d8337a24d546a91f8156353c9f3bb1b9fad1fddcbebc600e75e92b6742aae6d0d0e24ce7e39ab
-  data.tar.gz: 0ce171b4d1880437cb0c924060f612fceccebb48ce6768e9dffcbb6ed8e76de5f4cce4d0e1f73e6b37184f2dab5b85428db128169107eea022317c6f8cb1f37f
+  metadata.gz: ceb557ffffe7345b4843d315c341191626327806a5660d907bac3e1ee32e6b3a9b0afb3c038977964552deed2c4533788e940639dc1f8db2d08eecd30d170c77
+  data.tar.gz: 6dd64ca2c5075c0b479e32165d7a0c6911cad75efed752ac2ad5b89d39d479d5da35b992ec9b6c34920278d3016dd9a87317927dac5c3b5234069f967866c637

data/app/filterers/bitsy/payment_depot_filterer.rb

@@ -0,0 +1,13 @@
+module Bitsy
+  class PaymentDepotFilterer < Filterer::Base
+
+    def starting_query
+      PaymentDepot.all
+    end
+
+    def param_id(x)
+      @results.where(id: x)
+    end
+
+  end
+end

data/app/models/bitsy/payment_depot.rb

@@ -104,14 +104,18 @@ module Bitsy
       self.uuid
     end
 
+    def forwarding_transaction_fee
+      total_received_amount - total_tax_sent - total_owner_sent
+    end
+
     private
 
     def tax_transactions
-      self.transactions.debit.tax
+      self.transactions.debits.tax
     end
 
     def owner_transactions
-      self.transactions.debit.non_tax
+      self.transactions.debits.non_tax
     end
 
     def set_uuid

data/app/models/bitsy/payment_transaction.rb

@@ -20,6 +20,10 @@ module Bitsy
     scope :non_tax, lambda { where('payment_type != ?', 'tax') }
     scope :for_forwarding, -> { safely_confirmed.not_forwarded.received }
     scope :credits, -> { received }
+    scope :debits, -> {
+      forwarding_transaction_id = arel_table[:forwarding_transaction_id]
+      where(forwarding_transaction_id.not_eq(nil))
+    }
 
     delegate :min_payment, to: :payment_depot, prefix: true
     delegate :balance, to: :payment_depot, prefix: true

data/app/serializers/bitsy/payment_depot_serializer.rb

@@ -6,6 +6,10 @@ module Bitsy
       :min_payment_received,
       :total_received_amount,
       :address,
+      :min_payment,
+      :total_tax_sent,
+      :total_owner_sent,
+      :forwarding_transaction_fee,
     )
 
     def min_payment_received

data/lib/bitsy.rb

@@ -7,6 +7,7 @@ require "daemons"
 require "light-service"
 require "uuidtools"
 require "blockchain"
+require "filterer"
 require "bitsy/engine"
 require "bitsy/config"
 

data/lib/bitsy/version.rb

@@ -1,3 +1,3 @@
 module Bitsy
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitsy-bitcoin
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: filterer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +327,7 @@ files:
 - app/controllers/bitsy/v1/payment_depots_controller.rb
 - app/controllers/bitsy/v1/syncs_controller.rb
 - app/controllers/bitsy/v1/truncations_controller.rb
+- app/filterers/bitsy/payment_depot_filterer.rb
 - app/helpers/bitsy/application_helper.rb
 - app/jobs/bitsy/blockchain_notification_job.rb
 - app/jobs/bitsy/check_payments_job.rb