cryptocoin_payable 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f7a3d37e5fea6dfc2e08eec657a47c1c21e300
-  data.tar.gz: e17ae020453e6ccb0fff510f33dd11752f1869c9
+  metadata.gz: 7b465403012fd6c2c62f916507601f6a461ec9f6
+  data.tar.gz: 660aabdd9e68754853025ca889b5a503b01b0a12
 SHA512:
-  metadata.gz: ddcf94b0a53ea8dd77207c4d2827ca277bbd8e952b68bbb41b55ffa31849ff4167b4f2e6d6321ad811c506a0be13ca091e4cb546d02d93f32df13e2987077f5a
-  data.tar.gz: 1dfe1240bc30c549041c6664785860320330dc1f179408b4383beca9fd4f466efaa225aaa9c644b4eef0900559eae69b8373be05150f7e2e2ba659872333027c
+  metadata.gz: 4616fb4173f7ffbfd1893cbc6546b5a69bdd1ee823f9af4b3a8497fa9fd4e987d4b350e4fd427a7c236197bd2f6c723058d687f20bf9b770ef44f1703cda420d
+  data.tar.gz: 1903bffd04558bf5b732547e4be3492c9198b587fe068ba701c5300393b48faa86919238b3973755133dfdca8dfcdd46fe81a04c4f8bf18ffe05b677774744f2

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/cryptocoin_payable.svg)](https://badge.fury.io/rb/cryptocoin_payable)
-[![Build Status](https://travis-ci.com/mhluska/cryptocoin_payable.svg?branch=master)](https://travis-ci.com/mhluska/cryptocoin_payable)
+[![Build Status](https://travis-ci.com/Sailias/cryptocoin_payable.svg?branch=master)](https://travis-ci.com/Sailias/cryptocoin_payable)
 
 # Cryptocoin Payable
 

data/Rakefile

@@ -1,3 +1,5 @@
 require 'bundler/gem_tasks'
-require 'rake'
-require 'cryptocoin_payable/tasks'
+
+import './lib/tasks/delete_currency_conversions.rake'
+import './lib/tasks/process_payments.rake'
+import './lib/tasks/process_prices.rake'

data/bin/console

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'active_record'
 require 'cryptocoin_payable'
 
 # You can add fixtures and/or initialization code here to make experimenting

data/cryptocoin_payable.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'cucumber', '~> 3.1'
   spec.add_development_dependency 'database_cleaner', '~> 1.7'
+  spec.add_development_dependency 'rails', '>= 4.0.0'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec-rails', '~> 3.7'
   spec.add_development_dependency 'rubocop', '~> 0.59'
@@ -34,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cash-addr', '~> 0.2'
   spec.add_dependency 'eth', '0.4.8'
   spec.add_dependency 'money-tree', '0.10.0'
-  spec.add_dependency 'rails'
   spec.add_dependency 'state_machine', '~> 1.2'
 end
 # rubocop:enable Metrics/BlockLength

data/features/support/env.rb

@@ -1,6 +1,4 @@
 ENV['RAILS_ENV'] ||= 'test'
-require File.expand_path('../../spec/dummy/config/environment.rb', __dir__)
-
 ENV['RAILS_ROOT'] ||= File.dirname(__FILE__) + '../../../spec/dummy'
 
 require 'cucumber/rails'

data/lib/cryptocoin_payable/adapters/base.rb

@@ -72,6 +72,10 @@ module CryptocoinPayable
         @coin_config ||= CryptocoinPayable.configuration.send(self.class.coin_symbol.downcase)
       end
 
+      def api_adapter_key
+        @api_adapter_key ||= coin_config && coin_config.api_adapter_key
+      end
+
       def parse_timestamp(timestamp)
         timestamp.nil? ? nil : DateTime.strptime(timestamp.to_s, '%s')
       end

data/lib/cryptocoin_payable/adapters/bitcoin.rb

@@ -32,8 +32,10 @@ module CryptocoinPayable
 
       def parse_total_tx_value_block_explorer(output_transactions, address)
         output_transactions
-          .select { |out| out['scriptPubKey']['addresses'].try('include?', address) }
-          .sum { |out| (out['value'].to_f * self.class.subunit_in_main).to_i }
+          .reject { |out| out['scriptPubKey']['addresses'].nil? }
+          .select { |out| out['scriptPubKey']['addresses'].include?(address) }
+          .map { |out| (out['value'].to_f * self.class.subunit_in_main).to_i }
+          .inject(:+)
       end
 
       def fetch_block_explorer_transactions(address)
@@ -52,7 +54,7 @@ module CryptocoinPayable
         {
           tx_hash: transaction['txid'],
           block_hash: transaction['blockhash'],
-          block_time: transaction['blocktime'].nil? ? nil : parse_timestamp(transaction['blocktime']),
+          block_time: parse_timestamp(transaction['blocktime']),
           estimated_tx_time: parse_timestamp(transaction['time']),
           estimated_tx_value: parse_total_tx_value_block_explorer(transaction['vout'], address),
           confirmations: transaction['confirmations']
@@ -61,7 +63,8 @@ module CryptocoinPayable
 
       def parse_total_tx_value_block_cypher(output_transactions, address)
         output_transactions
-          .sum { |out| out['addresses'].join.eql?(address) ? out['value'] : 0 }
+          .map { |out| out['addresses'].join.eql?(address) ? out['value'] : 0 }
+          .inject(:+)
       end
 
       def fetch_block_cypher_transactions(address)

data/lib/cryptocoin_payable/adapters/ethereum.rb

@@ -13,7 +13,6 @@ module CryptocoinPayable
       end
 
       def fetch_transactions(address)
-        api_adapter_key = coin_config.try(:adapter_api_key)
         url = "https://#{subdomain}.etherscan.io/api?module=account&action=txlist&address=#{address}&tag=latest"
         url += '?apiKey=' + api_adapter_key if api_adapter_key
 

data/lib/cryptocoin_payable/orm/activerecord.rb

@@ -0,0 +1,14 @@
+require 'active_record'
+require 'cryptocoin_payable/coin_payment_transaction'
+require 'cryptocoin_payable/coin_payment'
+require 'cryptocoin_payable/currency_conversion'
+require 'cryptocoin_payable/commands/pricing_processor'
+require 'cryptocoin_payable/commands/payment_processor'
+
+module ActiveRecord
+  class Base
+    def self.has_coin_payments # rubocop:disable Naming/PredicateName
+      has_many :coin_payments, class_name: 'CryptocoinPayable::CoinPayment', as: 'payable'
+    end
+  end
+end

data/lib/cryptocoin_payable/version.rb

@@ -1,3 +1,3 @@
 module CryptocoinPayable
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/cryptocoin_payable.rb

@@ -1,18 +1,24 @@
-require 'net/http'
+module CryptocoinPayable
+end
+
+if defined?(Rails)
+  module CryptocoinPayable
+    class Railtie < Rails::Railtie
+      initializer 'cryptocoin_payable.active_record' do
+        ActiveSupport.on_load(:active_record) do
+          require 'cryptocoin_payable/orm/activerecord'
+        end
+      end
+
+      rake_tasks do
+        path = File.expand_path(__dir__)
+        Dir.glob("#{path}/tasks/**/*.rake").each { |f| load f }
+      end
+    end
+  end
+end
 
 require 'cryptocoin_payable/config'
 require 'cryptocoin_payable/errors'
 require 'cryptocoin_payable/version'
-require 'cryptocoin_payable/has_coin_payments'
-require 'cryptocoin_payable/tasks'
 require 'cryptocoin_payable/adapters'
-require 'cryptocoin_payable/coin_payment_transaction'
-require 'cryptocoin_payable/coin_payment'
-require 'cryptocoin_payable/currency_conversion'
-
-module CryptocoinPayable
-end
-
-ActiveSupport.on_load(:active_record) do
-  include CryptocoinPayable::Model
-end

data/lib/tasks/delete_currency_conversions.rake

@@ -0,0 +1,6 @@
+namespace :cryptocoin_payable do
+  desc 'Delete old CurrencyConversion data (will delete last month by default)'
+  task delete_currency_conversions: :environment do
+    CryptocoinPayable::PricingProcessor.delete_currency_conversions(ENV['DELETE_BEFORE'])
+  end
+end

data/lib/tasks/process_payments.rake

@@ -0,0 +1,6 @@
+namespace :cryptocoin_payable do
+  desc 'Get transactions from external API and process payments'
+  task process_payments: :environment do
+    CryptocoinPayable::PaymentProcessor.perform
+  end
+end

data/lib/tasks/process_prices.rake

@@ -0,0 +1,6 @@
+namespace :cryptocoin_payable do
+  desc 'Process the prices and update the payments'
+  task process_prices: :environment do
+    CryptocoinPayable::PricingProcessor.perform
+  end
+end

data/spec/dummy/config/application.rb

@@ -3,6 +3,7 @@ require File.expand_path('boot', __dir__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
+
 require 'cryptocoin_payable'
 
 module Dummy

data/spec/dummy/config/initializers/state_machine.rb

@@ -1,3 +1,5 @@
+require 'state_machine'
+
 module StateMachine
   module Integrations
     module ActiveModel

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'vcr'
 require 'webmock/rspec'
+require 'active_support/time'
 
 VCR.configure do |config|
   config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cryptocoin_payable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jonathan Salis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-14 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -193,20 +207,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -264,13 +264,15 @@ files:
 - lib/cryptocoin_payable/config.rb
 - lib/cryptocoin_payable/currency_conversion.rb
 - lib/cryptocoin_payable/errors.rb
-- lib/cryptocoin_payable/has_coin_payments.rb
-- lib/cryptocoin_payable/tasks.rb
+- lib/cryptocoin_payable/orm/activerecord.rb
 - lib/cryptocoin_payable/version.rb
 - lib/generators/cryptocoin_payable/install_generator.rb
 - lib/generators/cryptocoin_payable/templates/create_coin_payment_transactions.rb
 - lib/generators/cryptocoin_payable/templates/create_coin_payments.rb
 - lib/generators/cryptocoin_payable/templates/create_currency_conversions.rb
+- lib/tasks/delete_currency_conversions.rake
+- lib/tasks/process_payments.rake
+- lib/tasks/process_prices.rake
 - spec/acceptance/adapters/bitcoin_cash_spec.rb
 - spec/acceptance/adapters/bitcoin_spec.rb
 - spec/acceptance/adapters/ethereum_spec.rb

data/lib/cryptocoin_payable/has_coin_payments.rb

@@ -1,15 +0,0 @@
-module CryptocoinPayable
-  module Model
-    def self.included(base)
-      base.send :extend, ClassMethods
-    end
-
-    module ClassMethods
-      def has_coin_payments(_options = {}) # rubocop:disable Naming/PredicateName
-        has_many :coin_payments, -> { order(:id) },
-          class_name: 'CryptocoinPayable::CoinPayment',
-          as: 'payable'
-      end
-    end
-  end
-end

data/lib/cryptocoin_payable/tasks.rb

@@ -1,20 +0,0 @@
-require 'rake'
-require 'cryptocoin_payable/commands/pricing_processor'
-require 'cryptocoin_payable/commands/payment_processor'
-
-namespace :cryptocoin_payable do
-  desc 'Process the prices and update the payments'
-  task process_prices: :environment do
-    CryptocoinPayable::PricingProcessor.perform
-  end
-
-  desc 'Delete old CurrencyConversion data (will delete last month by default)'
-  task delete_currency_conversions: :environment do
-    CryptocoinPayable::PricingProcessor.delete_currency_conversions(ENV['DELETE_BEFORE'])
-  end
-
-  desc 'Get transactions from external API and process payments'
-  task process_payments: :environment do
-    CryptocoinPayable::PaymentProcessor.perform
-  end
-end