quiz_api_client 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f54de286917c727dd082e05ba212e603a0e95f
-  data.tar.gz: ed6a0f6173ce23ae0bb238adb4ac743c9cca1dcb
+  metadata.gz: b8b6d357d650b6a668514767556251baa1bb1786
+  data.tar.gz: 3376b2fea80424f9ed013363303d1edf56108f4c
 SHA512:
-  metadata.gz: efb836b3ee5f457c0385c516cb3321cad082c43afb72a8853c4aef1bc64f5a8f5cd49a327791b866764f9f27942039348ce39cc1b219e681cf75975631d8a4f4
-  data.tar.gz: 53a5b9374b624e3ff60aa971d0bef3c8d6f17e678717e99cc2110766de77880d745462b9aa069d26d99bc4015a3a68a68dc719e415eff1e1393d46de1cbc1241
+  metadata.gz: b2572edba5803667282c491e2c764d5b09b7121757b1afb12effcbc2ca4ee161ce5ed2cf093f1cce3530f5638ec5fa5720d40c9add67f264ee53ff565f519136
+  data.tar.gz: 3138426617bb189f052aa4131653a51a062bccc50232a3773409ee39227191aa9e2d62fd08c6b064610b64494247973797dcbe602d1f5c2da9febe7f1ca2bef5

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock
+

data/Dockerfile

@@ -1,23 +1,19 @@
-FROM instructure/ruby:2.3
+FROM instructure/rvm
 
-USER root
-
-RUN apt-get update \
- && apt-get install -y unzip \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
-
-ENV LANG C.UTF-8
 WORKDIR /app
 
-COPY Gemfile quiz_api_client.gemspec Gemfile.lock /app/
-COPY . /app
-RUN chown -R docker:docker /app
+COPY quiz_api_client.gemspec Gemfile /app/
+COPY lib/quiz_api_client/version.rb /app/lib/quiz_api_client/version.rb
 
-USER docker
-RUN bundle install --jobs 8
 USER root
+RUN chown -R docker:docker /app
 
-RUN mkdir -p /app/coverage && chown -R docker:docker /app
+USER docker
+RUN /bin/bash -l -c "cd /app && rvm-exec 2.4 bundle install --jobs 5"
+COPY . /app
 
+USER root
+RUN chown -R docker:docker /app
 USER docker
+
+CMD /bin/bash -l -c "rvm-exec 2.4 bundle exec rspec"

data/README.md

@@ -103,9 +103,9 @@ client.quizzes_service.list(params:)
 
 **Tokens**
 ```ruby
-# Generate token: Update Quiz Session
+# Generate token: Grade Quiz Session
 client.quiz_session_service.token(
-  scope: client.quiz_session_service.scope_update,
+  scope: client.quiz_session_service.scope_grade,
   exp: some_expiration,
   resource_id: quiz_session_id
 )
@@ -116,6 +116,13 @@ client.quiz_session_service.token(
   exp: some_expiration,
   resource_id: quiz_session_id
 )
+
+# Generate token: Update Quiz Session
+client.quiz_session_service.token(
+  scope: client.quiz_session_service.scope_update,
+  exp: some_expiration,
+  resource_id: quiz_session_id
+)
 ```
 
 **API Calls**

data/build.sh

@@ -1,12 +1,10 @@
-#!/bin/bash
-
-export COMPOSE_PROJECT_NAME=api_client
+#!/bin/bash -ex
 
 function cleanup() {
   exit_code=$?
   set +e
-  docker cp testrunner:/app/coverage .
-  docker-compose stop
+  docker cp coverage:/app/coverage .
+  docker-compose kill
   docker-compose rm -f
   exit $exit_code
 }
@@ -16,4 +14,4 @@ set -e
 
 docker-compose build --pull
 echo "Running test suite..."
-docker-compose run --name testrunner -T testrunner bundle exec rspec
+docker-compose run --name coverage testrunner $@

data/docker-compose.yml

@@ -2,4 +2,4 @@ version: '2'
 
 services:
   testrunner:
-    build: .
+    build: .

data/lib/quiz_api_client/http_client.rb

@@ -1,5 +1,3 @@
-require 'httparty'
-
 module QuizApiClient
   class HttpClient
     include HTTParty

data/lib/quiz_api_client/services/base_api_service.rb

@@ -1,6 +1,3 @@
-require 'quiz_api_client/http_client'
-require 'quiz_api_client/services/jwt_service'
-
 module QuizApiClient::Services
   class BaseApiService
     attr_reader :consumer_key, :host, :shared_secret,
@@ -23,9 +20,7 @@ module QuizApiClient::Services
     end
 
     def uri
