finapps 5.0.34 → 5.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6958de8a43a73230709100da8c2ddc2c2eef53d2ae74f546c37dbab8d6790b6a
-  data.tar.gz: 4af6e7780029881e968ef5551d3b24c965471a65080b9b45fda47ceb0e57d424
+  metadata.gz: 4756aafb56941b9eaf0609a1aa07d9eae9b3485e70a10bf1ab7590cc973654d1
+  data.tar.gz: 0e55b4ed791fc263027a21b6193ca025778e983fb0742006111b9fc1c5d88e4d
 SHA512:
-  metadata.gz: 06c98f429646d29272d6a5b4d7f3f9d9bb38ca20e9e5d4fbce6db76d86200eab81acb64476170f05c705eee82c4cfa44f83f4f3b783777ccb13e962b458be7c3
-  data.tar.gz: fdaa7e5508c7d0f7929f15d8a68ba4137180ce56b1e4be46dcd83d7230d1f2d796d40ef1949d082309e55d7e9a78433ae927f9ec13785ec49dc80d345e8cfb6a
+  metadata.gz: 90031e4f43d5a3fda8f4f3f2df53e7ecb8a5e27ab53830f79aaf80ab981b293b8890ad3e2bf8a31ebc210dcaf37f29fbcc1442fb139ee463b465243223381393
+  data.tar.gz: 56d79d89f1a40e4ee1fff5b58ad8e49f762375c7ea6a4911a3e149004272eba89fe3e6348653a49f75a2bf1cd6a1f41ef4e8c20af6857c0e75af76c818b88467

data/.github/workflows/main.yaml

@@ -1,12 +1,6 @@
 name: Main
 
-on:
-  push:
-    branches:
-      - master
-    pull_request:
-      branches:
-        - master
+on: [push, pull_request]
 
 jobs:
   ci:

data/.rubocop_todo.yml

@@ -6,115 +6,24 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 119
-
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 16
-
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
+# finapps.gemspec - leaving as is intentionally
 Metrics/BlockLength:
   Max: 28
 
 # Offense count: 1
 # Configuration parameters: CountComments.
+# fake_api.rb - leaving as is intentionally
 Metrics/ClassLength:
   Max: 431
 
-# Offense count: 3
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 16
-
-# Offense count: 29
-# Configuration parameters: Prefixes.
-# Prefixes: when, with, without
-RSpec/ContextWording:
-  Exclude:
-    - 'spec/rest/client_spec.rb'
-    - 'spec/rest/consumers_spec.rb'
-    - 'spec/rest/documents_orders_notifications_spec.rb'
-    - 'spec/rest/operators_password_resets_spec.rb'
-    - 'spec/rest/operators_spec.rb'
-    - 'spec/rest/order_notifications_spec.rb'
-    - 'spec/rest/order_tokens_spec.rb'
-    - 'spec/rest/orders_spec.rb'
-    - 'spec/rest/portfolios_consumers_spec.rb'
-    - 'spec/rest/sessions_spec.rb'
-
-# Offense count: 6
-RSpec/DescribeMethod:
-  Exclude:
-    - 'spec/rest/consumers_spec.rb'
-    - 'spec/rest/operators_password_resets_spec.rb'
-    - 'spec/rest/operators_spec.rb'
-    - 'spec/rest/order_tokens_spec.rb'
-    - 'spec/rest/products_spec.rb'
-    - 'spec/rest/sessions_spec.rb'
-
 # Offense count: 5
 # Configuration parameters: Max.
+# Leaving as is intentionally - url being tested takes up as many lines
 RSpec/ExampleLength:
   Exclude:
     - 'spec/rest/consumers_spec.rb'
     - 'spec/rest/documents_orders_spec.rb'
     - 'spec/rest/orders_spec.rb'
