laa-fee-calculator-client 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846930f03ac36c9166dcba3a25cc3b2b552f32b31861043fa1908741912da754
-  data.tar.gz: 3b5ec2435a93a7584eff62facedf12a8ab3c754f6f83bcabc625b1ef8fc96c07
+  metadata.gz: 52dad37ddaa604f0310847d554f9b406e43dd9b2153fa6d17a4dbea85762b102
+  data.tar.gz: 95a890df3d0845b5221dc665012f8b5871a239b1897821ca7a14ad7d1a9b6bb6
 SHA512:
-  metadata.gz: 953bba0d471745c2502a7dc9b0d7cc21c1a58fae009ce09777d419b4a9cc7177b25593d90476ed3536b2f17092b2f124336090dd6c600b7567021dc0f2d26113
-  data.tar.gz: 44e1ca22ff932959a6ddfab3046120b8d619647178e9e37957b23539176cee281916e24f23cc6b4fb409b0c58862c0650bf460eb2ee92032c0dbd0a0472e4e25
+  metadata.gz: eb5410870bc5c8a3e72338abe89dc2c6f17aa40bd5acca6823b8f8253b81d62664723295ea80f75f752c83ade5dae49643faa7cdd1e78359dbdc43697829e276
+  data.tar.gz: 247a6c9aadf2b51350a1c0b2521418cbff6d8e4ab2f257d13ce80b608005fc3fdb7fbb570c3b01f383c6d20f742ce8fe73f4c59fa208e28b8b847d5829e60a3b

data/CHANGELOG.md

@@ -13,6 +13,20 @@ Add latest change log entries at top using template:
 ### Removed
   -
 ```
+
+## Version 1.5.0
+
+### Added
+  - Support for Ruby 3.2 and 3.3
+
+### Removed
+  - Support for Ruby 2.6 and 2.7
+
+## Version 1.4.0
+
+### Added
+  - New configuration options for caching and logging
+
 ## Version 1.3.1
 
 ### Removed

data/Gemfile

@@ -6,3 +6,15 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in laa-fee-calculator-client.gemspec
 gemspec
+
+# Gems for development and test
+gem 'awesome_print'
+gem 'rake', '~> 13.0'
+gem 'rb-readline'
+gem 'rspec', '~> 3.0'
+gem 'rubocop', '~> 1.28'
+gem 'rubocop-performance', '~> 1.13'
+gem 'rubocop-rake', '~> 0.6'
+gem 'rubocop-rspec', '~> 2.10'
+gem 'vcr'
+gem 'webmock'

data/README.md

@@ -163,6 +163,17 @@ end
 
 ```
 
+## Caching
+
+Caching can be configured, with optional logging, by providing a cache store:
+
+```ruby
+LAA::FeeCalculator.configure do |config|
+  config.cache = Rails.cache
+  config.logger = Rails.logger
+end
+```
+
 Note: 
 
 ## Contributing
