Skip to content
This repository was archived by the owner on Sep 25, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@ PATH
remote: .
specs:
coursemology-evaluator (0.0.0)
active_rest_client (~> 1.2)
activesupport (~> 4.2.0)
coursemology-polyglot (>= 0.0.3)
docker-api (>= 1.2.5)
faraday_middleware
flexirest (~> 1.2)
rubyzip

GEM
remote: https://rubygems.org/
specs:
active_rest_client (1.2.0)
activesupport
crack
faraday
multi_json
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
Expand Down Expand Up @@ -50,6 +45,11 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
flexirest (1.2.14)
activesupport
crack
faraday
multi_json
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
Expand Down
2 changes: 1 addition & 1 deletion coursemology-evaluator.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'vcr'

spec.add_dependency 'activesupport', '~> 4.2.0'
spec.add_dependency 'active_rest_client', '~> 1.2'
spec.add_dependency 'flexirest', '~> 1.2'
spec.add_dependency 'faraday_middleware'

spec.add_dependency 'coursemology-polyglot', '>= 0.0.3'
Expand Down
5 changes: 1 addition & 4 deletions lib/coursemology/evaluator.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'active_support/all'
require 'active_rest_client'
require 'flexirest'
require 'faraday_middleware'
require 'docker'
require 'zip'
Expand All @@ -25,9 +25,6 @@ module Coursemology::Evaluator
# The logger to use for the client.
mattr_reader(:logger) { ActiveSupport::Logger.new(STDOUT) }

# Application cache, like Rails. Currently nil.
mattr_reader(:cache)

def self.eager_load!
super
Coursemology::Polyglot.eager_load!
Expand Down
2 changes: 1 addition & 1 deletion lib/coursemology/evaluator/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def allocate_evaluations
end

on_allocate(evaluations)
rescue ActiveRestClient::HTTPUnauthorisedClientException => e
rescue Flexirest::HTTPUnauthorisedClientException => e
ActiveSupport::Notifications.publish('allocate_fail.client.evaluator.coursemology', e: e)
end

Expand Down
8 changes: 4 additions & 4 deletions lib/coursemology/evaluator/models/base.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
class Coursemology::Evaluator::Models::Base < ActiveRestClient::Base
class Coursemology::Evaluator::Models::Base < Flexirest::Base
class << self
attr_accessor :api_user_email
attr_accessor :api_token

def initialize
ActiveRestClient::Base.perform_caching = false
default_config = ActiveRestClient::Base.faraday_config
ActiveRestClient::Base.faraday_config do |faraday|
Flexirest::Base.perform_caching = false
default_config = Flexirest::Base.faraday_config
Flexirest::Base.faraday_config do |faraday|
# +follow_redirects+ must be added before declaring the adapter. See faraday_middleware#32,
# last comment.
faraday.response :follow_redirects
Expand Down
4 changes: 2 additions & 2 deletions lib/coursemology/evaluator/models/programming_evaluation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def evaluate
# @param [Hash] params The parameter to be part of the request.
# @return [String] The response body.
def plain_request(url, params = {})
request = ActiveRestClient::Request.new({ url: url, method: :get, options: { plain: true } },
self.class)
request = Flexirest::Request.new({ url: url, method: :get, options: { plain: true } },
self.class)
request.call(params)
end
end