coins_paid_rails 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: accffa021325022ed6042edf69cb52cb0802efa27dcd010ef0231f56450d18f0
-  data.tar.gz: f4af0fa8eb061e4a5d9761d5f7c98e1f7a08c970c1fa84413c2ffaae1284ee11
+  metadata.gz: df7e3a2b5d34d191761e465f1c8a82d4b7711d93b39bc03eebe9bfadccb339ec
+  data.tar.gz: 8dbf452034f18709317f11f0318b37e71cc32d8f3fcf7b936b1d0c0a754a34ae
 SHA512:
-  metadata.gz: 7c5a79288917f9447a1e87d0d929630079ee4fa8d0c43f9193a4f81742c02bde4d610a75580f822d19c50ef0c0da8bd1299a51ff386d9166cf4f4b7a1cbc0085
-  data.tar.gz: 0120a87cb1537bdea850921f5a0dfdfaa7ac3bc57b1484b6d35428a3b8959519c5311629baee6ffd324524ff3966a175d681093b41c678b5d118918bfebe8286
+  metadata.gz: 86fb4482d7847a7b2acdcc22a2d17857dc290e0a271095ba932489bff59f05466ac12568a364ccf6fdc02081e9e0e21d787f4b0829e36f58560f4d883b365543
+  data.tar.gz: 2d4ccb6c6cb43dc7d6392e34908b8349fa274fd6aef8ba8d92ec514eebe541f274fd6e52f40ba9d831e02d06a3e3ac0b053c41bef291eda513b2247aa316bf2e

data/.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
       - checkout
       - run: mkdir log
       - save_cache:
-          key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
+          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/coins_paid
 
@@ -33,14 +33,14 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
+          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: v1-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: v1-bundle-{{ checksum "Gemfile" }}
+          key: v4-bundle-{{ checksum "Gemfile.lock" }}
           paths:
             - ~/coins_paid/vendor/bundle
 
@@ -53,9 +53,9 @@ jobs:
       CIRCLE_ARTIFACTS: "./tmp"
     steps:
       - restore_cache:
-          key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
+          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: v1-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
@@ -81,9 +81,9 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
+          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
       - restore_cache:
-          key: v1-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/.gitignore

@@ -1,3 +1,2 @@
 /*.gem
-/Gemfile.lock
 **/test.db

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,153 @@
+PATH
+  remote: .
+  specs:
+    coins_paid_rails (1.1.6)
+      activerecord (>= 4.2.0)
+      coins_paid_api (~> 1.0)
+      dry-initializer (~> 3.0)
+      dry-struct (~> 1.0)
+
+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)
+      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)
+      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)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      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)
+      faraday_middleware (~> 0.11)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    docile (1.1.5)
+    dry-configurable (0.12.1)
+      concurrent-ruby (~> 1.0)
+      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.6.0)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.0)
+    dry-initializer (3.0.4)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      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.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 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.4)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.14.0)
+      faraday (>= 0.7.4, < 1.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    json (2.3.0)
+    loofah (2.8.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (1.0.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.2)
+    multipart-post (2.1.1)
+    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)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      method_source
+      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)
+      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)
+      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)
+    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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coins_paid_rails!
+  rqrcode
+  rspec-its
+  rspec-rails
+  simplecov
+  sqlite3
+
+BUNDLED WITH
+   1.17.1

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.1'
+  s.version = '1.1.6'
   s.files = `git ls-files`.split("\n")
   s.summary = 'CoinsPaid Rails Integration'
   s.license = 'MIT'
@@ -10,5 +10,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', '>= 4.2.0'
   s.add_runtime_dependency 'dry-initializer', '~> 3.0'
   s.add_runtime_dependency 'dry-struct', '~> 1.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.0'
+  s.add_development_dependency 'rspec-rails'
 end

data/lib/coins_paid/address.rb

@@ -17,9 +17,11 @@ module CoinsPaid
     end
 
     def call
-      CoinsPaidAddress.find_or_create_by!(request_data.attributes.slice(:foreign_id, :currency)) do |address|
-        response = CoinsPaid::API.take_address(request_data.attributes)
-        address.assign_attributes(response.attributes)
+      ActiveRecord::Base.transaction do
+        CoinsPaidAddress.lock.find_or_create_by!(request_data.attributes.slice(:foreign_id, :currency)) do |address|
+          response = CoinsPaid::API.take_address(request_data.attributes)
+          address.assign_attributes(response.attributes)
+        end
       end
     end
   end

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:)

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.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Artem Biserov(artembiserov)
 - Oleg Ivanov(morhekil)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coins_paid_api
@@ -71,18 +71,18 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: 
-email: 
+        version: '0'
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -90,7 +90,9 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - coins_paid_rails.gemspec
 - lib/coins_paid.rb
 - lib/coins_paid/address.rb
@@ -105,11 +107,11 @@ files:
 - 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
@@ -124,9 +126,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: []