coins_paid_rails 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10ae66fd4dffda591ef4a5682a6d28401720e4ae87ee4938b6c2eccbd7075e1a
-  data.tar.gz: 4f5da37e7b9b63fc0182814929d2b9ed567e97235363e1a0cf9ef0045dd081f4
+  metadata.gz: 25025c942a4c630da89e160486f2c5d1f05ed9584ce7f2c4fa27d4bf54c738f3
+  data.tar.gz: 5d8394faae19349b459dbd31e3277f047eda74eaaa67c9b632649100244170e7
 SHA512:
-  metadata.gz: 8a9d0aac396d98fa0fc7963d45c2153ab3462536fc12f50dce36ce095ed51f5748333251c1e19c8663569c5d912e4514ba47fcd2d09b7e95e77f9d3614ff923f
-  data.tar.gz: 5eeb4a643def5858eff9d3ca055a28277c3d9077816ce07117fff9f0fb8ecc644da2305b5c0642ef28447ffa7704245087c0fd00cee674c529035034ba918a4f
+  metadata.gz: f53a2431352a34504e6cca780e8a29b3492418ea7112ccfb647139f33e211cf98194e5964a37f837cc856a711db0f1f172bf878fbba7b5b6265ae3f4a610144a
+  data.tar.gz: 49ef1f19b5924e1b2ffbc1c0ae485d3c185a8fa91796e676b7fdf07429e1d472a4770d253014e5c023ad3e12681d5969e10a8a6e0b8fb1abd24bc17e92a56b6d

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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coins_paid_rails (1.0.1)
+    coins_paid_rails (1.1.7)
       activerecord (>= 4.2.0)
       coins_paid_api (~> 1.0)
       dry-initializer (~> 3.0)
@@ -36,6 +36,7 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     builder (3.2.4)
+    chunky_png (1.4.0)
     coins_paid_api (1.0.5)
       dry-struct (~> 1.0)
       faraday (~> 0.12)
@@ -44,36 +45,31 @@ GEM
     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)
@@ -85,11 +81,13 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.2)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -105,6 +103,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
+    rqrcode (2.1.0)
+      chunky_png (~> 1.0)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.2.0)
     rspec-core (3.10.0)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.0)
@@ -141,6 +143,7 @@ PLATFORMS
 
 DEPENDENCIES
   coins_paid_rails!
+  rqrcode
   rspec-its
   rspec-rails
   simplecov

data/coins_paid_rails.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'coins_paid_rails'
   s.authors = ['Artem Biserov(artembiserov)', 'Oleg Ivanov(morhekil)']
-  s.version = '1.1.2'
+  s.version = '1.1.7'
   s.files = `git ls-files`.split("\n")
   s.summary = 'CoinsPaid Rails Integration'
   s.license = 'MIT'

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,11 +15,14 @@ module CoinsPaid
   ADDRESS_PREFIXES = {
     'BTC' => 'bitcoin',
     'BCH' => 'bitcoincash',
+    'DOGE' => 'doge',
     'ETH' => 'ethereum',
     'EURTE' => 'ethereum',
     'LTC' => 'litecoin',
     'USDT' => 'bitcoin',
-    'USDTE' => 'ethereum'
+    'USDTE' => 'ethereum',
+    'TRX' => 'tron',
+    'USDTT' => 'tron'
   }.freeze
 
   def address(foreign_id, currency:)
@@ -33,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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: coins_paid_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.7
 platform: ruby
 authors:
 - Artem Biserov(artembiserov)
 - Oleg Ivanov(morhekil)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coins_paid_api
@@ -81,8 +81,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -104,14 +104,15 @@ 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
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,9 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: CoinsPaid Rails Integration
 test_files: []