coins_paid_rails 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab34308c6f8735c1ab2b0c30a24faa2c11719b5017e8aca9697fa70cc85b0c32
-  data.tar.gz: 64151ea8d034672fd678555036a82e3f191cbb11beedc015a5653b7982c7e449
+  metadata.gz: b5f4f94846ba1e3ffa0c4e6d019833198eb380884a25cd83a328cf783c9556ef
+  data.tar.gz: 49529291f106e21617c3bff7f9f41c50571fc2d48647c8a876053fd9f16fc2ce
 SHA512:
-  metadata.gz: c3555750af1c3766d2bd96af8085258a2617f45e8c2a23f66f5b1cdc172da54366e2e3ba84e64bdb02985176fff5d55a482a0d784d5cac676c9caecb98a976fe
-  data.tar.gz: 167e712d1860a1b2ad29cea848bf25bd601531a55648ed40e89d13ed5503ed9c94203ddaabb4987ef72edfe0a22c4e2b6cef7cfa1990cc597d5dd357a67a2b3b
+  metadata.gz: 2e88d8f07132fedf82433dc08bafcc3849252b746d4269b9e5b01f6f3d54c20ecaac2c10f4f1a6fe4c5efdfa43ab47ed9202775ba83842d7620d1c6d49a9b1a9
+  data.tar.gz: ef914fe2d13cda6e5b6775f5364dcc99c4ec88c09d07ed766554fdc263050a163db7278939a661be797cf5f223d66d86e7f0679ab7e2e5a5eb855995c090ab88

data/.circleci/config.yml

@@ -1,8 +1,9 @@
 version: 2.0
+
 defaults: &defaults
   docker:
-    - image: circleci/ruby:2.5-stretch-node
-  working_directory: ~/coins_paid
+    - image: cimg/ruby:2.7-node
+  working_directory: ~/project
 
 jobs:
   checkout_code:
@@ -10,10 +11,10 @@ jobs:
     steps:
       - checkout
       - run: mkdir log
-      - save_cache:
-          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
+      - persist_to_workspace:
+          root: ~/project
           paths:
-            - ~/coins_paid
+            - ./
 
   download_cc_reporter:
     <<: *defaults
@@ -25,45 +26,45 @@ jobs:
             curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc/cc-test-reporter
             chmod +x ./cc/cc-test-reporter
       - persist_to_workspace:
-          root: ~/coins_paid
+          root: ~/project
           paths:
             - cc/cc-test-reporter
 
   run_bundler:
     <<: *defaults
     steps:
+      - attach_workspace:
+          at: ~/project
       - restore_cache:
-          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
-      - restore_cache:
-          key: v4-bundle-{{ checksum "Gemfile.lock" }}
+          key: v1-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 config set --local path 'vendor/bundle'
+      - run: bundle check || bundle install --path=vendor/bundle --jobs=4 --retry=3
       - save_cache:
-          key: v4-bundle-{{ checksum "Gemfile.lock" }}
+          key: v1-bundle-{{ checksum "Gemfile.lock" }}
           paths:
-            - ~/coins_paid/vendor/bundle
+            - ~/project/vendor/bundle
 
   run_rspec_tests:
     <<: *defaults
     docker:
-      - image: circleci/ruby:2.5-stretch-node
+      - image: cimg/ruby:2.7-node
     environment:
       RACK_ENV: "test"
       CIRCLE_ARTIFACTS: "./tmp"
     steps:
-      - restore_cache:
-          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
-      - restore_cache:
-          key: v4-bundle-{{ checksum "Gemfile.lock" }}
       - attach_workspace:
-          at: ~/coins_paid
+          at: ~/project
+      - restore_cache:
+          key: v1-bundle-{{ checksum "Gemfile.lock" }}
       - run: sudo apt-get update && sudo apt-get install -y libsodium-dev
-      - run: bundle check --path vendor/bundle
+      - run: bundle config set --local path 'vendor/bundle'
+      - run: bundle check
       - run: bundle exec rspec spec
       - run: ./cc/cc-test-reporter format-coverage -t simplecov -o cc/codeclimate.rspec.json tmp/coverage/.resultset.json
       - persist_to_workspace:
-          root: ~/coins_paid
+          root: ~/project
           paths:
             - cc/codeclimate.rspec.json
 
@@ -71,24 +72,12 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace:
-          at: ~/coins_paid
+          at: ~/project
       - run:
           name: Upload coverage results to Code Climate
           command: |
             ./cc/cc-test-reporter upload-coverage -i cc/codeclimate.rspec.json
 
-  deploy:
-    <<: *defaults
-    steps:
-      - restore_cache:
-          key: v4-repo-{{ .Environment.CIRCLE_SHA1 }}
-      - restore_cache:
-          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
-      - run: bundle exec rake deploy:branch_or_label
-
 workflows:
   version: 2
   build_test_deploy:

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coins_paid_rails (1.1.7)
+    coins_paid_rails (1.1.8)
       activerecord (~> 6.1.4)
       coins_paid_api (~> 1.0)
       dry-initializer (~> 3.0)
