rock_rms 6.2.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c736d626c3e10da442946c804afb51495b72dbd639eb1618ddf02f5014373b
-  data.tar.gz: 530f44eb1fc23905e1c73f8fb1520758211437cd9ef274edc6cec40022912fab
+  metadata.gz: e2a4fa58c26f7319dbc70a9caa55a0195f1f9516e941d706e0fd0d21dab41d32
+  data.tar.gz: e73dfae38fcb5e46109e46338354a6b080f017bdbee844b363f54dd855cbd72b
 SHA512:
-  metadata.gz: b9310ac0e808dc7b62cc60cea9aa8137db0d5905caec35ae13d5cb0e1d59f15980f2a06ae63bbaa7c3b63e66181292769a711f8c5ebb9bc8c2bf465c7c6f4ac3
-  data.tar.gz: 5791b298548d265583c4258a09817f6e38f2720c86e6044fa77d23cbf9c097d81654fff0013922ad997e8764cdb262104c2b83c11562a75ab97aa1c2a64de0de
+  metadata.gz: e3b5ea27899ea899d8e4a101cac5276e7a9d7aab01892fbb23bd84f0a90bcd4025484d8f73aba87e550fb9a6722afc71eee48329f567b952f4f2f33540bce21b
+  data.tar.gz: 222a7a3bff1c2e5d60836d916cbdfcf67985b5e569926395f3fa2c622f50de85f5cca3b6f5ff9a3fe0643108c11620ccfe5889ffb7b860749f98406d3cef02fa

data/lib/rock_rms/client.rb

@@ -1,6 +1,5 @@
 require 'faraday'
 require 'faraday_middleware'
-require 'faraday_middleware/parse_oj'
 
 Dir[File.expand_path('../resources/*.rb', __FILE__)].each { |f| require f }
 require File.expand_path('../response/base.rb', __FILE__)
@@ -79,7 +78,7 @@ module RockRMS
     def auth
       begin
         auth_request('Auth/Login')
-      rescue Faraday::Error::ParsingError => e
+      rescue Faraday::ParsingError => e
         if e.message.include?('Document Moved')
           auth_request('auth/login')
         else

data/lib/rock_rms/parse_oj.rb

@@ -0,0 +1,13 @@
+require 'faraday_middleware/response_middleware'
+
+module FaradayMiddleware
+  class ParseOj < ResponseMiddleware
+    dependency 'oj'
+
+    define_parser do |body|
+      Oj.load(body, mode: :compat) unless body.strip.empty?
+    end
+  end
+end
+
+Faraday::Response.register_middleware(oj: FaradayMiddleware::ParseOj)

data/lib/rock_rms/version.rb

@@ -1,3 +1,3 @@
 module RockRMS
-  VERSION = '6.2.0'.freeze
+  VERSION = '7.0.2'.freeze
 end

data/lib/rock_rms.rb

@@ -1,5 +1,6 @@
 require_relative 'rock_rms/client'
 require_relative 'rock_rms/error'
+require_relative 'rock_rms/parse_oj'
 require_relative 'rock_rms/version'
 
 module RockRMS

data/rock_rms.gemspec

@@ -16,16 +16,16 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test)/})
 
-  s.required_ruby_version = '~> 2.3'
+  s.required_ruby_version = '~> 2.7'
 
   s.require_paths = ['lib']
 
   s.add_runtime_dependency     'faraday'
   s.add_runtime_dependency     'faraday_middleware'
-  s.add_runtime_dependency     'faraday_middleware-parse_oj'
   s.add_runtime_dependency     'json'
+  s.add_runtime_dependency     'oj'
 
-  s.add_development_dependency 'bundler', '~> 2.0'
+  s.add_development_dependency 'bundler', '~> 2.3'
   s.add_development_dependency 'dotenv'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 12.3.3'

data/spec/rock_rms/client_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe RockRMS::Client do
   end
   let(:attrs_without_logging) { attrs.merge(logger: false) }
 
-  subject(:client) { described_class.new(attrs_without_logging) }
-  let(:noisy_client) { described_class.new(attrs) }
+  subject(:client) { described_class.new(**attrs_without_logging) }
+  let(:noisy_client) { described_class.new(**attrs) }
 
   describe '#initialize' do
     it 'requries `url` param' do
@@ -33,7 +33,7 @@ RSpec.describe RockRMS::Client do
       it 'expects a valid URI' do
         expect do
           described_class.new(url: 'test', username: 'test', password: 'test')
-        end.to raise_error(URI::InvalidURIError)
+        end.to raise_error(URI::BadURIError)
       end
     end
   end

