mumukit-bridge 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0da5641e73e004830e601984d307dd2a3cef3942db91c575a7ebd0b9b0d1cf
-  data.tar.gz: 2f95f49d3dddf112c1a0f7569bcbb469b083b97265f688f85226ce81674f4ca8
+  metadata.gz: b58fbaed7b8f322059e7482edbdc170f0ef4cacc3a51a8e9e841d5181befde3f
+  data.tar.gz: 472387132d4119364c755be1072b1b85acf4a3e8fc413c84e0b291f812e837e3
 SHA512:
-  metadata.gz: 1e3f43cb1ccc89c8807b039557d81f1a04e0717831c1d800128a7e40f25573979499b312b0e66761a966525742671863b03e606162a6b9ab9b09b3f80e37a327
-  data.tar.gz: 6f45f0e107dbace2cb8fcc771b2bd00168621e5e8d368b231631aa5445f2eff99751e2f22634485db5fa64d9a7fb3e7f1bb80bdfc490c493090e0093e834eb9f
+  metadata.gz: 16a4a415717dcd553376e095ca10bf252e9b4e8ecdd012745ce7a528c1ab19a3eb9fb9674465a110253a5f561ef8d540c50bc17fb362422170265d18ea6b3812
+  data.tar.gz: 20cac161fc03789592bd256489ad54324133c19defc2cf20027f4a8777891a047e849726a8a4f79ec07b734935bae33aa53619864aaa02c29129603f89e7cc2c

data/lib/mumukit/bridge/runner.rb

@@ -6,11 +6,12 @@ require_relative './runner/boolean'
 module Mumukit
   module Bridge
     class Runner
-      attr_accessor :test_runner_url
+      attr_accessor :test_runner_url, :timeout, :headers
 
-      def initialize(test_runner_url, timeout=10)
+      def initialize(test_runner_url, timeout=10, headers={})
         @test_runner_url = test_runner_url
         @timeout = timeout
+        @headers = headers
       end
 
       # Expects a hash
@@ -21,21 +22,26 @@ module Mumukit
       #    status: :passed|:failed|:errored|:aborted|:passed_with_warnings,
       #    expectation_results: [{binding:string, inspection:string, result:symbol}],
       #    feedback: string}
-      def run_tests!(request)
-        with_server_response request, 'test' do |response|
+      def run_tests!(request, headers={})
+        with_server_response 'test', request, headers do |response|
           response_type = ResponseType.for_response response
           response_type.parse response
         end
       end
 
-      def run_query!(request)
-        with_server_response request, 'query' do |it|
+      # Expects a hash
+      #  {query: string, extra: string, content: string}
+      # Returns a hash
+      #   {result: string,
+      #    status: :passed|:failed|:errored|:aborted}
+      def run_query!(request, headers={})
+        with_server_response 'query', request, headers do |it|
           {status: it['exit'].to_sym, result: it['out']}
         end
       end
 
-      def run_try!(request)
-        with_server_response request, 'try' do |it|
+      def run_try!(request, headers={})
+        with_server_response 'try', request, headers do |it|
           {
             status: it['exit'].to_sym,
             result: it['out'],
@@ -47,8 +53,8 @@ module Mumukit
         end
       end
 
-      def importable_info
-        @language_json ||= info.merge('url' => test_runner_url)
+      def importable_info(headers={})
+        @language_json ||= info(headers).merge('url' => test_runner_url)
         {
           name:                   @language_json['name'],
           comment_type:           @language_json['comment_type'],
@@ -74,37 +80,39 @@ module Mumukit
         }
       end
 
-      def assets(path, options={})
-        raw_get_to_server "assets/#{path}", options
+      def assets(path, headers={})
+        do_get "assets/#{path}", headers
       end
 
-      def info(options={})
-        JSON.parse raw_get_to_server(:info, options.merge(content_type: :json))
+      def info(headers={})
+        JSON.parse do_get(:info, json_content_type(headers))
       end
 
-      def with_server_response(request, route, &action)
-        response = post_to_server(request, route)
+      private
+
+      def with_server_response(route, request, headers, &action)
+        response = do_json_post(route, request, headers)
         action.call(response)
+      rescue RestClient::ExceptionWithResponse => e
+        {result: "#{e.message}: #{parse_exception_with_response(e)}", status: :aborted}
       rescue Exception => e
         {result: e.message, status: :aborted}
       end
 
-      def raw_get_to_server(route, options)
-        RestClient.get("#{test_runner_url}/#{route}", options)
+      def do_get(route, headers)
+        RestClient.get "#{test_runner_url}/#{route}", build_headers(headers)
       end
 
-      def post_to_server(request, route)
+      def do_json_post(route, request, headers)
         JSON.parse RestClient::Request.new(
                        method: :post,
                        url: "#{test_runner_url}/#{route}",
                        payload: request.to_json,
                        timeout: @timeout,
                        open_timeout: @timeout,
-                       headers: {content_type: :json}).execute()
+                       headers: build_headers(json_content_type(headers))).execute
       end
 
-      private
-
       def get_assets_for(kind, content_type)
         absolutize(@language_json.dig("#{kind}_assets_urls", content_type) || [])
       end
@@ -112,6 +120,20 @@ module Mumukit
       def absolutize(urls)
         urls.map { |url| "#{test_runner_url}/#{url}"}
       end
+
+      def build_headers(headers)
+        self.headers.merge(headers)
+      end
+
+      def json_content_type(headers)
+        headers.merge(content_type: :json)
+      end
+
+      def parse_exception_with_response(error)
+        (JSON.parse(error.response)['out'] rescue nil) ||
+          error.response.presence ||
+          "<no reason>"
+      end
     end
   end
 end

data/lib/mumukit/bridge/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Bridge
-    VERSION = '3.5.1'
+    VERSION = '3.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-bridge
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler