rock_rms 4.16.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2698256029e51587f5e1a3a2a0b80421a92b9f
-  data.tar.gz: 91a61ff2f1697acda2df3772ee450c7a4183de22
+  metadata.gz: 254d23847753a9c7485898497ce71ae8e8c0a1e0
+  data.tar.gz: 9e72e019d5a769b61a9c1ec2c85bc2d7027c2654
 SHA512:
-  metadata.gz: e71bd856204fd0be1e3c81c93c9f13bf29d6052eb3f19b2d3adb65ec14341fd830ec8d3c2c3dad0b5a4cc460fc95acb393d9fafb5ab65cbe5f836e5ca56e2216
-  data.tar.gz: 51bf11afe177f2268e8cf09a715b17aafc946b00aa06da83fa05349eea7de7e638d006d8377c131036bdcbbe1e5a22fcf3da953280f8332ab84df648a4637918
+  metadata.gz: 07573a1687f67e903c1b2aac4383c56f8eae27f946db1ea22dc685afc3429e0a08661bfd6ff825f916d8ca93cf821183b0bb3ad71e94e20c601ed442c3067c1a
+  data.tar.gz: cb827f4264e4c8b7587aeb68af53a9b45dac71f119fa6496fe696f35a037c1d388259716ae73ef42eb97e7018a8b210ced22ba9224c042b2254655e0383da87a

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,12 @@
 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 ServiceUnavailable < Error; end
+  class Unauthorized < Error; end
 end
 
 require 'faraday'
@@ -9,9 +16,29 @@ module FaradayMiddleware
 
     def on_complete(env)
       case env[:status]
+      when 400
+        raise RockRMS::BadRequest, error_message(env)
+      when 401
+        raise RockRMS::Unauthorized, error_message(env)
+      when 403
+        raise RockRMS::Forbidden, error_message(env)
+      when 404
+        raise RockRMS::NotFound, error_message(env)
+      when 500
+        raise RockRMS::InternalServerError, error_message(env)
+      when 503
+        raise RockRMS::ServiceUnavailable, error_message(env)
+      when 504
+        raise RockRMS::GatewayTimeout, error_message(env)
       when ERROR_STATUSES
-        raise RockRMS::Error, "#{env[:status]}: #{env[:body]} #{env[:url]}"
+        raise RockRMS::Error, error_message(env)
       end
     end
+
+    private
+
+    def error_message(env)
+      "#{env[:status]}: #{env[:url]} #{env[:body]}"
+    end
   end
 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/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/version.rb

@@ -1,3 +1,3 @@
 module RockRMS
-  VERSION = '4.16.0'.freeze
+  VERSION = '5.2.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/error_spec.rb

@@ -18,9 +18,11 @@ RSpec.describe RockRMS::Error do
   end
 
   def expect_failure(code, body)
+    url = 'http://some-rock-uri.com/api/Auth/Login'
+
     expect {
       client.get('anything')
-    }.to raise_error(RockRMS::Error, /#{code}: #{body}/)
+    }.to raise_error(RockRMS::Error, /#{code}: #{url} #{body}/)
   end
 
   def expect_success

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.16.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-07 00:00:00.000000000 Z
+date: 2020-07-03 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