data/spec/rock_rms/resources/attribute_spec.rb

@@ -53,17 +53,19 @@ RSpec.describe RockRMS::Client::Attribute, type: :model do
       expect(client).to receive(:post)
         .with(
           'Attributes',
-          'FieldTypeId' => 14,
-          'EntityTypeId' => 85,
-          'Key' => 'TransactionFee',
-          'Name' => 'Transaction Fee',
-          'Description' => 'Transaction fees for a specific gateway',
-          'Order' => 1234,
-          'IsSystem'     => false,
-          'IsGridColumn' => false,
-          'IsMultiValue' => false,
-          'IsRequired'   => false,
-          'AllowSearch'  => false
+          {
+            'FieldTypeId' => 14,
+            'EntityTypeId' => 85,
+            'Key' => 'TransactionFee',
+            'Name' => 'Transaction Fee',
+            'Description' => 'Transaction fees for a specific gateway',
+            'Order' => 1234,
+            'IsSystem'     => false,
+            'IsGridColumn' => false,
+            'IsMultiValue' => false,
+            'IsRequired'   => false,
+            'AllowSearch'  => false
+          }
         )
         .and_call_original
       resource

data/spec/rock_rms/resources/attribute_values_spec.rb

@@ -45,10 +45,12 @@ RSpec.describe RockRMS::Client::AttributeValue, type: :model do
       expect(client).to receive(:post)
         .with(
           'AttributeValues',
-          'AttributeId' => 12993,
-          'EntityId'    => 731,
-          'Value'       => 100,
-          'IsSystem'    => false
+          {
+            'AttributeId' => 12993,
+            'EntityId'    => 731,
+            'Value'       => 100,
+            'IsSystem'    => false
+          }
         )
         .and_call_original
       resource

data/spec/rock_rms/resources/batch_spec.rb

@@ -69,12 +69,14 @@ RSpec.describe RockRMS::Client::Batch, type: :model do
       expect(client).to receive(:post)
         .with(
           'FinancialBatches',
-          'Name' => '1',
-          'CampusId' => 1,
-          'BatchStartDateTime' => '1',
-          'BatchEndDateTime' => '1',
-          'ForeignKey' => 1,
-          'Status' => 1
+          {
+            'Name' => '1',
+            'CampusId' => 1,
+            'BatchStartDateTime' => '1',
+            'BatchEndDateTime' => '1',
+            'ForeignKey' => 1,
+            'Status' => 1
+          }
         ).and_call_original
       resource
     end
@@ -97,8 +99,10 @@ RSpec.describe RockRMS::Client::Batch, type: :model do
       expect(client).to receive(:patch)
         .with(
           'FinancialBatches/123',
-          'Name' => '1',
-          'ForeignKey' => 1
+          {
+            'Name' => '1',
+            'ForeignKey' => 1
+          }
         ).and_call_original
       resource
     end

data/spec/rock_rms/resources/group_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe RockRMS::Client::Group, type: :model do
 
     it 'passes options' do
       expect(client).to receive(:get)
-        .with('Groups', option1: '1')
+        .with('Groups', { option1: '1' })
         .and_return([])
       client.list_groups(option1: '1')
     end
@@ -95,7 +95,7 @@ RSpec.describe RockRMS::Client::Group, type: :model do
 
     it 'passes options' do
       expect(client).to receive(:get)
-        .with('Groups/GetFamilies/123', option1: '1')
+        .with('Groups/GetFamilies/123', { option1: '1' })
         .and_return([])
       client.list_families_for_person(123, option1: '1')
     end

data/spec/rock_rms/resources/payment_detail_spec.rb

@@ -31,9 +31,11 @@ RSpec.describe RockRMS::Client::PaymentDetail, type: :model do
       expect(client).to receive(:post)
         .with(
           'FinancialPaymentDetails',
-          'CurrencyTypeValueId' => 156,
-          'CreditCardTypeValueId' => 159,
-          'ForeignKey' => nil
+          {
+            'CurrencyTypeValueId' => 156,
+            'CreditCardTypeValueId' => 159,
+            'ForeignKey' => nil
+          }
         )
         .and_call_original
       resource

data/spec/rock_rms/resources/phone_number_spec.rb

@@ -36,11 +36,13 @@ RSpec.describe RockRMS::Client::PhoneNumber, type: :model do
       expect(client).to receive(:post)
         .with(
           'PhoneNumbers',
-          'IsSystem' => true,
-          'IsMessagingEnabled' => false,
-          'NumberTypeValueId' => 13,
-          'Number' => '5555555555',
-          'PersonId' => 1
+          {
+            'IsSystem' => true,
+            'IsMessagingEnabled' => false,
+            'NumberTypeValueId' => 13,
+            'Number' => '5555555555',
+            'PersonId' => 1
+          }
         ).and_call_original
       resource
     end
