diff --git a/coursemology-evaluator.gemspec b/coursemology-evaluator.gemspec index ea4e5ba..d2f8d62 100644 --- a/coursemology-evaluator.gemspec +++ b/coursemology-evaluator.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'vcr' spec.add_dependency 'activesupport', '~> 4.2.0', '>= 4.2.2' - spec.add_dependency 'flexirest', '~> 1.2' + spec.add_dependency 'flexirest', '~> 1.2', '>= 1.2.6' spec.add_dependency 'faraday_middleware' spec.add_dependency 'coursemology-polyglot', '>= 0.0.3' diff --git a/lib/coursemology/evaluator/models/programming_evaluation.rb b/lib/coursemology/evaluator/models/programming_evaluation.rb index f1042f2..3655d3f 100644 --- a/lib/coursemology/evaluator/models/programming_evaluation.rb +++ b/lib/coursemology/evaluator/models/programming_evaluation.rb @@ -34,7 +34,8 @@ def language=(language) # @return [Coursemology::Evaluator::Models::ProgrammingEvaluation::Package] def package @package ||= begin - body = plain_request('courses/assessment/programming_evaluations/:id/package', id: id) + body = self.class._plain_request('courses/assessment/programming_evaluations/:id/package', + :get, id: id) Package.new(Coursemology::Evaluator::StringIO.new(body)) end end @@ -51,17 +52,4 @@ def evaluate self.test_report = result.test_report self.exit_code = result.exit_code end - - private - - # Performs a plain request. - # - # @param [String] url The URL to request. - # @param [Hash] params The parameter to be part of the request. - # @return [String] The response body. - def plain_request(url, params = {}) - request = Flexirest::Request.new({ url: url, method: :get, options: { plain: true } }, - self.class) - request.call(params) - end end diff --git a/spec/coursemology/evaluator/models/programming_evaluation_spec.rb b/spec/coursemology/evaluator/models/programming_evaluation_spec.rb index 8b02515..265d590 100644 --- a/spec/coursemology/evaluator/models/programming_evaluation_spec.rb +++ b/spec/coursemology/evaluator/models/programming_evaluation_spec.rb @@ -65,7 +65,7 @@ it 'memoises its result' do VCR.use_cassette 'programming_evaluation/package' do - expect(evaluation).to receive(:plain_request).and_call_original + expect(evaluation.class).to receive(:_plain_request).and_call_original evaluation.package evaluation.package end