rock_rms 4.15.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41cc0f6ea6c7f644e2c873726cd21b454cb35a35
-  data.tar.gz: 9cd54ba92b23df44095a2a6f5d2cc0f6e7075083
+  metadata.gz: 9cdeba8c6445c28a97f6ae95e91b65731de96d4b
+  data.tar.gz: 8c6fd406588607a4c3f445f89c27a023ef3f78d1
 SHA512:
-  metadata.gz: 9bcc9f2d9c7c74dae5ed291b9e426674dd310d7cf8b16c53e891bcca04d13a92e675b2e84510c0614b6dd7a2b4c4b050e1958909ff724ef028155cef19cd7929
-  data.tar.gz: 686a624238a10934efec2a9f557146bea99843f987e497a5b9c550402d1e4044ed511d04a366263976de17dba1e4ca7129ceadbd63c478012dd481662a28444d
+  metadata.gz: e87c92795588370db7d42df6ced5654be5c365a457df0e1a343ee80e1e79e5605203977ad2e160725097e10b7c2543cf5f58e3371b6b6b51fb3b64e0149fd9af
+  data.tar.gz: 818a07c9b3fa588175a9ad62c686e5c08342dc3971d2ff62b6a3b178ae566a55b715fe1b935582a738cd185dd6ee274e1896e09de6d421da17bb7bd4235ade8c

data/lib/rock_rms/client.rb

@@ -27,6 +27,7 @@ module RockRMS
     include RockRMS::Client::Person
     include RockRMS::Client::PhoneNumber
     include RockRMS::Client::RecurringDonation
+    include RockRMS::Client::RecurringDonationDetail
     include RockRMS::Client::Refund
     include RockRMS::Client::RefundReason
     include RockRMS::Client::SavedPaymentMethod
@@ -38,13 +39,14 @@ module RockRMS
     include RockRMS::Client::WorkflowActivityType
     include RockRMS::Client::WorkflowType
 
-    attr_reader :url, :username, :password, :logger, :cookie, :connection
+    attr_reader :url, :username, :password, :logger, :cookie, :connection, :adapter
 
-    def initialize(url:, username:, password:, logger: true)
+    def initialize(url:, username:, password:, logger: true, adapter: Faraday.default_adapter)
       @url      = "#{url}/api/"
       @username = username
       @password = password
       @logger   = logger
+      @adapter  = adapter
       @cookie   = auth['set-cookie']
     end
 
@@ -92,7 +94,7 @@ module RockRMS
         conn.response  :logger if logger
         conn.response  :oj
         conn.use       FaradayMiddleware::RockRMSErrorHandler
-        conn.adapter   Faraday.default_adapter
+        conn.adapter   adapter
       end
     end
   end

data/lib/rock_rms/error.rb

@@ -1,5 +1,11 @@
 module RockRMS
   class Error < StandardError; end
+  class BadRequest < Error; end
+  class Forbidden < Error; end
+  class GatewayTimeout < Error; end
+  class InternalServerError < Error; end
+  class NotFound < Error; end
+  class Unauthorized < Error; end
 end
 
 require 'faraday'
@@ -9,6 +15,18 @@ module FaradayMiddleware
 
     def on_complete(env)
       case env[:status]
+      when 400
+        raise RockRMS::BadRequest, "#{env[:status]}: #{env[:body]} #{env[:url]}"
+      when 401
+        raise RockRMS::Unauthorized, "#{env[:status]}: #{env[:body]} #{env[:url]}"
+      when 403
+        raise RockRMS::Forbidden, "#{env[:status]}: #{env[:body]} #{env[:url]}"
+      when 404
+        raise RockRMS::NotFound, "#{env[:status]}: #{env[:body]} #{env[:url]}"
+      when 500
+        raise RockRMS::InternalServerError, "#{env[:status]}: #{env[:body]} #{env[:url]}"
+      when 504
+        raise RockRMS::GatewayTimeout, "#{env[:status]}: #{env[:body]} #{env[:url]}"
       when ERROR_STATUSES
         raise RockRMS::Error, "#{env[:status]}: #{env[:body]} #{env[:url]}"
       end

data/lib/rock_rms/resources/recurring_donation.rb

@@ -20,6 +20,7 @@ module RockRMS
         gateway_id: nil,
         gateway_schedule_id: nil,
         next_payment_date:,
+        payment_detail_id: nil,
         source_type_id: 10,
         transaction_code: nil,
         start_date:
@@ -32,6 +33,7 @@ module RockRMS
           'NextPaymentDate'             => next_payment_date,
           'IsActive'                    => active,
           'FinancialGatewayId'          => gateway_id,
+          'FinancialPaymentDetailId'    => payment_detail_id,
           'TransactionCode'             => transaction_code,
           'ScheduledTransactionDetails' => translate_funds(funds),
           'GatewayScheduleId'           => gateway_schedule_id,
@@ -45,11 +47,13 @@ module RockRMS
         id,
         next_payment_date:,
         transaction_code: nil,
+        payment_detail_id: nil,
         active: nil
       )
         options = { 'NextPaymentDate' => next_payment_date }
-        options['TransactionCode'] = transaction_code if transaction_code
-        options['IsActive']        = active           if !active.nil?
+        options['FinancialPaymentDetailId'] = payment_detail_id if payment_detail_id
+        options['TransactionCode']          = transaction_code  if transaction_code
+        options['IsActive']                 = active            if !active.nil?
 
         patch(recurring_donation_path(id), options)
       end