@@ -61,7 +63,7 @@ RSpec.describe RockRMS::Client::PhoneNumber, type: :model do
 
     it 'passes options' do
       expect(client).to receive(:get)
-        .with('PhoneNumbers', option1: '1')
+        .with('PhoneNumbers', { option1: '1' })
         .and_return([])
       client.list_phone_numbers(option1: '1')
     end

data/spec/rock_rms/resources/recurring_donation_detail_spec.rb

@@ -38,9 +38,11 @@ RSpec.describe RockRMS::Client::RecurringDonationDetail, type: :model do
       expect(client).to receive(:post)
         .with(
           'FinancialScheduledTransactionDetails',
-          'AccountId' => 1,
-          'ScheduledTransactionId' => 1,
-          'Amount' => 5.00,
+          {
+            'AccountId' => 1,
+            'ScheduledTransactionId' => 1,
+            'Amount' => 5.00,
+          }
         )
         .and_call_original
       resource
@@ -64,8 +66,10 @@ RSpec.describe RockRMS::Client::RecurringDonationDetail, type: :model do
       expect(client).to receive(:patch)
         .with(
           'FinancialScheduledTransactionDetails/123',
-          'AccountId' => 2,
-          'Amount' => 100.0
+          {
+            'AccountId' => 2,
+            'Amount' => 100.0
+          }
         ).and_call_original
       resource
     end

data/spec/rock_rms/resources/recurring_donation_spec.rb