-
-# Offense count: 1
-# Configuration parameters: .
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-# Offense count: 13
-RSpec/MultipleExpectations:
-  Max: 3
-
-# Offense count: 114
-# Configuration parameters: IgnoreSharedExamples.
-RSpec/NamedSubject:
-  Exclude:
-    - 'spec/rest/client_spec.rb'
-    - 'spec/rest/consumers_spec.rb'
-    - 'spec/rest/documents_orders_spec.rb'
-    - 'spec/rest/order_reports_spec.rb'
-    - 'spec/rest/order_statuses_spec.rb'
-    - 'spec/rest/order_tokens_spec.rb'
-    - 'spec/rest/orders_spec.rb'
-    - 'spec/rest/password_resets_spec.rb'
-    - 'spec/rest/plaid/plaid_consumer_institutions_spec.rb'
-    - 'spec/rest/sessions_spec.rb'
-    - 'spec/rest/signed_documents_downloads_spec.rb'
-    - 'spec/rest/verix/verix_documents_spec.rb'
-    - 'spec/rest/verix/verix_pdf_documents_spec.rb'
-    - 'spec/rest/version_spec.rb'
-
-# Offense count: 6
-RSpec/RepeatedExample:
-  Exclude:
-    - 'spec/rest/signed_documents_downloads_spec.rb'
-    - 'spec/rest/verix/verix_documents_spec.rb'
-    - 'spec/rest/verix/verix_pdf_documents_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedExampleGroupBody:
-  Exclude:
-    - 'spec/rest/client_spec.rb'
-
-# Offense count: 4
-RSpec/RepeatedExampleGroupDescription:
-  Exclude:
-    - 'spec/rest/client_spec.rb'
-
-# Offense count: 1
-RSpec/SubjectStub:
-  Exclude:
-    - 'spec/rest/orders_spec.rb'

data/README.md