-      uri = URI::HTTP.build(host: host)
-      uri.scheme = protocol
-      uri.to_s
+      URI.parse("#{protocol}://#{host}").to_s
     end
 
     def generate_token(scope:, exp: nil, resource_id: nil)
@@ -35,7 +30,7 @@ module QuizApiClient::Services
     def jwt_service
       QuizApiClient::Services::JwtService.new(
         consumer_key: consumer_key,
-        host: host,
+        host: URI.parse("#{protocol}://#{host}").host,
         shared_secret: shared_secret,
         protocol: protocol
       )

data/lib/quiz_api_client/services/item_analyses_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class ItemAnalysesService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/services/jwt_service.rb

@@ -1,8 +1,7 @@
-require 'jwt'
-
 module QuizApiClient::Services
-  HASHING_ALGORITHM = 'HS512'.freeze
   class JwtService
+    HASHING_ALGORITHM = 'HS512'.freeze
+
     attr_reader :consumer_key, :host, :shared_secret, :protocol
 
     def initialize(consumer_key: nil, shared_secret:, host:, protocol: 'https')

data/lib/quiz_api_client/services/qti_imports_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QtiImportsService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/services/quiz_analyses_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QuizAnalysesService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/services/quiz_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QuizService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/services/quiz_session_events_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QuizSessionEventsService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/services/quiz_session_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QuizSessionService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)
@@ -19,6 +17,10 @@ module QuizApiClient::Services
       'quiz_session.take'
     end
 
+    def scope_grade
+      'quiz_session.grade'
+    end
+
     private
 
     def patch_to_quiz_api(params:, token:)
@@ -29,7 +31,11 @@ module QuizApiClient::Services
     end
 
     def allowed_scopes
-      [scope_update, scope_take]
+      [
+        scope_grade,
+        scope_take,
+        scope_update
+      ]
     end
   end
 end

data/lib/quiz_api_client/services/quiz_sessions_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QuizSessionsService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/services/quizzes_service.rb

@@ -1,5 +1,3 @@
-require 'quiz_api_client/services/base_api_service'
-
 module QuizApiClient::Services
   class QuizzesService < BaseApiService
     def token(scope:, exp: nil, resource_id: nil)

data/lib/quiz_api_client/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.7'.freeze
 end

data/lib/quiz_api_client.rb

@@ -1,13 +1,5 @@
-require 'quiz_api_client/version'
-require 'quiz_api_client/services/qti_imports_service'
-require 'quiz_api_client/services/quiz_service'
-require 'quiz_api_client/services/quizzes_service'
-require 'quiz_api_client/services/quiz_sessions_service'
-require 'quiz_api_client/services/quiz_session_service'
-require 'quiz_api_client/services/quiz_sessions_service'
-require 'quiz_api_client/services/item_analyses_service'
-require 'quiz_api_client/services/quiz_analyses_service'
-require 'quiz_api_client/services/quiz_session_events_service'
+require 'httparty'
+require 'jwt'
 
 module QuizApiClient
   class Client
@@ -64,3 +56,16 @@ module QuizApiClient
     end
   end
 end
+
+require 'quiz_api_client/http_client'
+require 'quiz_api_client/services/jwt_service'
+require 'quiz_api_client/services/base_api_service'
+
+require 'quiz_api_client/services/item_analyses_service'
+require 'quiz_api_client/services/qti_imports_service'
+require 'quiz_api_client/services/quiz_analyses_service'
+require 'quiz_api_client/services/quiz_service'
+require 'quiz_api_client/services/quiz_session_events_service'
+require 'quiz_api_client/services/quiz_session_service'
+require 'quiz_api_client/services/quiz_sessions_service'
+require 'quiz_api_client/services/quizzes_service'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quiz_api_client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Chris Wang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -122,7 +122,6 @@ files:
 - ".rubocop.yml"
 - Dockerfile
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -162,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for quiz_api

data/Gemfile.lock

@@ -1,69 +0,0 @@
-PATH
-  remote: .
-  specs:
-    quiz_api_client (0.1.5)
-      httparty
-      jwt
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    coderay (1.1.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    hashdiff (0.3.2)
-    httparty (0.14.0)
-      multi_xml (>= 0.5.2)
-    json (2.0.3)
-    jwt (1.5.6)
-    method_source (0.8.2)
-    multi_xml (0.6.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rake (10.4.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    safe_yaml (1.0.4)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slop (3.6.0)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.12)
-  pry
-  quiz_api_client!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  simplecov
-  webmock
-
-BUNDLED WITH
-   1.14.3