@@ -173,7 +184,7 @@ Bug reports and pull requests are welcome on GitHub at [ministryofjustice/laa-fe
 
 1. Make required changes, run specs (rerecord vcr cassettes if necessary)
 
-2. Run `bin/ruby_version_test` to test against ruby versions (2.7+ supported at present)
+2. Run `bin/ruby_version_test` to test against ruby versions (3.0+ supported at present)
 
 3. Update the VERSION in `lib/laa/fee_calculator/version` using [semantic versioning](https://guides.rubygems.org/patterns/#semantic-versioning).
 

data/bin/ruby_version_test

@@ -2,7 +2,7 @@
 
 set -e
 
-RUBIES="2.7 3.0 3.1"
+RUBIES="3.0 3.1 3.2 3.3"
 
 if [ -e Gemfile.lock ]
 then

data/laa-fee-calculator-client.gemspec

@@ -23,18 +23,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # see bin/ruby_version_test
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.add_runtime_dependency 'faraday', '~> 1.0'
-
-  spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rb-readline'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.28'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.13'
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.10'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
+  spec.add_runtime_dependency 'faraday-http-cache', '~> 2.2'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/laa/fee_calculator/calculator.rb

@@ -8,7 +8,7 @@ module LAA
 
       def initialize(scheme_pk, options)
         @uri = "fee-schemes/#{scheme_pk}/calculate/"
-        @filtered_params = options.reject { |k, _v| k.eql?(:id) }
+        @filtered_params = options.except(:id)
       end
 
       def call

data/lib/laa/fee_calculator/client.rb

@@ -18,8 +18,7 @@ module LAA
 
       def fee_schemes(id = nil, **options)
         uri = fee_schemes_uri(id || options[:id])
-        filtered_params = options.reject { |k, _| k.eql?(:id) }
-        # Ruby 3.0+; filtered_params = options.except(:id)
+        filtered_params = options.except(:id)
 
         json = get(uri, filtered_params).body
 

data/lib/laa/fee_calculator/configuration.rb

@@ -6,7 +6,7 @@ module LAA
       LAA_FEE_CALCULATOR_API_V1 = 'https://laa-fee-calculator.service.justice.gov.uk/api/v1'
       HEADERS = { 'Accept' => 'application/json', 'User-Agent' => USER_AGENT }.freeze
 
-      attr_accessor :host, :headers
+      attr_accessor :host, :headers, :cache, :logger
 
       def initialize
         @host = host || LAA_FEE_CALCULATOR_API_V1

data/lib/laa/fee_calculator/connection.rb

@@ -2,6 +2,7 @@
 
 require 'singleton'
 require 'faraday'
+require 'faraday/http_cache'
 
 module LAA
   module FeeCalculator
@@ -16,6 +17,7 @@ module LAA
       def initialize
         @conn = Faraday.new(url: LAA::FeeCalculator.configuration.host, headers: default_headers) do |conn|
           conn.use LAA::FeeCalculator::RaiseError
+          conn.use(:http_cache, store: cache, logger: logger) if cache
           conn.adapter :net_http
         end
       end
@@ -39,6 +41,14 @@ module LAA
       def default_headers
         LAA::FeeCalculator.configuration.headers
       end
+
+      def cache
+        LAA::FeeCalculator.configuration.cache
+      end
+
+      def logger
+        LAA::FeeCalculator.configuration.logger
+      end
     end
   end
 end

data/lib/laa/fee_calculator/has_manyable.rb

@@ -21,7 +21,7 @@ module LAA
         def has_many(association)
           define_method(association) do |id = nil, **options|
             uri = uri_for(association, id: id || options[:id])
-            filtered_params = options.reject { |k, _v| k.eql?(:id) }
+            filtered_params = options.except(:id)
 
             json = get(uri, filtered_params).body
 

data/lib/laa/fee_calculator/raise_error.rb

@@ -9,16 +9,16 @@ module LAA
     # gem specific handlers.
     #
     class RaiseError < Faraday::Response::Middleware
-      CLIENT_ERROR_STATUSES = (400...600).freeze
+      CLIENT_ERROR_STATUSES = (400...600)
 
       def on_complete(env)
         case env[:status]
         when 400
-          raise LAA::FeeCalculator::ResponseError.new(response_values(env))
+          raise LAA::FeeCalculator::ResponseError, response_values(env)
         when 404
-          raise LAA::FeeCalculator::ResourceNotFound.new(response_values(env))
+          raise LAA::FeeCalculator::ResourceNotFound, response_values(env)
         when CLIENT_ERROR_STATUSES
-          raise LAA::FeeCalculator::ClientError.new(response_values(env))
+          raise LAA::FeeCalculator::ClientError, response_values(env)
         end
       end
 

data/lib/laa/fee_calculator/version.rb

@@ -2,7 +2,7 @@
 
 module LAA
   module FeeCalculator
-    VERSION = '1.3.1'
-    USER_AGENT = "laa-fee-calculator-client/#{VERSION}"
+    VERSION = '1.5.0'
+    USER_AGENT = "laa-fee-calculator-client/#{VERSION}".freeze
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: laa-fee-calculator-client
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Katharine Ahern
 - Ministry of Justice
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -26,145 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rb-readline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.28'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
+        version: '2.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 description: Ruby client for the Ministry of Justices LAA fee calculator API. A simple
   interface for transparent calling of the API endpoints to query data and return
   calculated fee amounts.
@@ -201,8 +75,9 @@ files:
 homepage: https://github.com/ministryofjustice/laa-fee-calculator-client
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -210,15 +85,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Ruby client for the Legal Aid Agency fee calculator API
 test_files: []