mumukit-bridge 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmNlZThkYjM3YzYxOWMxM2M5Y2MwNWE5MmNhNGI1YWRiMjViZDY1Mw==
+    ODBiZTk4NTliZjdjODllODNhZWZjZmJlMDI2Y2Y2MTFkNmY3YWVmNA==
   data.tar.gz: !binary |-
-    YzZlNmQ4ZGEzOWU3ZTI1ZjUyYjhlMmYyNGI0OTE3MDY1MWIyMjNhMA==
+    NWZhOGVlN2ZlZWYwNDFiYTE4MWEwMGM0ZDdjMDI0YmE1NWEwYzVlNQ==
 SHA512:
   metadata.gz: !binary |-
-    YmNhYjU4ZGQ0ZjUwMTE2ZjA4OWFiMTRmM2RiODZiNTc3NjM4MzYyYmYxOTBm
-    ZjkwMGY2MzIwNDg4NTgxMThlNmIxYjAzMDAzZDM4NzY0NGIwYjdiYmE5ZjMz
-    OTMxMTU0YWJmN2YxZGI2NWEwNGE2MDAyOTBmZjUzOWQ0Y2Q1NmE=
+    NTM5YjJmN2QwYjI0MTc5MzI1YThlNDc0MjNiOTBiOTc3NGU3NjhlN2JkZGMx
+    NzA3ZDhlYmRkM2IzZTEzZTViZGEwMjNjNjJhMWU1ZjllZTMyY2E4ZWI0NGFh
+    ZTVmNTMxOGM5NjNlMjdkYTYxMDA2ZGE5NmFjYWI4YjM4OWRmN2E=
   data.tar.gz: !binary |-
-    MGYyM2U5ZmM0NGNiNTFmMDg0Njg2Y2I4ZDc5NDQ4YWI4NjhjYmFjNjIyNWQ0
-    ZGRiZDZlZWI4NTM4OGZhMWJjZTcyZGVkMThlMWJkNWUxYmM5NTk1MTA1ODJi
-    YjJkMzZjMmMxZDgxNzRkZTBhMDc4M2E2ZWM1YmIwYjRlYmI1NGE=
+    ODNkOGEyNzY2ZWEzODYxMmViMTRjZmVjN2E5MmNhODExM2Y3ZTRmZDY4ZTEz
+    OGM3MzYzZjI2ZWM3OGZhZDA5YmVmMjY1ZDMzMWE1MjNiYjg3NjY0YzUzZGI2
+    ZjZlNGRlNDJkMzlhMTVmZTUzNzVhOTZjMDdmNmExNmQ5ZTE5OTM=

data/lib/mumukit/bridge.rb

@@ -1,6 +1,12 @@
 require 'mumukit/bridge/version'
+require 'mumukit/bridge/response_type'
+require 'mumukit/bridge/array'
+require 'mumukit/bridge/boolean'
+
 require 'rest_client'
 
+require 'active_support/core_ext/object'
+
 module Mumukit
   module Bridge
     class Bridge
@@ -13,25 +19,17 @@ module Mumukit
       # Expects a hash
       #  {test: string, extra: string, content: string, expectations: [{binding:string, inspection: string})]}
       # Returns a hash
-      #   {result: string, status: string, expectation_results: [{binding:string, inspection:string, result:symbol}], feedback: string}
+      #   {result: string,
+      #    test_results: [{title:string, status:symbol, result:string}],
+      #    status: :passed|:failed|:errored|:aborted|:passed_with_warnings,
+      #    expectation_results: [{binding:string, inspection:string, result:symbol}],
+      #    feedback: string}
       def run_tests!(request)
         response = post_to_server(request)
-
-        {result: response['out'],
-         status: response['exit'],
-         expectation_results: parse_expectation_results(response['expectationResults'] || []),
-         feedback: response['feedback'] || ''}
-
+        response_type = ResponseType.for_response response
+        response_type.parse response
       rescue Exception => e
-        {result: e.message, status: :failed}
-      end
-
-      def parse_expectation_results(results)
-        results.map do |it|
-          {binding: it['expectation']['binding'],
-           inspection: it['expectation']['inspection'],
-           result: it['result'] ? :passed : :failed}
-        end
+        {result: e.message, status: :errored}
       end
 
       def post_to_server(request)

data/lib/mumukit/bridge/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def fetch_mumuki_status(key)
+    all? { |it| it[key] == :passed }.to_mumuki_status
+  end
+end

data/lib/mumukit/bridge/boolean.rb

@@ -0,0 +1,11 @@
+class TrueClass
+  def to_mumuki_status
+    :passed
+  end
+end
+
+class FalseClass
+  def to_mumuki_status
+    :failed
+  end
+end

data/lib/mumukit/bridge/response_type.rb

@@ -0,0 +1,65 @@
+module Mumukit::Bridge
+  module ResponseType
+    class Base
+      def parse(response)
+        expectation_results = parse_expectation_results(response['expectationResults'] || [])
+        feedback = response['feedback'] || ''
+        result = response['out'] || ''
+
+        build_hash(response).
+            merge(feedback: feedback, expectation_results: expectation_results, result: result).
+            update(status: expectation_results.fetch_mumuki_status(:result)) { |_, t, e| global_status(t, e) }
+      end
+
+      def global_status(test_status, expectation_status)
+        if test_status == :passed && expectation_status == :failed
+          :passed_with_warnings
+        else
+          test_status
+        end
+      end
+
+      def parse_expectation_results(results)
+        results.map do |it|
+          {binding: it['expectation']['binding'],
+           inspection: it['expectation']['inspection'],
+           result: it['result'].to_mumuki_status}
+        end
+      end
+    end
+
+    class Structured < Base
+      def build_hash(response)
+        test_results = parse_test_results(response['testResults'])
+        {response_type: :structured,
+         test_results: test_results,
+         status: test_results.fetch_mumuki_status(:status)}
+      end
+
+      private
+
+      def parse_test_results(results)
+         results.map { |it| {
+             title: it['title'],
+             status: it['status'].to_sym,
+             result: it['result']} }
+      end
+    end
+
+    class Unstructured < Base
+      def build_hash(response)
+        {response_type: :unstructured,
+         test_results: [],
+         status: response['exit'].to_sym}
+      end
+    end
+
+    def self.structured_test_results?(response)
+      response['testResults'].present?
+    end
+
+    def self.for_response(response)
+      structured_test_results?(response) ? Structured.new : Unstructured.new
+    end
+  end
+end

data/lib/mumukit/bridge/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Bridge
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-bridge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - flbulgarelli@yahoo.com.ar
@@ -74,6 +88,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mumukit/bridge.rb
+- lib/mumukit/bridge/array.rb
+- lib/mumukit/bridge/boolean.rb
+- lib/mumukit/bridge/response_type.rb
 - lib/mumukit/bridge/version.rb
 homepage: http://github.com/uqbar-project/mumukit-bridge
 licenses: