rock_rms 7.0.0 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbf6c404818d64db447dec9684bf68e4ecbf8410bf0eb56e415e29cb871acf95
-  data.tar.gz: 15a858db3f54c8075c8b49797ce98ac563068657d9646037a7002080a122a8c1
+  metadata.gz: d50622be87ae69275c27c620dcc9e21d5e473c700554219f7ac4eb29b854ba6e
+  data.tar.gz: 01d46085478582b1add636fa558932a7df8f0f99546c66f29f0494de38353c6d
 SHA512:
-  metadata.gz: 9475d6bdb74146d458dd4ec30806823f9218c971eba9515b49897791e9faf5f93305fd84ab182f6c9f5d38fc56ee0c2b9b24a5fcaee1407c6fff9f8aca58f4a3
-  data.tar.gz: 4b4b766e497632de3a72c3122929e51db8b87ae6906ae18c3a486b4b91e07245e513d3dd2d6f3f0b933860e916e20241e3bfd1f575f24b628e7c11b9e092fc9d
+  metadata.gz: '09895f32647c2cf61724fdc79d11965da9294a253eaa95544a53d29bcfd877c41f9976150dd91b311f41b45ac32795586ae83b93a448ff073b8a502eadecc4a7'
+  data.tar.gz: 520aa2aaf064a0a5efecfd6b418b48fbb1559a30b94584f77a59a6675b7156d905fb6ae9b25534c11601c8ecd11fe7bed8f95d74caf747c58a7cf4ad1c10e39b

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/response/attribute.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Attribute < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         key: 'Key',
         description: 'Description'

data/lib/rock_rms/response/attribute_value.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class AttributeValue < Base
       MAP = {
-        id: 'Id',
         value: 'Value',
         value_as_number: 'ValueAsNumeric',
         entity_id: 'EntityId'

data/lib/rock_rms/response/base.rb

@@ -3,6 +3,12 @@ module RockRMS
     class Base
       attr_reader :data
 
+      BASE_MAPPING = {
+        id: 'Id',
+        created_date_time: 'CreatedDateTime',
+        modified_date_time: 'ModifiedDateTime'
+      }.freeze
+
       def self.format(data)
         new(data).format
       end
@@ -22,9 +28,11 @@ module RockRMS
       def to_h(dict, data)
         return {} if data.nil?
 
-        dict.each_with_object({}) do |(l, r), object|
-          object[l] = data[r]
-        end
+        dict
+          .merge(BASE_MAPPING)
+          .each_with_object({}) do |(l, r), object|
+            object[l] = data[r]
+          end
       end
     end
   end

data/lib/rock_rms/response/batch.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Batch < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         control_amount: 'ControlAmount',
         transactions: 'Transactions',

data/lib/rock_rms/response/block.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Block < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         block_type: 'BlockType',
         page_id: 'PageId'

data/lib/rock_rms/response/block_type.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class BlockType < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         description: 'Description',
         category: 'Category',

data/lib/rock_rms/response/campus.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Campus < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         is_active: 'IsActive',
         description: 'Description',

data/lib/rock_rms/response/defined_type.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class DefinedType < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         description: 'Description',
         defined_values: 'DefinedValues',

data/lib/rock_rms/response/defined_value.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class DefinedValue < Base
       MAP = {
-        id: 'Id',
         defined_type_id: 'DefinedTypeId',
         description: 'Description',
         order: 'Order',

data/lib/rock_rms/response/fund.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Fund < Base
       MAP = {
-        id:   'Id',
         campus_id: 'CampusId',
         name: 'Name',
         gl_code: 'GlCode'

data/lib/rock_rms/response/gateway.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Gateway < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         active: 'IsActive'
       }.freeze

data/lib/rock_rms/response/group.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Group < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         group_type_id: 'GroupTypeId',
         parent_group_id: 'ParentGroupId',

data/lib/rock_rms/response/group_location.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class GroupLocation < Base
       MAP = {
-        id: 'Id',
         group_id: 'GroupId',
         location_id: 'LocationId',
         guid: 'Guid'

data/lib/rock_rms/response/history.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class History < Base
       MAP = {
-        id: 'Id',
         verb: 'Verb',
         change_type: 'ChangeType',
         value_name: 'ValueName',

data/lib/rock_rms/response/location.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Location < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         is_active: 'IsActive',
         street1: 'Street1',

data/lib/rock_rms/response/page.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Page < Base
       MAP = {
-        id: 'Id',
         name: 'InternalName',
         page_title: 'PageTitle',
         browser_title: 'BrowserTitle',

data/lib/rock_rms/response/payment_detail.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class PaymentDetail < Base
       MAP = {
-        id: 'Id',
         exp_month: 'ExpirationMonth',
         exp_year: 'ExpirationYear',
         foreign_key: 'ForeignKey',

data/lib/rock_rms/response/person.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Person < Base
       MAP = {
-        id:         'Id',
         name:       'FullName',
         email:      'Email',
         first_name: 'FirstName',

data/lib/rock_rms/response/phone_number.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class PhoneNumber < Base
       MAP = {
-        id: 'Id',
         person_id: 'PersonId',
         number: 'Number',
         number_type_value_id: 'NumberTypeValueId',

data/lib/rock_rms/response/recurring_donation.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class RecurringDonation < Base
       MAP = {
-        id: 'Id',
         active: 'IsActive',
         financial_gateway_id: 'FinancialGatewayId',
         foreign_key: 'ForeignKey',

data/lib/rock_rms/response/recurring_donation_details.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class RecurringDonationDetails < Base
       MAP = {
-        id: 'Id',
         amount: 'Amount',
         fee_coverage_amount: 'FeeCoverageAmount',
         fund_id: 'AccountId',

data/lib/rock_rms/response/registration.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Registration < Base
       MAP = {
-        id: 'Id',
         first_name: 'FirstName',
         last_name: 'LastName',
         confirmation_email: 'ConfirmationEmail',

data/lib/rock_rms/response/registration_instance.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class RegistrationInstance < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         start_date: 'StartDateTime',
         end_date: 'EndDateTime',

data/lib/rock_rms/response/saved_payment_method.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class SavedPaymentMethod < Base
       MAP = {
-        id: 'Id',
         foreign_key: 'ForeignKey',
         gateway_id: 'FinancialGatewayId',
         gateway_person_id: 'GatewayPersonIdentifier',

data/lib/rock_rms/response/service_job.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class ServiceJob < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         active: 'IsActive',
         description: 'Description',

data/lib/rock_rms/response/transaction.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class Transaction < Base
       MAP = {
-        id: 'Id',
         date: 'TransactionDateTime',
         person: 'AuthorizedPersonAlias',
         person_id: 'AuthorizedPersonAliasId',

data/lib/rock_rms/response/transaction_detail.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class TransactionDetail < Base
       MAP = {
-        id: 'Id',
         fee_amount: 'FeeAmount',
         fee_coverage_amount: 'FeeCoverageAmount',
         fund: 'Account',

data/lib/rock_rms/response/workflow_activity_type.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class WorkflowActivityType < Base
       MAP = {
-        id: 'Id',
         name: 'Name',
         description: 'Description',
         order: 'Order',

data/lib/rock_rms/response/workflow_type.rb

@@ -2,7 +2,6 @@ module RockRMS
   module Response
     class WorkflowType < Base
       MAP = {
-        id: 'Id',
         active: 'IsActive',
         name: 'Name',
         description: 'Description',

data/lib/rock_rms/version.rb

@@ -1,3 +1,3 @@
 module RockRMS
-  VERSION = '7.0.0'.freeze
+  VERSION = '7.0.3'.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

@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   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.3'
   s.add_development_dependency 'dotenv'

data/spec/rock_rms/client_spec.rb

@@ -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/response/attribute_value_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe RockRMS::Response::AttributeValue, type: :model do
 
     it 'has the correct number keys' do
       keys = result.first.keys
-      expect(keys.count).to eq(4)
+      expect(keys.count).to eq(6)
     end
 
     it 'translates keys' do

data/spec/rock_rms/response/recurring_donation_spec.rb

@@ -15,7 +15,6 @@ RSpec.describe RockRMS::Response::RecurringDonation, type: :model do
     it 'has the following keys' do
       response = result.first
       expected_keys = %i[
-        id
         active
         financial_gateway_id
         foreign_key
@@ -30,6 +29,9 @@ RSpec.describe RockRMS::Response::RecurringDonation, type: :model do
         transaction_code
         transaction_type_id
         summary
+        id
+        created_date_time
+        modified_date_time
       ]
 
       expect(response.keys).to eq(expected_keys)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rock_rms
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.3
 platform: ruby
 authors:
 - Taylor Brooks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-16 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:
     - - ">="
@@ -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