data/lib/rock_rms/resources/recurring_donation_detail.rb

@@ -0,0 +1,19 @@
+module RockRMS
+  class Client
+    module RecurringDonationDetail
+      def update_recurring_donation_detail(id, fund_id: nil, amount: nil)
+        options = {}
+        options['AccountId'] = fund_id if fund_id
+        options['Amount']    = amount  if amount
+
+        patch(recurring_donation_detail_path(id), options)
+      end
+
+      private
+
+      def recurring_donation_detail_path(id = nil)
+        id ? "FinancialScheduledTransactionDetails/#{id}" : 'FinancialScheduledTransactionDetails'
+      end
+    end
+  end
+end

data/lib/rock_rms/resources/transaction_detail.rb

@@ -11,10 +11,11 @@ module RockRMS
         Response::TransactionDetail.format(res)
       end
 
-      def update_transaction_detail(id, fund_id:)
-        options = {
-          'AccountId' => fund_id
-        }
+      def update_transaction_detail(id, fund_id: nil, fee_amount: nil)
+        options = {}
+        options['AccountId'] = fund_id    if fund_id
+        options['FeeAmount'] = fee_amount if fee_amount
+
         patch(transaction_detail_path(id), options)
       end
 

data/lib/rock_rms/response/recurring_donation_details.rb

@@ -3,7 +3,8 @@ module RockRMS
     class RecurringDonationDetails < Base
       MAP = {
         amount: 'Amount',
-        fund_id: 'AccountId'
+        fund_id: 'AccountId',
+        id: 'Id'
       }.freeze
 
       def format_single(data)

data/lib/rock_rms/response/transaction_detail.rb

@@ -3,6 +3,7 @@ module RockRMS
     class TransactionDetail < Base
       MAP = {
         id: 'Id',
+        fee_amount: 'FeeAmount',
         fund: 'Account',
         fund_id: 'AccountId',
         amount: 'Amount'

data/lib/rock_rms/version.rb

@@ -1,3 +1,3 @@
 module RockRMS
-  VERSION = '4.15.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/rock_rms.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency     'faraday_middleware-parse_oj'
   s.add_runtime_dependency     'json'
 
-  s.add_development_dependency 'bundler', '~> 1.15'
+  s.add_development_dependency 'bundler', '~> 2.0'
   s.add_development_dependency 'dotenv'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake', '~> 10.4'

data/spec/rock_rms/resources/recurring_donation_detail_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+RSpec.describe RockRMS::Client::RecurringDonationDetail, type: :model do
+  include_context 'resource specs'
+
+  describe '#update_recurring_donation_detail' do
+    subject(:resource) do
+      client.update_recurring_donation_detail(
+        123,
+        fund_id: 2,
+        amount: 100.0
+      )
+    end
+
+    it 'returns nothing' do
+      expect(client.update_recurring_donation_detail(123, fund_id: 5, amount: 100.0)).to eq(nil)
+    end
+
+    it 'passes options' do
+      expect(client).to receive(:patch)
+        .with(
+          'FinancialScheduledTransactionDetails/123',
+          'AccountId' => 2,
+          'Amount' => 100.0
+        ).and_call_original
+      resource
+    end
+  end
+end

data/spec/rock_rms/resources/recurring_donation_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe RockRMS::Client::RecurringDonation, type: :model do
   end
 
   describe '#update_recurring_donation(id)' do
-    it 'queries updates the recurring donation' do
+    it 'updates the recurring donation' do
       expect(client).to receive(:patch)
         .with(
           'FinancialScheduledTransactions/123',
@@ -137,6 +137,7 @@ RSpec.describe RockRMS::Client::RecurringDonation, type: :model do
           'NextPaymentDate' => '2010-01-01',
           'IsActive' => true,
           'FinancialGatewayId' => nil,
+          'FinancialPaymentDetailId' => nil,
           'TransactionCode' => 'asdf',
           'ScheduledTransactionDetails' => [{ 'Amount' => 450, 'AccountId' => 2 }],
           'GatewayScheduleId' => nil,

data/spec/support/rock_mock.rb

@@ -76,7 +76,8 @@ class RockMock < Sinatra::Base
     'FinancialBatches/:id',
     'FinancialScheduledTransactions/:id',
     'FinancialTransactions/:id',
-    'FinancialTransactionDetails/:id'
+    'FinancialTransactionDetails/:id',
+    'FinancialScheduledTransactionDetails/:id',
   ].each do |end_point|
     patch "/api/#{end_point}" do
       content_type :json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rock_rms
 version: !ruby/object:Gem::Version
-  version: 4.15.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ files:
 - lib/rock_rms/resources/person.rb
 - lib/rock_rms/resources/phone_number.rb
 - lib/rock_rms/resources/recurring_donation.rb
+- lib/rock_rms/resources/recurring_donation_detail.rb
 - lib/rock_rms/resources/refund.rb
 - lib/rock_rms/resources/refund_reason.rb
 - lib/rock_rms/resources/saved_payment_method.rb
@@ -253,6 +254,7 @@ files:
 - spec/rock_rms/resources/payment_detail_spec.rb
 - spec/rock_rms/resources/person_spec.rb
 - spec/rock_rms/resources/phone_number_spec.rb
+- spec/rock_rms/resources/recurring_donation_detail_spec.rb
 - spec/rock_rms/resources/recurring_donation_spec.rb
 - spec/rock_rms/resources/refund_reason_spec.rb
 - spec/rock_rms/resources/refund_spec.rb