@@ -10,25 +10,25 @@ PATH
 GEM
   remote: http://www.rubygems.org/
   specs:
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.5)
+      actionview (= 6.1.5)
+      activesupport (= 6.1.5)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.5)
+      activesupport (= 6.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       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)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
+    activerecord (6.1.5)
+      activemodel (= 6.1.5)
+      activesupport (= 6.1.5)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -40,20 +40,20 @@ GEM
       dry-struct (~> 1.0)
       faraday (~> 0.12)
       faraday_middleware (~> 0.11)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.4.4)
     docile (1.1.5)
-    dry-configurable (0.12.1)
+    dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.6.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.4)
+    dry-inflector (0.2.1)
+    dry-initializer (3.1.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -68,25 +68,25 @@ GEM
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     erubi (1.10.0)
-    faraday (0.17.4)
+    faraday (0.17.5)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.3.0)
-    loofah (2.12.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -95,11 +95,11 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.5)
+      actionpack (= 6.1.5)
+      activesupport (= 6.1.5)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
     rake (13.0.6)
     rqrcode (2.1.0)
@@ -132,10 +132,10 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sqlite3 (1.4.2)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -149,4 +149,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.17.1
+   2.2.32

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.8'
+  s.version = '1.2.0'
   s.files = `git ls-files`.split("\n")
   s.summary = 'CoinsPaid Rails Integration'
   s.license = 'MIT'

data/lib/coins_paid.rb

@@ -3,34 +3,14 @@ require 'dry-struct'
 require 'dry-initializer'
 require_relative 'coins_paid/address'
 require_relative 'coins_paid/coins_paid_address'
-require_relative 'coins_paid/qr_code'
 
 module CoinsPaid
   module_function
 
   UnknownCurrency = Class.new RuntimeError
 
-  DEFAULT_CONVERT_TO = ENV['COINS_PAID_CURRENCY']
-
-  ADDRESS_PREFIXES = {
-    'BTC' => 'bitcoin',
-    'BCH' => 'bitcoincash',
-    'DOGE' => 'doge',
-    'ETH' => 'ethereum',
-    'EURTE' => 'ethereum',
-    'LTC' => 'litecoin',
-    'USDT' => 'bitcoin',
-    'USDTE' => 'ethereum',
-    'TRX' => 'tron',
-    'USDTT' => 'tron'
-  }.freeze
-
-  def address(foreign_id, currency:)
-    Address.new(foreign_id: foreign_id, currency: currency, convert_to: DEFAULT_CONVERT_TO).call
-  end
-
-  def qr_code(player_id, currency:, label:, message:)
-    QrCode.new(player_id, currency: currency, label: label, message: message)
+  def address(foreign_id, currency:, convert_to:)
+    Address.new(foreign_id: foreign_id, currency: currency, convert_to: convert_to).call
   end
 
   def currency(name)

data/spec/address_spec.rb

@@ -3,6 +3,7 @@
 describe CoinsPaid, '.address' do
   let(:foreign_key) { 'user-id:2048' }
   let(:currency) { 'BTC' }
+  let(:convert_to) { 'EUR' }
   let(:full_address_attributes) do
     {
       foreign_id: foreign_key,
@@ -16,7 +17,7 @@ describe CoinsPaid, '.address' do
       tag: 'tag-123',
     }
   end
-  subject(:take_address) { described_class.address(foreign_key, currency: currency) }
+  subject(:take_address) { described_class.address(foreign_key, currency: currency, convert_to: convert_to) }
 
   context 'when there is existing record' do
     let!(:address) do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: coins_paid_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Artem Biserov(artembiserov)
 - Oleg Ivanov(morhekil)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-03-25 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: []
@@ -97,7 +97,6 @@ files:
 - lib/coins_paid.rb
 - lib/coins_paid/address.rb
 - lib/coins_paid/coins_paid_address.rb
-- lib/coins_paid/qr_code.rb
 - lib/coins_paid_rails.rb
 - lib/generators/coins_paid/migration_data.rb
 - lib/generators/coins_paid/migration_generator.rb
@@ -105,14 +104,13 @@ files:
 - 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
@@ -127,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: CoinsPaid Rails Integration
 test_files: []

data/lib/coins_paid/qr_code.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module CoinsPaid
-  class QrCode
-    include Dry::Initializer.define -> do
-      param :player_id
-      option :currency
-      option :label
-      option :message
-    end
-
-    def url
-      known_url? ? "#{token_type}:#{address.address}?label=#{encode(label)}&message=#{encode(message)}" : nil
-    end
-
-    def address
-      @address ||= CoinsPaid.address(player_id, currency: currency)
-    end
-
-    def svg
-      RQRCode::QRCode.new(url || address.address).as_svg(
-        offset: 0,
-        color: '000',
-        shape_rendering: 'crispEdges',
-        module_size: 3,
-        standalone: true
-      )
-    end
-
-    private
-
-    def token_type
-      ADDRESS_PREFIXES[currency]
-    end
-
-    def encode(string)
-      URI.encode_www_form_component(string)
-    end
-
-    def known_url?
-      token_type.present?
-    end
-  end
-end

data/spec/qr_code_spec.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-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: currency,
-                    address: address
-  end
-  subject(:qr_code) do
-    described_class.qr_code(
-      foreign_id,
-      currency: currency,
-      label: 'RedStar deposit',
-      message: 'Make a deposit to RedStar'
-    )
-  end
-
-  before do
-    allow(CoinsPaid).to receive(:address).with(foreign_id, currency: currency).and_return(coins_paid_address)
-  end
-
-  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