@@ -53,7 +53,9 @@ RSpec.describe RockRMS::Client::RecurringDonation, type: :model do
       expect(client).to receive(:patch)
         .with(
           'FinancialScheduledTransactions/123',
-          'NextPaymentDate' => '2018-01-01'
+          {
+            'NextPaymentDate' => '2018-01-01'
+          }
       ).and_call_original
 
       resource = client.update_recurring_donation(
@@ -131,18 +133,20 @@ RSpec.describe RockRMS::Client::RecurringDonation, type: :model do
       expect(client).to receive(:post)
         .with(
           'FinancialScheduledTransactions',
-          'AuthorizedPersonAliasId' => 1,
-          'TransactionFrequencyValueId' => 135,
-          'StartDate' => '2010-01-01',
-          'NextPaymentDate' => '2010-01-01',
-          'IsActive' => true,
-          'FinancialGatewayId' => nil,
-          'FinancialPaymentDetailId' => nil,
-          'TransactionCode' => 'asdf',
-          'ScheduledTransactionDetails' => [{ 'Amount' => 450, 'AccountId' => 2, 'EntityId' => nil, 'EntityTypeId' => nil, 'FeeAmount' => nil, 'FeeCoverageAmount' => nil}],
-          'GatewayScheduleId' => nil,
-          'SourceTypeValueId' => 10,
-          'ForeignKey' => nil
+          {
+            'AuthorizedPersonAliasId' => 1,
+            'TransactionFrequencyValueId' => 135,
+            'StartDate' => '2010-01-01',
+            'NextPaymentDate' => '2010-01-01',
+            'IsActive' => true,
+            'FinancialGatewayId' => nil,
+            'FinancialPaymentDetailId' => nil,
+            'TransactionCode' => 'asdf',
+            'ScheduledTransactionDetails' => [{ 'Amount' => 450, 'AccountId' => 2, 'EntityId' => nil, 'EntityTypeId' => nil, 'FeeAmount' => nil, 'FeeCoverageAmount' => nil}],
+            'GatewayScheduleId' => nil,
+            'SourceTypeValueId' => 10,
+            'ForeignKey' => nil
+          }
         )
         .and_call_original
       resource

data/spec/rock_rms/resources/refund_reason_spec.rb

@@ -42,12 +42,14 @@ RSpec.describe RockRMS::Client::RefundReason, type: :model do
       expect(client).to receive(:post)
         .with(
           'DefinedValues',
-          'DefinedTypeId' => 37,
-          'IsSystem' => false,
-          'Order' => 500,
-          'Description' => "Very Very not Happy",
-          'Value' => "Angry Donor",
-          'IsActive' => false
+          {
+            'DefinedTypeId' => 37,
+            'IsSystem' => false,
+            'Order' => 500,
+            'Description' => "Very Very not Happy",
+            'Value' => "Angry Donor",
+            'IsActive' => false
+          }
         )
         .and_call_original
       resource

data/spec/rock_rms/resources/refund_spec.rb

@@ -46,30 +46,32 @@ RSpec.describe RockRMS::Client::Refund, type: :model do
         expect(client).to receive(:post)
           .with(
             'FinancialTransactionRefunds',
-            'OriginalTransactionId' => 3000,
-            'RefundReasonValueId' => 1,
-            'FinancialTransaction' => {
-              'AuthorizedPersonAliasId' => 120,
-              'BatchId' => 1,
-              'FinancialGatewayId' => nil,
-              'FinancialPaymentDetailId' => 156,
-              'TransactionDateTime' => '2018-02-01',
-              'TransactionDetails'  => [
-                {
-                  "Amount"=>-10.0,
-                  "AccountId"=>23,
-                  "EntityTypeId" => nil,
-                  "EntityId" => nil
-                },
-                {
-                  "Amount"=> -90.0,
-                  "AccountId"=>24,
-                  "EntityTypeId" => nil,
-                  "EntityId" => nil
-                }
-              ],
-              'TransactionTypeValueId' => 53,
-              'TransactionCode' => nil
+            {
+              'OriginalTransactionId' => 3000,
+              'RefundReasonValueId' => 1,
+              'FinancialTransaction' => {
+                'AuthorizedPersonAliasId' => 120,
+                'BatchId' => 1,
+                'FinancialGatewayId' => nil,
+                'FinancialPaymentDetailId' => 156,
+                'TransactionDateTime' => '2018-02-01',
+                'TransactionDetails'  => [
+                  {
+                    "Amount"=>-10.0,
+                    "AccountId"=>23,
+                    "EntityTypeId" => nil,
+                    "EntityId" => nil
+                  },
+                  {
+                    "Amount"=> -90.0,
+                    "AccountId"=>24,
+                    "EntityTypeId" => nil,
+                    "EntityId" => nil
+                  }
+                ],
+                'TransactionTypeValueId' => 53,
+                'TransactionCode' => nil
+              }
             }
           )
           .and_call_original
@@ -79,7 +81,6 @@ RSpec.describe RockRMS::Client::Refund, type: :model do
     end
 
     context "with amount param" do
-
       subject(:resource) do
         client.create_refund(
           transaction_id: 3000,
@@ -98,30 +99,32 @@ RSpec.describe RockRMS::Client::Refund, type: :model do
         expect(client).to receive(:post)
           .with(
             'FinancialTransactionRefunds',
-            'OriginalTransactionId' => 3000,
-            'RefundReasonValueId' => 1,
-            'FinancialTransaction' => {
-              'AuthorizedPersonAliasId' => 120,
-              'BatchId' => 1,
-              'FinancialGatewayId' => nil,
-              'FinancialPaymentDetailId' => 156,
-              'TransactionDateTime' => '2018-02-01',
-              'TransactionDetails'  => [
-                {
-                  "Amount"=>-7.56,
-                  "AccountId"=>23,
-                  "EntityTypeId" => nil,
-                  "EntityId" => nil
-                },
-                {
-                  "Amount"=>-67.99,
-                  "AccountId"=>24,
-                  "EntityTypeId" => nil,
-                  "EntityId" => nil
-                }
-              ],
-              'TransactionTypeValueId' => 53,
-              'TransactionCode' => nil
+            {
+              'OriginalTransactionId' => 3000,
+              'RefundReasonValueId' => 1,
+              'FinancialTransaction' => {
+                'AuthorizedPersonAliasId' => 120,
+                'BatchId' => 1,
+                'FinancialGatewayId' => nil,
+                'FinancialPaymentDetailId' => 156,
+                'TransactionDateTime' => '2018-02-01',
+                'TransactionDetails'  => [
+                  {
+                    "Amount"=>-7.56,
+                    "AccountId"=>23,
+                    "EntityTypeId" => nil,
+                    "EntityId" => nil
+                  },
+                  {
+                    "Amount"=>-67.99,
+                    "AccountId"=>24,
+                    "EntityTypeId" => nil,
+                    "EntityId" => nil
+                  }
+                ],
+                'TransactionTypeValueId' => 53,
+                'TransactionCode' => nil
+              }
             }
           )
           .and_call_original

data/spec/rock_rms/resources/saved_payment_method_spec.rb

@@ -57,12 +57,14 @@ RSpec.describe RockRMS::Client::SavedPaymentMethod, type: :model do
       expect(client).to receive(:post)
         .with(
           'FinancialPersonSavedAccounts',
-          'Name' => 'Sapphire Preferred',
-          'ReferenceNumber' => 'card_1234',
-          'PersonAliasId' => 1,
-          'IsDefault' => 0,
-          'FinancialGatewayId' => 2,
-          'FinancialPaymentDetailId' => 1
+          {
+            'Name' => 'Sapphire Preferred',
+            'ReferenceNumber' => 'card_1234',
+            'PersonAliasId' => 1,
+            'IsDefault' => 0,
+            'FinancialGatewayId' => 2,
+            'FinancialPaymentDetailId' => 1
+          }
         ).and_call_original
       resource
     end

data/spec/rock_rms/resources/transaction_detail_spec.rb

@@ -50,7 +50,9 @@ RSpec.describe RockRMS::Client::TransactionDetail, type: :model do
         expect(client).to receive(:patch)
           .with(
             'FinancialTransactionDetails/123',
-            'AccountId' => 2
+            {
+              'AccountId' => 2
+            }
           ).and_call_original
         resource
       end
@@ -70,9 +72,11 @@ RSpec.describe RockRMS::Client::TransactionDetail, type: :model do
         expect(client).to receive(:patch)
           .with(
             'FinancialTransactionDetails/123',
-            'FeeAmount' => 50,
-            'FeeCoverageAmount' => 45,
-            'AccountId' => 2
+            {
+              'FeeAmount' => 50,
+              'FeeCoverageAmount' => 45,
+              'AccountId' => 2
+            }
           ).and_call_original
         resource
       end

data/spec/rock_rms/resources/transaction_spec.rb

@@ -78,17 +78,19 @@ RSpec.describe RockRMS::Client::Transaction, type: :model do
       expect(client).to receive(:post)
         .with(
           'FinancialTransactions',
-          'AuthorizedPersonAliasId' => 1,
-          'ScheduledTransactionId' => 1,
-          'BatchId' => 1,
-          'FinancialGatewayId' => nil,
-          'FinancialPaymentDetailId' => 1,
-          'TransactionCode' => 'asdf',
-          'TransactionDateTime' => 1,
-          'TransactionDetails' => [{ 'Amount' => 450, 'AccountId' => 2, 'EntityTypeId' => nil, 'EntityId' => nil, 'FeeAmount' => nil, 'FeeCoverageAmount' => nil }],
-          'TransactionTypeValueId' => 53,
-          'SourceTypeValueId' => 10,
-          'Summary' => 'taco tuesday'
+          {
+            'AuthorizedPersonAliasId' => 1,
+            'ScheduledTransactionId' => 1,
+            'BatchId' => 1,
+            'FinancialGatewayId' => nil,
+            'FinancialPaymentDetailId' => 1,
+            'TransactionCode' => 'asdf',
+            'TransactionDateTime' => 1,
+            'TransactionDetails' => [{ 'Amount' => 450, 'AccountId' => 2, 'EntityTypeId' => nil, 'EntityId' => nil, 'FeeAmount' => nil, 'FeeCoverageAmount' => nil }],
+            'TransactionTypeValueId' => 53,
+            'SourceTypeValueId' => 10,
+            'Summary' => 'taco tuesday'
+          }
         )
         .and_call_original
       resource
@@ -114,10 +116,12 @@ RSpec.describe RockRMS::Client::Transaction, type: :model do
       expect(client).to receive(:patch)
         .with(
           'FinancialTransactions/123',
-          'BatchId' => 1,
-          'Summary' => 'taco tuesday',
-          'TransactionTypeValueId' => 54,
-          'SourceTypeValueId' => 5
+          {
+            'BatchId' => 1,
+            'Summary' => 'taco tuesday',
+            'TransactionTypeValueId' => 54,
+            'SourceTypeValueId' => 5
+          }
         )
         .and_call_original
       resource

data/spec/support/client_factory.rb

@@ -8,5 +8,5 @@ RSpec.shared_context 'resource specs' do
   end
   let(:attrs_without_logging) { attrs.merge(logger: false) }
 
-  let(:client) { RockRMS::Client.new(attrs_without_logging) }
+  let(:client) { RockRMS::Client.new(**attrs_without_logging) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rock_rms
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware-parse_oj
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - lib/rock_rms.rb
 - lib/rock_rms/client.rb
 - lib/rock_rms/error.rb
+- lib/rock_rms/parse_oj.rb
 - lib/rock_rms/recurring_frequencies.rb
 - lib/rock_rms/resources/attribute.rb
 - lib/rock_rms/resources/attribute_value.rb
@@ -350,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="