@@ -3,6 +3,7 @@ FinApps Ruby-Client
 ===================
 
 [![Gem Version](https://img.shields.io/gem/v/finapps.svg)](https://rubygems.org/gems/finapps)
+![Main](https://github.com/finapps/ruby-client/workflows/Main/badge.svg)
 [![Build Status](https://travis-ci.org/finapps/ruby-client.svg?branch=master)](https://travis-ci.org/finapps/ruby-client)
 [![Code Climate](https://codeclimate.com/github/finapps/ruby-client/badges/gpa.svg)](https://codeclimate.com/github/finapps/ruby-client)
 [![Test Coverage](https://codeclimate.com/github/finapps/ruby-client/badges/coverage.svg)](https://codeclimate.com/github/finapps/ruby-client/coverage)

data/RELEASES.md

@@ -1,3 +1,14 @@
+## [5.0.35] - 2020-07-09
+
+### Changed
+* Change code to match rubocop suggestions ([#232][i232])
+* Add support for first name order search with space ([#404][i404])
+
+[i232]: https://github.com/finapps/ruby-client/issues/232
+[i404]: https://github.com/finapps/tenant-dashboard-react/issues/404
+
+[5.0.35]: https://github.com/finapps/ruby-client/compare/5.0.34...5.0.35
+
 ## [5.0.32] - 2020-06-11
 
 ### Fixed

data/lib/finapps/rest/client.rb

@@ -60,17 +60,18 @@ module FinApps
         if RESOURCES.include? symbol
           class_name = camelize(symbol.to_s)
           variable = "@#{class_name.downcase}"
-          unless instance_variable_defined? variable
-            klass =
-              Object.const_get('FinApps').const_get('REST').const_get class_name
-            instance_variable_set(variable, klass.new(self))
-          end
+          set_variable(class_name, variable) unless instance_variable_defined? variable
           instance_variable_get(variable)
         else
           super
         end
       end
 
+      def set_variable(class_name, variable)
+        klass = Object.const_get('FinApps').const_get('REST').const_get class_name
+        instance_variable_set(variable, klass.new(self))
+      end
+
       def respond_to_missing?(method_sym, include_private = false)
         RESOURCES.include?(method_sym) ? true : super
       end

data/lib/finapps/rest/orders.rb

@@ -63,22 +63,33 @@ module FinApps
       end
 
       def search_query(term)
-        if term
-          {
-            "$or": [
-              {"public_id": {"$regex": "^#{term}", "$options": 'i'}},
-              {"applicant.last_name": term},
-              {"assignment.last_name": term},
-              {
-                "requestor.reference_no": {
-                  "$regex": "^#{term}", "$options": 'i'
-                }
-              }
-            ]
-          }
-        else
-          {}
+        return {} unless term
+
+        query = search_query_object(term).concat(consumer_name_query(term))
+        {"$or": query}
+      end
+
+      def consumer_name_query(term)
+        search_arr = []
+        if /\s/.match?(term)
+          term.split.each do |t|
+            search_arr.append("applicant.first_name": t)
+            search_arr.append("applicant.last_name": t)
+          end
         end
+        search_arr
+      end
+
+      def search_query_object(term)
+        [{"public_id": {"$regex": "^#{term}", "$options": 'i'}},
+         {"assignment.last_name": term},
+         {"applicant.first_name": term},
+         {"applicant.last_name": term},
+         {
+           "requestor.reference_no": {
+             "$regex": "^#{term}", "$options": 'i'
+           }
+         }]
       end
 
       def status_query(status)

data/lib/finapps/rest/sessions.rb

@@ -15,14 +15,7 @@ module FinApps
         begin
           super params, path
         rescue FinAppsCore::ApiUnauthenticatedError
-          (
-            [
-              nil,
-              [
-                "Invalid #{path == CONSUMER_LOGIN ? 'Consumer' : 'Operator'} Identifier or Credentials"
-              ]
-            ]
-          )
+          login_error(path)
         end
       end
 
@@ -36,6 +29,15 @@ module FinApps
         params.key?(:email) && params[:email] && params.key?(:password) &&
           params[:password]
       end
+
+      def login_error(path)
+        [
+          nil,
+          [
+            "Invalid #{path == CONSUMER_LOGIN ? 'Consumer' : 'Operator'} Identifier or Credentials"
+          ]
+        ]
+      end
     end
   end
 end

data/lib/finapps/utils/query_builder.rb

@@ -5,15 +5,24 @@ module FinApps
     module QueryBuilder
       def build_query_path(root_url, params)
         filter_obj = build_filter(params)
-        page = "page=#{params[:page].to_i}" if params[:page]
-        requested = "requested=#{params[:requested].to_i}" if params[:requested]
-        sort = "sort=#{ERB::Util.url_encode(params[:sort])}" if params[:sort]
         filter = "filter=#{ERB::Util.url_encode(filter_obj.to_json)}" unless filter_obj.empty?
-        query_join(root_url, [page, requested, sort, filter])
+        query_join(root_url, [page(params), requested(params), sort(params), filter])
       end
 
       private
 
+      def page(params)
+        "page=#{params[:page].to_i}" if params[:page]
+      end
+
+      def requested(params)
+        "requested=#{params[:requested].to_i}" if params[:requested]
+      end
+
+      def sort(params)
+        "sort=#{ERB::Util.url_encode(params[:sort])}" if params[:sort]
+      end
+
       def query_join(root_url, params_array)
         query_string = params_array.compact.join('&')
         [root_url, query_string].reject(&:empty?).join('?')

data/lib/finapps/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FinApps
-  VERSION = '5.0.34'
+  VERSION = '5.0.35'
 end

data/spec/rest/alert_definitions_spec.rb

@@ -68,12 +68,8 @@ RSpec.describe FinApps::REST::AlertDefinitions do
 
       it { expect { show }.not_to raise_error }
       it('returns an array') { expect(show).to be_a(Array) }
-
-      it('performs a get and returns the response') do
-        expect(results).to have_key(:_id)
-        expect(results).to have_key(:rule_name)
-      end
-
+      it { expect(results).to have_key(:_id) }
+      it { expect(results).to have_key(:rule_name) }
       it('returns no error messages') { expect(errors).to be_empty }
     end
 

data/spec/rest/client_spec.rb

@@ -9,22 +9,22 @@ RSpec.describe FinApps::REST::Client do
     end
   end
 
-  context 'an instance of Client' do
-    subject { described_class.new(:company_token) }
+  context 'with an instance of Client' do
+    subject(:client) { described_class.new(:company_token) }
 
     FinApps::REST::Client::RESOURCES.each do |method|
-      it("responds to #{method}") { expect(subject).to respond_to(method) }
+      it("responds to #{method}") { expect(client).to respond_to(method) }
 
       it "memoizes the result of #{method}" do
-        first = subject.send(method)
-        second = subject.send(method)
+        first = client.send(method)
+        second = client.send(method)
         expect(first.object_id).to eq(second.object_id)
       end
     end
 
     describe '#alert_definitions' do
       it do
-        expect(subject.alert_definitions).to be_an_instance_of(
+        expect(client.alert_definitions).to be_an_instance_of(
           FinApps::REST::AlertDefinitions
         )
       end
@@ -32,7 +32,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#alert_occurrences' do
       it do
-        expect(subject.alert_occurrences).to be_an_instance_of(
+        expect(client.alert_occurrences).to be_an_instance_of(
           FinApps::REST::AlertOccurrences
         )
       end
@@ -40,41 +40,41 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#version' do
       it do
-        expect(subject.version).to be_an_instance_of(FinApps::REST::Version)
+        expect(client.version).to be_an_instance_of(FinApps::REST::Version)
       end
     end
 
     describe '#consumers' do
       it do
-        expect(subject.consumers).to be_an_instance_of(FinApps::REST::Consumers)
+        expect(client.consumers).to be_an_instance_of(FinApps::REST::Consumers)
       end
     end
 
     describe '#plaid_webhooks' do
       it do
         expect(
-          subject.plaid_webhooks
+          client.plaid_webhooks
         ).to be_an_instance_of FinApps::REST::PlaidWebhooks
       end
     end
 
     describe '#sessions' do
       it do
-        expect(subject.sessions).to be_an_instance_of(FinApps::REST::Sessions)
+        expect(client.sessions).to be_an_instance_of(FinApps::REST::Sessions)
       end
     end
 
     describe '#order_assignments' do
       it do
-        expect(subject.order_assignments).to be_an_instance_of(
+        expect(client.order_assignments).to be_an_instance_of(
           FinApps::REST::OrderAssignments
         )
       end
     end
 
-    describe '#order_statuses' do
+    describe '#order_notifications' do
       it do
-        expect(subject.order_notifications).to be_an_instance_of(
+        expect(client.order_notifications).to be_an_instance_of(
           FinApps::REST::OrderNotifications
         )
       end
@@ -82,7 +82,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_statuses' do
       it do
-        expect(subject.order_statuses).to be_an_instance_of(
+        expect(client.order_statuses).to be_an_instance_of(
           FinApps::REST::OrderStatuses
         )
       end
@@ -90,7 +90,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_refreshes' do
       it do
-        expect(subject.order_refreshes).to be_an_instance_of(
+        expect(client.order_refreshes).to be_an_instance_of(
           FinApps::REST::OrderRefreshes
         )
       end
@@ -98,7 +98,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_reports' do
       it do
-        expect(subject.order_reports).to be_an_instance_of(
+        expect(client.order_reports).to be_an_instance_of(
           FinApps::REST::OrderReports
         )
       end
@@ -106,19 +106,19 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#order_tokens' do
       it do
-        expect(subject.order_tokens).to be_an_instance_of(
+        expect(client.order_tokens).to be_an_instance_of(
           FinApps::REST::OrderTokens
         )
       end
     end
 
     describe '#orders' do
-      it { expect(subject.orders).to be_an_instance_of(FinApps::REST::Orders) }
+      it { expect(client.orders).to be_an_instance_of(FinApps::REST::Orders) }
     end
 
     describe '#password_resets' do
       it do
-        expect(subject.password_resets).to be_an_instance_of(
+        expect(client.password_resets).to be_an_instance_of(
           FinApps::REST::PasswordResets
         )
       end
@@ -126,7 +126,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#operators_password_resets' do
       it do
-        expect(subject.operators_password_resets).to be_an_instance_of(
+        expect(client.operators_password_resets).to be_an_instance_of(
           FinApps::REST::OperatorsPasswordResets
         )
       end
@@ -134,19 +134,19 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#operators' do
       it do
-        expect(subject.operators).to be_an_instance_of(FinApps::REST::Operators)
+        expect(client.operators).to be_an_instance_of(FinApps::REST::Operators)
       end
     end
 
     describe '#products' do
       it do
-        expect(subject.products).to be_an_instance_of(FinApps::REST::Products)
+        expect(client.products).to be_an_instance_of(FinApps::REST::Products)
       end
     end
 
     describe '#portfolios' do
       it do
-        expect(subject.portfolios).to be_an_instance_of(
+        expect(client.portfolios).to be_an_instance_of(
           FinApps::REST::Portfolios
         )
       end
@@ -154,7 +154,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolios_alerts' do
       it do
-        expect(subject.portfolios_alerts).to be_an_instance_of(
+        expect(client.portfolios_alerts).to be_an_instance_of(
           FinApps::REST::PortfoliosAlerts
         )
       end
@@ -162,7 +162,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolios_available_consumers' do
       it do
-        expect(subject.portfolios_available_consumers).to be_an_instance_of(
+        expect(client.portfolios_available_consumers).to be_an_instance_of(
           FinApps::REST::PortfoliosAvailableConsumers
         )
       end
@@ -170,7 +170,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolios_consumers' do
       it do
-        expect(subject.portfolios_consumers).to be_an_instance_of(
+        expect(client.portfolios_consumers).to be_an_instance_of(
           FinApps::REST::PortfoliosConsumers
         )
       end
@@ -178,7 +178,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#consumers_portfolios' do
       it do
-        expect(subject.consumers_portfolios).to be_an_instance_of(
+        expect(client.consumers_portfolios).to be_an_instance_of(
           FinApps::REST::ConsumersPortfolios
         )
       end
@@ -186,7 +186,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#portfolio_reports' do
       it do
-        expect(subject.portfolio_reports).to be_an_instance_of(
+        expect(client.portfolio_reports).to be_an_instance_of(
           FinApps::REST::PortfolioReports
         )
       end
@@ -194,7 +194,7 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#tenant_settings' do
       it do
-        expect(subject.tenant_settings).to be_an_instance_of(
+        expect(client.tenant_settings).to be_an_instance_of(
           FinApps::REST::TenantSettings
         )
       end
@@ -202,23 +202,15 @@ RSpec.describe FinApps::REST::Client do
 
     describe '#tenant_app_settings' do
       it do
-        expect(subject.tenant_app_settings).to be_an_instance_of(
+        expect(client.tenant_app_settings).to be_an_instance_of(
           FinApps::REST::TenantAppSettings
         )
       end
     end
 
-    describe '#plaid_webhooks' do
-      it do
-        expect(subject.plaid_webhooks).to be_an_instance_of(
-          FinApps::REST::PlaidWebhooks
-        )
-      end
-    end
-
     describe '#plaid_institution_logos' do
       it do
-        expect(subject.plaid_institution_logos).to be_an_instance_of(
+        expect(client.plaid_institution_logos).to be_an_instance_of(
           FinApps::REST::PlaidInstitutionLogos
         )
       end