coins_paid_rails 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f4f94846ba1e3ffa0c4e6d019833198eb380884a25cd83a328cf783c9556ef
-  data.tar.gz: 49529291f106e21617c3bff7f9f41c50571fc2d48647c8a876053fd9f16fc2ce
+  metadata.gz: 2a245456681db498181920344cd14e9535d73f722674653a102d5edac3528a4e
+  data.tar.gz: 942f6799a1ae1784ea09810617c637bafd0745feba909a53779de1e4230ae33d
 SHA512:
-  metadata.gz: 2e88d8f07132fedf82433dc08bafcc3849252b746d4269b9e5b01f6f3d54c20ecaac2c10f4f1a6fe4c5efdfa43ab47ed9202775ba83842d7620d1c6d49a9b1a9
-  data.tar.gz: ef914fe2d13cda6e5b6775f5364dcc99c4ec88c09d07ed766554fdc263050a163db7278939a661be797cf5f223d66d86e7f0679ab7e2e5a5eb855995c090ab88
+  metadata.gz: ebb41616c2ae9dfeee509b4c7cbcbd9589950ec0133974b118252081fa68662a2c9c10c8c5c2ea34b946a6b00f3d094e56a1a848dde062f09f07c681ed5aef79
+  data.tar.gz: c08a4d7d308e02fc81d547aa1361da7cbd48bd3cb1801af8890be00218eb3f01e415cfdd3b7ffe100620198c22485f3789c345ccb0a532827b4f3ad4d8bad67c

data/.rubocop.yml

@@ -0,0 +1,64 @@
+require:
+  - rubocop-performance
+  - rubocop-rails
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+  SuggestExtensions: false
+
+Naming/MethodParameterName:
+  MinNameLength: 1
+Naming/VariableNumber:
+  Enabled: false
+
+Lint/MissingCopEnableDirective:
+  Enabled: false
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+Layout/LineLength:
+  Max: 120
+Layout/MultilineOperationIndentation:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented_relative_to_receiver
+
+Style/AsciiComments:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/FormatStringToken:
+  Enabled: false
+Style/Lambda:
+  Enabled: false
+Style/LambdaCall:
+  Enabled: false
+Style/ModuleFunction:
+  Enabled: false
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '()'
+    '%I': '()'
+    '%r': '{}'
+    '%w': '()'
+    '%W': '()'
+Style/SignalException:
+  EnforcedStyle: 'only_raise'
+
+Metrics/AbcSize:
+  Exclude:
+    - 'config/**/*'
+    - 'db/**/*'
+    - 'spec/**/*'
+Metrics/BlockLength:
+  Exclude:
+    - 'config/**/*'
+    - 'db/**/*'
+    - 'spec/**/*'
+Metrics/MethodLength:
+  Exclude:
+    - 'config/**/*'
+    - 'db/**/*'
+    - 'spec/**/*'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coins_paid_rails (1.1.8)
+    coins_paid_rails (1.3.0)
       activerecord (~> 6.1.4)
       coins_paid_api (~> 1.0)
       dry-initializer (~> 3.0)
@@ -36,14 +36,14 @@ GEM
       zeitwerk (~> 2.3)
     builder (3.2.4)
     chunky_png (1.4.0)
-    coins_paid_api (1.0.7)
+    coins_paid_api (1.1.0)
       dry-struct (~> 1.0)
       faraday (~> 0.12)
       faraday_middleware (~> 0.11)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    diff-lcs (1.4.4)
-    docile (1.1.5)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
     dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
@@ -75,7 +75,6 @@ GEM
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.3.0)
     loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -102,22 +101,22 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rake (13.0.6)
-    rqrcode (2.1.0)
+    rqrcode (2.1.1)
       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.1)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.11.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.1)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -125,12 +124,13 @@ GEM
       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)
