quiz_api_client 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 019fb5be46485bfe51fa89b86e237dd860dde74f
-  data.tar.gz: cb8c846ad17c8c6d54e21e316d0f9bab8ffe17f4
+  metadata.gz: f6be53ea487e4dde2bf8f57ceda6bcc0e28f1203
+  data.tar.gz: dcc4cbdced4de27dab3a0f2b9ff826028b282360
 SHA512:
-  metadata.gz: c7f0d24d1b650dadf17a88bffc65439b741bc855d4c3d85cf8381d84d3ecb4e6a3832cac96324c7e5b348d1777c596e9fb1afcb496d1d4c1b7bfde8d19a6e473
-  data.tar.gz: 6de74ac09879a9d567de198d6c316ae96548df3f6b15f538bc7cec3ca173ad82f036577dc704d44eb1f76951229f930165180f33a45bc02cd68d8616fcb690c1
+  metadata.gz: 5949cfe9e2580614676224ab87e90ef0598a84aa2e9edb2506ae98a42b13e89c0205f1ec14ba947099d1578f3cba8dc77f430b216aeb355cbebdceb0b61cebff
+  data.tar.gz: 6ae2b643918ab843bbfc46c25af37034b8cf6dca31ae75f0725ea7beb84fb67b2126ba565194190225fca4878a8cec4a36b6fccc360bb37eb230ca5f3fa0f1df

data/.rubocop.yml

@@ -1,10 +1,3 @@
-Rails:
-  Enabled: true
-
-Rails/HttpPositionalArguments:
-  # Renable once we are on Rails v5
-  Enabled: false
-
 AllCops:
   TargetRubyVersion: 2.3
 
@@ -20,11 +13,10 @@ Metrics/MethodLength:
 Metrics/BlockLength:
   Max: 30
   Exclude:
-    - 'spec/**/*.rb'
-    - 'config/routes.rb'
-    - 'app/docs/**/*.rb'
+    - quiz_api_client.gemspec
+    - spec/**/*.rb
 
-Style/AlignParameters:
+Layout/AlignParameters:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_fixed_indentation` style aligns the following lines with one
@@ -34,6 +26,12 @@ Style/AlignParameters:
   #       b)
   EnforcedStyle: with_fixed_indentation
 
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
 Style/ClassAndModuleChildren:
   # Checks the style of children definitions at classes and modules.
   #
@@ -60,12 +58,6 @@ Style/Documentation:
   # classes or other modules.
   Enabled: false
 
-Lint/EndAlignment:
-  AlignWith: variable
-
-Style/CaseIndentation:
-  IndentWhenRelativeTo: end
-
 Style/FrozenStringLiteralComment:
   # `when_needed` will add the frozen string literal comment to files
   # only when the `TargetRubyVersion` is set to 2.3+.

data/Dockerfile

@@ -9,7 +9,7 @@ USER root
 RUN chown -R docker:docker /app
 
 USER docker
-RUN /bin/bash -l -c "cd /app && rvm-exec 2.4 bundle install --jobs 5"
+RUN /bin/bash -l -c "rvm-exec 2.4 bundle install --jobs 5"
 COPY . /app
 RUN rm -f Gemfile.lock
 

data/README.md

@@ -174,9 +174,9 @@ client.quiz_session_events_service.list(
 
 After checking out the repo, run `bin/setup` to install dependencies.
 
-Then, run `rake spec` to run the tests.
+Then, run `bundle exec rake spec` to run the tests.
 
-You can also run `rake console` for an interactive prompt that will allow you to experiment.
+You can also run `bundle exec rake console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/build.sh

@@ -24,6 +24,11 @@ function cleanup() {
 trap cleanup INT TERM EXIT
 
 docker-compose build --pull
+
+echo "Running Rubocop..."
+docker-compose run --rm testrunner /bin/bash -lc \
+  "rvm-exec 2.4 bundle exec rubocop --fail-level autocorrect"
+
 echo "Running test suite..."
 docker-compose run --name coverage testrunner $@
 

data/lib/quiz_api_client/http_client.rb

@@ -46,13 +46,15 @@ module QuizApiClient
 
     def initialize_logger(log_level)
       HTTParty::Logger.add_formatter('quiz_api_client_json_formatter', QuizApiClient::JSONFormatter)
-      @logger = ::Logger.new(STDOUT,
-                             formatter: proc {|_,_,_,msg| msg.merge({consumer_request_id: @consumer_request_id}).to_json },
-                             level: unfriendly_logger_level(log_level)
-                            )
-      @logger_config = { logger: @logger,
-                         log_level: log_level,
-                         log_format: :quiz_api_client_json_formatter
+      @logger = ::Logger.new(
+        STDOUT,
+        formatter: proc { |_, _, _, msg| msg.merge(consumer_request_id: @consumer_request_id).to_json },
+        level: unfriendly_logger_level(log_level)
+      )
+      @logger_config = {
+        logger: @logger,
+        log_level: log_level,
+        log_format: :quiz_api_client_json_formatter
       }
     end
 
@@ -83,9 +85,10 @@ module QuizApiClient
 
     def make_paginated_request(method, url, options)
       entities = []
-      request_url, request_options = url, options
+      request_url = url
+      request_options = options
 
-      until request_url.nil? do
+      until request_url.nil?
         resp = make_request(method, request_url, request_options)
         entities.concat(resp.parsed_response)
         request_url, request_options = next_page(resp, url, options)
@@ -114,7 +117,7 @@ module QuizApiClient
     end
 
     def next_page_link(response, options)
-      return unless response.headers['link'].present?
+      return if response.headers['link'].blank?
       links = LinkHeader.parse(response.headers['link']).links
       next_link = links.find { |link| link['rel'] == 'next' }
       [next_link.href, options] if next_link
@@ -129,7 +132,7 @@ module QuizApiClient
         last_evaluated_hash_key: hash_key,
         last_evaluated_range_key: range_key
       )
-      [ url, options.merge(query: query) ]
+      [url, options.merge(query: query)]
     end
   end
 end

data/lib/quiz_api_client/json_formatter.rb

@@ -6,13 +6,12 @@ module QuizApiClient
     end
 
     def format(request, response)
-      @logger.send(@level, {
+      @logger.send(
+        @level,
         client_request_id: response.headers.dig('x-request-id', 0),
         request_url: request.last_uri,
         response_code: response.code
-      })
+      )
     end
   end
 end
-
-

data/lib/quiz_api_client/services/base_api_service.rb

@@ -1,16 +1,16 @@
 module QuizApiClient::Services
   class BaseApiService
-    attr_reader :consumer_key, :host, :shared_secret,
-                :protocol, :errors
+    attr_reader :consumer_key, :errors, :host, :protocol, :shared_secret
 
-    def initialize(consumer_key:, host:,
-                   shared_secret:, protocol: 'https', consumer_request_id: nil)
+    def initialize(
+      consumer_key:, consumer_request_id: nil, host:, protocol: 'https', shared_secret:
+    )
       @consumer_key = consumer_key
+      @consumer_request_id = consumer_request_id
       @host = host
-      @shared_secret = shared_secret
       @protocol = protocol
+      @shared_secret = shared_secret
       @errors = []
-      @consumer_request_id = consumer_request_id
     end
 
     private

data/lib/quiz_api_client/services/session_item_results_service.rb

@@ -9,10 +9,12 @@ module QuizApiClient::Services
     private
 
     def get_from_quiz_api(params:, token:, all:)
-      client(token: token).get(
-        "/api/quiz_sessions/#{params[:quiz_session_id]}/results/#{params[:quiz_session_result_id]}/session_item_results",
-        all: all
+      path = format(
+        '/api/quiz_sessions/%<session>d/results/%<result>d/session_item_results',
+        session: params[:quiz_session_id],
+        result: params[:quiz_session_result_id]
       )
+      client(token: token).get(path, all: all)
     end
   end
 end

data/lib/quiz_api_client/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '2.4.2'.freeze
+  VERSION = '2.4.3'.freeze
 end

data/quiz_api_client.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'quiz_api_client/version'
@@ -20,7 +19,7 @@ Gem::Specification.new do |spec|
     'Robin Kuss',
     'Ryan Taylor'
   ]
-  spec.email         = [
+  spec.email = [
     'acallejas@instructure.com',
     'bpetty@instructure.com',
     'cprescott@instructure.com',
@@ -41,15 +40,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty', '0.14.0'
-  spec.add_dependency 'jwt', '~> 1.5'
-  spec.add_dependency 'link_header'
+  spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'webmock'
+  spec.add_dependency 'httparty', '~> 0.14.0'
+  spec.add_dependency 'jwt', '>= 1.5', '< 3.0'
+  spec.add_dependency 'link_header', '~> 0.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'pact', '~> 1.19.2'
   spec.add_development_dependency 'pact_broker-client', '~> 1.13.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rubocop', '~> 0.52.1'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quiz_api_client
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Chris Wang
@@ -19,148 +19,168 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pact
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.19.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.19.2
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: pact_broker-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
-  name: pact
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.2
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.2
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: pact_broker-client
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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'
 description: 
 email:
 - acallejas@instructure.com
@@ -225,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -233,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby client for quiz_api