coins_paid_rails 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4677217ddfa7b10c003f696d1f7d641fd89e07d1b3c5226cc3b6003c8bf0a735
-  data.tar.gz: e4de7fd15b7c1490fafd2bc0056bf01a98d94a489b7952542cfad2652ce2c868
+  metadata.gz: ab34308c6f8735c1ab2b0c30a24faa2c11719b5017e8aca9697fa70cc85b0c32
+  data.tar.gz: 64151ea8d034672fd678555036a82e3f191cbb11beedc015a5653b7982c7e449
 SHA512:
-  metadata.gz: e7e86396641fcc60ab55475353b27f1607582dce7fc5f881477cbe6da710cf698969b9868f5f2a23b583433d9ca2716f7ff86e7afd9663319badd4d63cf98222
-  data.tar.gz: 926aa5fe76a82b5a7cf36c1d894bf1a9ae2360dc46aab7aee41f60286e27bd1b7cae248b094d90327a8ec00e883dc95295251db07c5c9d38b44bc6ebbec69cfd
+  metadata.gz: c3555750af1c3766d2bd96af8085258a2617f45e8c2a23f66f5b1cdc172da54366e2e3ba84e64bdb02985176fff5d55a482a0d784d5cac676c9caecb98a976fe
+  data.tar.gz: 167e712d1860a1b2ad29cea848bf25bd601531a55648ed40e89d13ed5503ed9c94203ddaabb4987ef72edfe0a22c4e2b6cef7cfa1990cc597d5dd357a67a2b3b

data/.circleci/config.yml

@@ -35,12 +35,12 @@ jobs:
       - restore_cache:
           key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: v4-bundle-{{ checksum "Gemfile" }}
+          key: v4-bundle-{{ checksum "Gemfile.lock" }}
       - run: echo "export rvm_ignore_gemsets_flag=1" >> ~/.rvmrc
       - run: sudo apt-get update && sudo apt-get install -y libsodium-dev
-      - run: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3 
+      - run: bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3
       - save_cache:
-          key: v4-bundle-{{ checksum "Gemfile" }}
+          key: v4-bundle-{{ checksum "Gemfile.lock" }}
           paths:
             - ~/coins_paid/vendor/bundle
 
@@ -55,7 +55,7 @@ jobs:
       - restore_cache:
           key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: v4-bundle-{{ checksum "Gemfile" }}
+          key: v4-bundle-{{ checksum "Gemfile.lock" }}
       - attach_workspace:
           at: ~/coins_paid
       - run: sudo apt-get update && sudo apt-get install -y libsodium-dev
@@ -83,7 +83,7 @@ jobs:
       - restore_cache:
           key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: v4-bundle-{{ checksum "Gemfile" }}
+          key: v4-bundle-{{ checksum "Gemfile.lock" }}
       - run: mkdir -p ~/.ssh && ssh-keyscan -H github.com >> ~/.ssh/known_hosts
       - run: sudo apt-get update && sudo apt-get install -y libsodium-dev
       - run: bundle check --path vendor/bundle

data/Gemfile

@@ -6,4 +6,5 @@ group :test do
   gem 'simplecov', require: false
   gem 'sqlite3'
   gem 'rspec-its'
+  gem 'rqrcode'
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    coins_paid_rails (1.0.1)
-      activerecord (>= 4.2.0)
+    coins_paid_rails (1.1.7)
+      activerecord (~> 6.1.4)
       coins_paid_api (~> 1.0)
       dry-initializer (~> 3.0)
       dry-struct (~> 1.0)
@@ -10,137 +10,139 @@ PATH
 GEM
   remote: http://www.rubygems.org/
   specs:
-    actionpack (5.2.4.4)
-      actionview (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.4)
-      activesupport (= 5.2.4.4)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.4.4)
-      activesupport (= 5.2.4.4)
-    activerecord (5.2.4.4)
-      activemodel (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
-      arel (>= 9.0)
-    activesupport (5.2.4.4)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     builder (3.2.4)
-    coins_paid_api (1.0.5)
+    chunky_png (1.4.0)
+    coins_paid_api (1.0.7)
       dry-struct (~> 1.0)
       faraday (~> 0.12)
       faraday_middleware (~> 0.11)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     diff-lcs (1.4.4)
     docile (1.1.5)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
     dry-initializer (3.0.4)
-    dry-logic (1.0.8)
+    dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-struct (1.3.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-types (~> 1.3)
+      dry-core (~> 0.5, >= 0.5)
+    dry-struct (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-types (~> 1.5)
       ice_nine (~> 0.11)
-    dry-types (1.4.0)
+    dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.10.0)
-    faraday (0.17.3)
+    faraday (0.17.4)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.3.0)
-    loofah (2.8.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (5.2.4.4)
-      actionpack (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
-    rspec-core (3.10.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
+    rake (13.0.6)
+    rqrcode (2.1.0)
+      chunky_png (~> 1.0)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.2.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.1)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.9)
-      rspec-expectations (~> 3.9)
-      rspec-mocks (~> 3.9)
-      rspec-support (~> 3.9)
-    rspec-support (3.10.0)
+    rspec-rails (5.0.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   coins_paid_rails!
+  rqrcode
   rspec-its
   rspec-rails
   simplecov

data/coins_paid_rails.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = 'coins_paid_rails'
   s.authors = ['Artem Biserov(artembiserov)', 'Oleg Ivanov(morhekil)']
-  s.version = '1.1.3'
+  s.version = '1.1.8'
   s.files = `git ls-files`.split("\n")
   s.summary = 'CoinsPaid Rails Integration'
   s.license = 'MIT'
 
   s.add_runtime_dependency 'coins_paid_api', '~> 1.0'
-  s.add_runtime_dependency 'activerecord', '>= 4.2.0'
+  s.add_runtime_dependency 'activerecord', '~> 6.1.4'
   s.add_runtime_dependency 'dry-initializer', '~> 3.0'
   s.add_runtime_dependency 'dry-struct', '~> 1.0'
   s.add_development_dependency 'rspec-rails'

data/lib/coins_paid/qr_code.rb

@@ -10,15 +10,15 @@ module CoinsPaid
     end
 
     def url
-      "#{token_type}:#{address}?label=#{encode(label)}&message=#{encode(message)}"
+      known_url? ? "#{token_type}:#{address.address}?label=#{encode(label)}&message=#{encode(message)}" : nil
     end
 
     def address
-      @address ||= CoinsPaid.address(player_id, currency: currency).address
+      @address ||= CoinsPaid.address(player_id, currency: currency)
     end
 
     def svg
-      RQRCode::QRCode.new(url).as_svg(
+      RQRCode::QRCode.new(url || address.address).as_svg(
         offset: 0,
         color: '000',
         shape_rendering: 'crispEdges',
@@ -30,11 +30,15 @@ module CoinsPaid
     private
 
     def token_type
-      ADDRESS_PREFIXES.fetch(currency)
+      ADDRESS_PREFIXES[currency]
     end
 
     def encode(string)
       URI.encode_www_form_component(string)
     end
+
+    def known_url?
+      token_type.present?
+    end
   end
 end

data/lib/coins_paid.rb

@@ -15,6 +15,7 @@ module CoinsPaid
   ADDRESS_PREFIXES = {
     'BTC' => 'bitcoin',
     'BCH' => 'bitcoincash',
+    'DOGE' => 'doge',
     'ETH' => 'ethereum',
     'EURTE' => 'ethereum',
     'LTC' => 'litecoin',
@@ -35,4 +36,8 @@ module CoinsPaid
   def currency(name)
     CoinsPaid::API.currencies_list.find { |item| item.currency == name } || raise(UnknownCurrency, name)
   end
+
+  def issued_addresses(foreign_id)
+    CoinsPaidAddress.where(foreign_id: foreign_id).order(:currency)
+  end
 end

data/spec/issued_addresses_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+describe CoinsPaid, '.issued_addresses' do
+  let(:foreign_id) { 123 }
+
+  it 'returns addresses with requested foreign_id ordered by currency' do
+    attrs = {
+      foreign_id: foreign_id,
+      currency: 'BTC',
+      address: 'addr',
+      external_id: 1
+    }
+
+    addr1 = CoinsPaid::CoinsPaidAddress.create!(attrs)
+    addr2 = CoinsPaid::CoinsPaidAddress.create!(attrs.merge(currency: 'ETH'))
+    CoinsPaid::CoinsPaidAddress.create!(attrs.merge(foreign_id: 555))
+
+    expect(CoinsPaid.issued_addresses(foreign_id)).to eq [addr1, addr2]
+  end
+end

data/spec/qr_code_spec.rb

@@ -2,25 +2,58 @@
 
 describe CoinsPaid, '.qr_code' do
   let(:foreign_id) { 123 }
+  let(:currency) { 'BTC' }
+  let(:address) { 'abc123' }
   let(:coins_paid_address) do
     instance_double CoinsPaid::CoinsPaidAddress,
-      currency: 'BTC',
-      address: 'abc123'
+                    currency: currency,
+                    address: address
   end
   subject(:qr_code) do
     described_class.qr_code(
       foreign_id,
-      currency: 'BTC',
+      currency: currency,
       label: 'RedStar deposit',
       message: 'Make a deposit to RedStar'
     )
   end
 
   before do
-    allow(CoinsPaid).to receive(:address).with(foreign_id, currency: 'BTC').and_return(coins_paid_address)
+    allow(CoinsPaid).to receive(:address).with(foreign_id, currency: currency).and_return(coins_paid_address)
   end
 
-  describe '#payment_url' do
-    its(:url) { is_expected.to eq 'bitcoin:abc123?label=RedStar+deposit&message=Make+a+deposit+to+RedStar' }
+  context 'it is known how to build payment url for the currency' do
+    let(:currency) { 'BTC' }
+    let(:url) { "bitcoin:#{address}?label=RedStar+deposit&message=Make+a+deposit+to+RedStar" }
+
+    describe '#url' do
+      its(:url) { is_expected.to eq url }
+    end
+
+    describe '#svg' do
+      it 'encodes payment url' do
+        expect(RQRCode::QRCode).to receive(:new).with(url).and_call_original
+        qr_code.svg
+      end
+    end
+  end
+
+  context 'it is not known how to build payment url for the currency' do
+    let(:currency) { 'BNB' }
+
+    describe '#url' do
+      its(:url) { is_expected.to be_nil }
+    end
+
+    describe '#svg' do
+      it 'encodes payment address' do
+        expect(RQRCode::QRCode).to receive(:new).with(address).and_call_original
+        qr_code.svg
+      end
+    end
+  end
+
+  context '#address' do
+    its(:address) { is_expected.to eq coins_paid_address }
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'active_record'
 require "active_record/railtie"
 require 'rspec/rails'
 require 'rspec/its'
+require 'rqrcode'
 
 require 'coins_paid_rails'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coins_paid_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Artem Biserov(artembiserov)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coins_paid_api
@@ -29,16 +29,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - lib/generators/coins_paid/templates/migration.rb
 - spec/address_spec.rb
 - spec/currency_spec.rb
+- spec/issued_addresses_spec.rb
 - spec/qr_code_spec.rb
 - spec/spec_helper.rb
 - spec/support/database/create_table.rb