+    rspec-support (3.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     sqlite3 (1.4.2)
     thor (1.2.1)
     tzinfo (2.0.4)

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

data/lib/coins_paid/address.rb

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

data/lib/coins_paid.rb

@@ -9,7 +9,7 @@ module CoinsPaid
 
   UnknownCurrency = Class.new RuntimeError
 
-  def address(foreign_id, currency:, convert_to:)
+  def address(foreign_id, currency:, convert_to: currency)
     Address.new(foreign_id: foreign_id, currency: currency, convert_to: convert_to).call
   end
 
@@ -18,6 +18,6 @@ module CoinsPaid
   end
 
   def issued_addresses(foreign_id)
-    CoinsPaidAddress.where(foreign_id: foreign_id).order(:currency)
+    CoinsPaidAddress.where(foreign_id: foreign_id).order(:currency, :convert_to)
   end
 end

data/lib/generators/coins_paid/migration_data.rb

@@ -5,18 +5,19 @@ module CoinsPaid
     module_function
 
     def get
-<<RUBY
-    create_table :coins_paid_addresses do |t|
-      t.string :foreign_id, null: false
-      t.string :currency, null: false
-      t.string :address, null: false
-      t.string :tag
-      t.integer :external_id, null: false
- 
-      t.timestamps
-      t.index [:foreign_id, :currency], unique: true
-    end
-RUBY
+      <<~RUBY
+        create_table :coins_paid_addresses do |t|
+          t.string :foreign_id, null: false
+          t.string :currency, null: false
+          t.string :convert_to, null: false
+          t.string :address, null: false
+          t.string :tag
+          t.integer :external_id, null: false
+
+          t.timestamps
+          t.index [:foreign_id, :currency, :convert_to], name: :address_currencies, unique: true
+        end
+      RUBY
     end
   end
 end

data/lib/generators/coins_paid/migration_generator.rb

@@ -6,7 +6,7 @@ module CoinsPaid
   module Generators
     class MigrationGenerator < ActiveRecord::Generators::Base
       argument :name, default: 'create_coins_paid_addresses'
-      source_root File.expand_path("templates", __dir__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_coins_paid_migration
         migration_template 'migration.rb', "#{db_migrate_path}/#{file_name}.rb"

data/spec/address_spec.rb

@@ -1,57 +1,95 @@
 # frozen_string_literal: true
 
 describe CoinsPaid, '.address' do
-  let(:foreign_key) { 'user-id:2048' }
+  let(:foreign_id) { 'user-id:2048' }
   let(:currency) { 'BTC' }
   let(:convert_to) { 'EUR' }
-  let(:full_address_attributes) do
-    {
-      foreign_id: foreign_key,
-      currency: currency
-    }.merge(address_attributes)
-  end
   let(:address_attributes) do
     {
       external_id: 1,
       address: '12983h13ro1hrt24it432t',
-      tag: 'tag-123',
+      tag: 'tag-123'
     }
   end
-  subject(:take_address) { described_class.address(foreign_key, currency: currency, convert_to: convert_to) }
+  let(:api_request_args) { { foreign_id: foreign_id, currency: currency, convert_to: convert_to } }
+
+  subject(:take_address) { described_class.address(foreign_id, currency: currency, convert_to: convert_to) }
 
-  context 'when there is existing record' do
-    let!(:address) do
-      CoinsPaid::CoinsPaidAddress.create!(full_address_attributes)
+  context 'when there is a previously stored address record' do
+    let(:stored_address_attributes) do
+      address_attributes.merge(
+        foreign_id: foreign_id,
+        currency: currency,
+        convert_to: recorded_convert_to
+      )
+    end
+
+    let!(:stored_address) do
+      CoinsPaid::CoinsPaidAddress.create!(stored_address_attributes)
     end
 
     before do
-      allow(CoinsPaid::API).to receive(:take_address)
+      allow(CoinsPaid::API).to receive(:take_address).and_return(
+        CoinsPaid::API::TakeAddress::Response.new(address_attributes)
+      )
     end
 
-    it 'returns existing record' do
-      expect(take_address).to eq address
+    context 'with the same convert_to value' do
+      let(:recorded_convert_to) { convert_to }
 
-      expect(CoinsPaid::API).not_to have_received(:take_address)
+      it 'returns existing record' do
+        expect do
+          expect(take_address).to eq stored_address
+        end.to_not change(CoinsPaid::CoinsPaidAddress, :count)
+        expect(CoinsPaid::API).not_to have_received(:take_address)
+      end
     end
-  end
 
-  context 'when coins paid api responds with error' do
-    before do
-      allow(CoinsPaid::API).to receive(:take_address).and_raise(CoinsPaid::API::Error)
-    end
+    context 'with a different convert_to value' do
+      let(:recorded_convert_to) { 'DOGE' }
 
-    it 'raises error' do
-      expect { take_address }.to raise_error(CoinsPaid::API::Error)
+      it 'requests and records new address' do
+        expect do
+          new_address_attrs = stored_address_attributes.merge(convert_to: convert_to)
+          expect(take_address).to have_attributes(new_address_attrs)
+        end.to change(CoinsPaid::CoinsPaidAddress, :count).by(1)
+        expect(CoinsPaid::API).to have_received(:take_address).with(api_request_args)
+      end
     end
   end
 
-  context 'when coins paid return valid response' do
-    before do
-      allow(CoinsPaid::API).to receive(:take_address).and_return(CoinsPaid::API::TakeAddress::Response.new(address_attributes))
+  context 'when there is no recorded address' do
+    context 'and coins paid api responds with error' do
+      before do
+        allow(CoinsPaid::API).to receive(:take_address).and_raise(CoinsPaid::API::Error)
+      end
+
+      it 'raises error' do
+        expect { take_address }.to raise_error(CoinsPaid::API::Error)
+      end
     end
 
-    it 'creates new address' do
-      expect(take_address).to have_attributes(full_address_attributes)
+    context 'and coins paid returns valid response' do
+      before do
+        allow(CoinsPaid::API).to receive(:take_address).and_return(
+          CoinsPaid::API::TakeAddress::Response.new(address_attributes)
+        )
+      end
+
+      let(:new_address_attrs) do
+        address_attributes.merge(
+          foreign_id: foreign_id,
+          currency: currency,
+          convert_to: convert_to
+        )
+      end
+
+      it 'creates new address' do
+        expect do
+          expect(take_address).to have_attributes(new_address_attrs)
+        end.to change(CoinsPaid::CoinsPaidAddress, :count).by(1)
+        expect(CoinsPaid::API).to have_received(:take_address).with(api_request_args)
+      end
     end
   end
 end

data/spec/issued_addresses_spec.rb

@@ -6,15 +6,15 @@ describe CoinsPaid, '.issued_addresses' do
   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))
+    addr1 = CoinsPaid::CoinsPaidAddress.create!(attrs.merge(currency: 'BTC', convert_to: 'EUR'))
+    addr2 = CoinsPaid::CoinsPaidAddress.create!(attrs.merge(currency: 'ETH', convert_to: 'EUR'))
+    addr3 = CoinsPaid::CoinsPaidAddress.create!(attrs.merge(currency: 'ETH', convert_to: 'ETH'))
+    CoinsPaid::CoinsPaidAddress.create!(attrs.merge(currency: 'BTC', convert_to: 'EUR', foreign_id: 555))
 
-    expect(CoinsPaid.issued_addresses(foreign_id)).to eq [addr1, addr2]
+    expect(CoinsPaid.issued_addresses(foreign_id)).to eq [addr1, addr3, addr2]
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ if ENV['CIRCLE_ARTIFACTS']
 end
 
 require 'active_record'
-require "active_record/railtie"
+require 'active_record/railtie'
 require 'rspec/rails'
 require 'rspec/its'
 require 'rqrcode'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coins_paid_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Artem Biserov(artembiserov)
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coins_paid_api
@@ -90,6 +90,7 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock