laa-fee-calculator-client 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc4df8ba322e7976e3226d7d18aa6012af7c2b8c943fc7414dea360f1a3a768
-  data.tar.gz: 99199b2bd8f7f228a4b18be530f9977766f44071d99349f9418fcb7387c5133d
+  metadata.gz: 846930f03ac36c9166dcba3a25cc3b2b552f32b31861043fa1908741912da754
+  data.tar.gz: 3b5ec2435a93a7584eff62facedf12a8ab3c754f6f83bcabc625b1ef8fc96c07
 SHA512:
-  metadata.gz: 5451efcb50258d96e191b74698eff0b0a592bcc01e84918a14e2df6bf9fe741b337b50fecb6671c39eb182c6523aef118b0397bb9543399c414f62145b5137bd
-  data.tar.gz: 01e114b83353fca2b880882e8d5ed750c9c734e4eb20d566e030da9da6e07a1c61741d1b745591207e4fb47dc699b5d2caab4d306b9d8cfae7351c838bd51fb2
+  metadata.gz: 953bba0d471745c2502a7dc9b0d7cc21c1a58fae009ce09777d419b4a9cc7177b25593d90476ed3536b2f17092b2f124336090dd6c600b7567021dc0f2d26113
+  data.tar.gz: 44e1ca22ff932959a6ddfab3046120b8d619647178e9e37957b23539176cee281916e24f23cc6b4fb409b0c58862c0650bf460eb2ee92032c0dbd0a0472e4e25

data/CHANGELOG.md

@@ -12,8 +12,33 @@ Add latest change log entries at top using template:
   -
 ### Removed
   -
-
 ```
+## Version 1.3.1
+
+### Removed
+  - `addressable` gem dependency
+
+## Version 1.3.0
+
+### Modified
+  - update Faraday dependency
+
+### Added
+  - support for Ruby 3.0 and 3.1
+
+### Removed
+  - removed support for Ruby 2.6
+
+## Version 1.2.0
+
+### Modified
+  - updated Faraday dependency
+  - updated development dependencies - rubocop, bundler
+### Added
+  - support/testing for ruby 2.7.0
+### Removed
+  - removed support for ruby 2.5
+  - removed testing against ruby versions less than 2.6
 
 ## Version 1.1.0
 

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 

data/README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/ministryofjustice/laa-fee-calculator-client.svg?branch=master)](https://travis-ci.org/ministryofjustice/laa-fee-calculator-client)
+![RSpec](https://github.com/ministryofjustice/laa-fee-calculator-client/actions/workflows/rspec.yml/badge.svg)
+![Rubocop](https://github.com/ministryofjustice/laa-fee-calculator-client/actions/workflows/rubocop.yml/badge.svg)
 [![Gem Version](https://badge.fury.io/rb/laa-fee-calculator-client.svg)](https://badge.fury.io/rb/laa-fee-calculator-client)
 ![](https://ruby-gem-downloads-badge.herokuapp.com/laa-fee-calculator-client?type=total)
 
@@ -12,7 +13,7 @@ endpoints, providing a simple interface for querying data, in particular, the pr
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'laa-fee-calculator-client', '~> 1.1.0'
+gem 'laa-fee-calculator-client', '~> 1.2.0'
 ```
 
 And then execute:
@@ -172,17 +173,15 @@ 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.5+ supported at present)
+2. Run `bin/ruby_version_test` to test against ruby versions (2.7+ supported at present)
 
 3. Update the VERSION in `lib/laa/fee_calculator/version` using [semantic versioning](https://guides.rubygems.org/patterns/#semantic-versioning).
 
-4. Update the VERSION_RELEASED in `lib/laa/fee_calculator/version` to the date you intend to publish/release the version.
+4. Update the `CHANGELOG.md` - format/documentation standards specified at top of file.
 
-5. Update the `CHANGELOG.md` - format/documentation standards specified at top of file.
+5. PR the change, code-review, merge.
 
-6. PR the change, code-review, merge.
-
-7. Pull master and run rake task below to publish
+6. Pull master and run rake task below to publish. Note, you will need a [rubygems](https://rubygems.org/) account with gem owner privileges and have configured your `~/.gem/credentials` in order for this task to complete successfully.
 
 ```bash
 $ rake release
@@ -195,7 +194,7 @@ $ git push -u origin <branch>
 $ git tag -a v<VERSION> -m "Version <VERSION>"
 $ git push origin v<VERSION>
 $ gem build laa-fee-calculator-client.gemspec
-$ gem push laa-fee-calculator-client-<VERSION>.gemspec
+$ gem push laa-fee-calculator-client-<VERSION>.gem
 ```
 *`<VERSION>` is the value of `LAA::FeeCalculator::VERSION`
 

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/bin/console

@@ -1,9 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "pry-byebug"
-require "laa/fee_calculator"
+require 'bundler/setup'
+require 'laa/fee_calculator'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -17,5 +16,5 @@ LAA::FeeCalculator.configure do |config|
   config.host = 'http://localhost:8000/api/v1'
 end
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/ruby_version_test

@@ -2,17 +2,64 @@
 
 set -e
 
-rubies=("ruby-2.5.5" "ruby-2.6.0" "ruby-2.6.1" "ruby-2.6.2" "ruby-2.6.3")
-for i in "${rubies[@]}"
+RUBIES="2.7 3.0 3.1"
+
+if [ -e Gemfile.lock ]
+then
+  echo Moving Gemfile.lock to Gemfile.lock.tmp
+  mv Gemfile.lock Gemfile.lock.tmp
+fi
+
+if (which rbenv)
+then
+  echo "Using rbenv"
+  eval "$(rbenv init - bash)"
+  get_version() {
+    rbenv install --list 2> /dev/null | grep -E "^$1"
+  }
+  install_ruby() {
+    rbenv install --skip-existing $1
+  }
+  run_tests_with() {
+    rbenv shell $1
+    bundle install
+    bundle exec rspec spec
+    rbenv shell --unset
+  }
+elif (which rvm)
+then
+  echo "Using rvm"
+  get_version() {
+    echo $1
+  }
+  install_ruby() {
+    rvm install $1
+  }
+  run_tests_with() {
+    rvm $1 exec bundle install
+    rvm $1 exec bundle exec rspec spec
+  }
+else
+  echo "No Ruby version manager found"
+  exit 1
+fi
+
+for r in $RUBIES
 do
   echo "====================================================="
-  echo "$i: Start Test"
+  echo "$r: Start Test"
   echo "====================================================="
-  if [[ $(rvm list | grep $i) ]]; then echo "$i already installed!"; else rvm install $i; fi
-  rvm $i exec gem install bundler
-  rvm $i exec bundle install
-  rvm $i exec bundle exec rspec spec
+  VERSION=`get_version $r`
+  install_ruby $VERSION
+  run_tests_with $VERSION
+  rm Gemfile.lock
   echo "====================================================="
-  echo "$i: End Test"
+  echo "$r: End Test"
   echo "====================================================="
 done
+
+if [ -e Gemfile.lock.tmp ]
+then
+  echo Moving Gemfile.lock.tmp to Gemfile.lock
+  mv Gemfile.lock.tmp Gemfile.lock
+fi

data/laa-fee-calculator-client.gemspec

@@ -7,14 +7,13 @@ require 'laa/fee_calculator/version'
 Gem::Specification.new do |spec|
   spec.name          = 'laa-fee-calculator-client'
   spec.version       = LAA::FeeCalculator::VERSION
-  spec.authors       = ['Joel Sugarman', 'Ministry of Justice']
-  spec.email         = ['joel.sugarman@digital.justice.gov.uk', 'tools@digital.justice.gov.uk']
-  spec.date          = LAA::FeeCalculator::VERSION_RELEASED
+  spec.authors       = ['Katharine Ahern', 'Ministry of Justice']
+  spec.email         = ['katharine.ahern@digital.justice.gov.uk', 'joel.sugarman@digital.justice.gov.uk', 'tools@digital.justice.gov.uk']
   spec.summary       = 'Ruby client for the Legal Aid Agency fee calculator API'
-  spec.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."
+  spec.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.'
   spec.homepage      = 'https://github.com/ministryofjustice/laa-fee-calculator-client'
   spec.license       = 'MIT'
-  spec.extra_rdoc_files = ["LICENSE", "README.md"]
+  spec.extra_rdoc_files = ['LICENSE', 'README.md']
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test/|spec/|features/|\..*)})
@@ -24,18 +23,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # see bin/ruby_version_test
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.7'
-  spec.add_runtime_dependency 'faraday', '>= 0.9.2', '< 0.18.0'
+  spec.add_runtime_dependency 'faraday', '~> 1.0'
 
   spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'bundler', '~> 2.1.2'
-  spec.add_development_dependency 'pry-byebug'
   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', '~> 0.78'
+  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'
 end

data/lib/laa/fee_calculator/calculator.rb

@@ -6,25 +6,18 @@ module LAA
       extend Forwardable
       def_delegators :connection, :get
 
-      attr_reader :scheme_pk, :options
-
       def initialize(scheme_pk, options)
-        @scheme_pk = scheme_pk
-        @options = options
+        @uri = "fee-schemes/#{scheme_pk}/calculate/"
+        @filtered_params = options.reject { |k, _v| k.eql?(:id) }
       end
 
       def call
-        uri.query_values = options.reject { |k, _v| k.eql?(:id) }
-        json = get(uri).body
+        json = get(@uri, @filtered_params).body
         JSON.parse(json)['amount']
       end
 
       private
 
-      def uri
-        @uri ||= Addressable::URI.parse("fee-schemes/#{scheme_pk}/calculate/")
-      end
-
       def connection
         @connection ||= Connection.instance
       end

data/lib/laa/fee_calculator/client.rb

@@ -1,4 +1,4 @@
-require "addressable/uri"
+# frozen_string_literal: true
 
 module LAA
   module FeeCalculator
@@ -17,13 +17,11 @@ module LAA
       end
 
       def fee_schemes(id = nil, **options)
-        uri = 'fee-schemes/'
-        id ||= options.fetch(:id, nil)
-        uri.concat(id.to_s, "/") if id
-        uri = Addressable::URI.parse(uri)
-        uri.query_values = options.reject { |k, _v| k.eql?(:id) }
+        uri = fee_schemes_uri(id || options[:id])
+        filtered_params = options.reject { |k, _| k.eql?(:id) }
+        # Ruby 3.0+; filtered_params = options.except(:id)
 
-        json = get(uri).body
+        json = get(uri, filtered_params).body
 
         fstruct = JSON.parse(json, object_class: FeeScheme)
         return fstruct unless fstruct.respond_to?(:results)
@@ -31,6 +29,14 @@ module LAA
 
         fstruct.results
       end
+
+      private
+
+      def fee_schemes_uri(id)
+        return "fee-schemes/#{id}/" if id
+
+        'fee-schemes/'
+      end
     end
   end
 end

data/lib/laa/fee_calculator/connection.rb

@@ -10,12 +10,13 @@ module LAA
       extend Forwardable
 
       attr_reader :conn
+
       def_delegators :conn, :port, :headers, :url_prefix, :options, :ssl, :get
 
       def initialize
         @conn = Faraday.new(url: LAA::FeeCalculator.configuration.host, headers: default_headers) do |conn|
           conn.use LAA::FeeCalculator::RaiseError
-          conn.use Faraday::Adapter::NetHttp
+          conn.adapter :net_http
         end
       end
 

data/lib/laa/fee_calculator/has_manyable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module LAA
@@ -17,18 +19,11 @@ module LAA
         end
 
         def has_many(association)
-          define_method("#{association}_uri".to_sym) do |scheme_pk = nil, id = nil|
-            uri = scheme_pk.nil? ? "#{association.to_s.tr('_', '-')}/" : "fee-schemes/#{scheme_pk}/#{association.to_s.tr('_', '-')}/"
-            uri = uri.concat(id.to_s, '/') unless id.nil?
-            Addressable::URI.parse(uri)
-          end
-
           define_method(association) do |id = nil, **options|
-            id ||= options&.fetch(:id, nil)
-            uri = self.send("#{association}_uri", self.id, id)
-            uri.query_values = options.reject { |k, _v| k.eql?(:id) }
+            uri = uri_for(association, id: id || options[:id])
+            filtered_params = options.reject { |k, _v| k.eql?(:id) }
 
-            json = get(uri).body
+            json = get(uri, filtered_params).body
 
             ostruct = JSON.parse(json, object_class: OpenStruct)
             return ostruct unless ostruct.respond_to?(:results)
@@ -37,6 +32,16 @@ module LAA
           end
         end
       end
+
+      def uri_for(association, id: nil)
+        return "#{base_fee_scheme_uri}#{association.to_s.tr('_', '-')}/" if id.nil?
+
+        "#{base_fee_scheme_uri}#{association.to_s.tr('_', '-')}/#{id}/"
+      end
+
+      def base_fee_scheme_uri
+        id ? "fee-schemes/#{id}/" : ''
+      end
     end
   end
 end

data/lib/laa/fee_calculator/version.rb

@@ -2,8 +2,7 @@
 
 module LAA
   module FeeCalculator
-    VERSION = "1.1.0"
-    VERSION_RELEASED = "2019-12-20"
+    VERSION = '1.3.1'
     USER_AGENT = "laa-fee-calculator-client/#{VERSION}"
   end
 end

data/lib/laa/fee_calculator.rb

@@ -12,7 +12,7 @@ module LAA
   module FeeCalculator
     class << self
       def root
-        spec = Gem::Specification.find_by_name("laa-fee-calculator-client")
+        spec = Gem::Specification.find_by_name('laa-fee-calculator-client')
         spec.gem_dir
       end
 
@@ -21,6 +21,7 @@ module LAA
       end
 
       attr_writer :configuration
+
       def configuration
         @configuration ||= Configuration.new
       end

metadata

@@ -1,56 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: laa-fee-calculator-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.1
 platform: ruby
 authors:
-- Joel Sugarman
+- Katharine Ahern
 - Ministry of Justice
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.7
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -66,21 +40,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,61 +68,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.28'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  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: '0.78'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +169,7 @@ description: Ruby client for the Ministry of Justices LAA fee calculator API. A
   interface for transparent calling of the API endpoints to query data and return
   calculated fee amounts.
 email:
+- katharine.ahern@digital.justice.gov.uk
 - joel.sugarman@digital.justice.gov.uk
 - tools@digital.justice.gov.uk
 executables: []
@@ -221,14 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Legal Aid Agency fee calculator API