infreemation 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0ba437d15456f90a07b1d593e7cd27b59b189a5fb341fc36a8f429c61478d6
-  data.tar.gz: 0beb6bb42829673ed8b7e174b20798d57d6552f3a79ccd0c38f5e9ae957d9332
+  metadata.gz: 4beac3e0d172b9b23f9c0aef2fe427d68d07bdc022e107072812dbdbc8053f7b
+  data.tar.gz: e6442a04aea433b5db051b48b22ffdbbf7ea8e54f2b7ab593ed10c2f434e0a84
 SHA512:
-  metadata.gz: 19cd8059ea1197f3772c200cb92bf6eff2f2109c3e1a9fd70af63195ab385effed9e83b6179fd1210735fe3e4f1d56f1c01698bd6c6b64f313a23b190de51346
-  data.tar.gz: 88dc1e807c9fd4604188510cc12ad53f3f8b181b6e47e627fc7605d33f72bc2a14406b34eecf04865dc51d173cd9003f01405a173e655203ee3daf2a0b110c4a
+  metadata.gz: e4c58d1d3b0c17b3157095fa988c1a725355374e0b5189ba9136cbc39101ac96b0f5e4fe7da8eac43b123aa35611443d928e425d22d0551107aee3a997719299
+  data.tar.gz: 9f96a0b6cca8d44d1b23c0a2d9800b4614d731b736d67c018cf53013ee300d252dda38a5ce806da314114a79e4ca12de2d23dfafc6b79ef3f33f9bef38e6f4a8

data/.github/workflows/ruby.yml

@@ -0,0 +1,40 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.5, 2.6]
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-gems-
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1.29.0
+      with:
+        ruby-version: ${{ matrix.ruby }}
+
+    - name: Install gems
+      run: |
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3
+
+    - name: Run tests
+      env:
+        RAILS_ENV: test
+      run: |
+        bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infreemation (0.1.0)
+    infreemation (0.2.0)
       json (~> 2.1.0)
       rest-client (~> 2.0.2)
 
@@ -78,4 +78,4 @@ DEPENDENCIES
   webmock (~> 3.3.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/infreemation.gemspec

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -14,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Ruby library for the Infreemation API.'
   spec.description   = 'Infreemation is a eCase management software system ' \
     'built specifically to manage FOI, EIR and SAR requests.'
-  spec.homepage      = 'https://github.com/mysociety/infreemation'
+  spec.homepage      = 'https://github.com/mysociety/infreemation-ruby'
   spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the

data/lib/infreemation/api.rb

@@ -47,7 +47,7 @@ module Infreemation
               raise Errors[data[:ref]], data[:error] if data[:status] == 'ERROR'
             end
           rescue JSON::ParserError
-            raise ResponseError, 'JSON invalid'
+            raise ResponseError, "JSON invalid (#{response.body[0...100]})"
           end
         end
       end

data/lib/infreemation/errors.rb

@@ -9,39 +9,54 @@ module Infreemation
   ##
   # A generic error
   #
-  GenericError = Class.new(Exception)
+  GenericError = Class.new(RuntimeError)
 
   ##
-  # An API authenication error
+  # An API authentication error
   #
-  AuthenticationError = Class.new(Exception)
+  AuthenticationError = Class.new(RuntimeError)
 
   ##
   # A request error
   #
-  RequestError = Class.new(Exception)
+  RequestError = Class.new(RuntimeError)
 
   ##
   # A response error
   #
-  ResponseError = Class.new(Exception)
+  ResponseError = Class.new(RuntimeError)
 
   ##
   # A missing parameter error
   #
-  MissingParameterError = Class.new(Exception)
+  MissingParameterError = Class.new(RuntimeError)
+
+  ##
+  # An invalid parameter error
+  #
+  InvalidParameterError = Class.new(RuntimeError)
+
+  ##
+  # A missing or invalid parameter error
+  #
+  MissingOrInvalidParameterError = Class.new(RuntimeError)
 
   ERROR_MAPPINGS = {
-    2 => AuthenticationError,
-    3 => RequestError,
+    2 => AuthenticationError, # key or username invalid
+    3 => MissingOrInvalidParameterError, # start date
+    4 => InvalidParameterError, # FOI type
     5 => MissingParameterError, # requester
     6 => MissingParameterError, # contact
     7 => MissingParameterError, # contacttype
-    8 => MissingParameterError  # body
+    8 => MissingParameterError, # body
+    9 => MissingParameterError, # rt
+    10 => AuthenticationError, # key missing
+    11 => AuthenticationError, # username missing
+    12 => RequestError # no data
   }.freeze
 
   ##
-  # This module is resposible for mapping error codes into the correct type to
+  # This module is responsible for mapping error codes into the correct type to
   # exception class
   #
   module Errors

data/lib/infreemation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Infreemation
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infreemation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - mySociety
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -116,9 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -133,7 +133,7 @@ files:
 - lib/infreemation/errors.rb
 - lib/infreemation/request.rb
 - lib/infreemation/version.rb
-homepage: https://github.com/mysociety/infreemation
+homepage: https://github.com/mysociety/infreemation-ruby
 licenses:
 - MIT
 metadata:
@@ -153,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby library for the Infreemation API.

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.1