blade 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e7bb7f80fe929f752ce8fc4123466464fd832ab
-  data.tar.gz: dd13a3365981759f52cdebec0742f1605662cea1
+  metadata.gz: 036f656e11ef4e58b8754e1fa79f3dd2b201ec6d
+  data.tar.gz: 861f57df946610dcf07e195476e316b8a665e73c
 SHA512:
-  metadata.gz: 4ff02f3a5d8f2b816514ad47ba39d35ad52c3456b5ec65d96bfddd52ebff142539d0d3585dd311ae26b958fac6ba865b7c3db0d6f69c703f1a83410d02e06f89
-  data.tar.gz: 301fd0c12026cd5a6d599f0734877b700d7fb25659f694910ec1d13004b767c9af61d9c2a01c8dd2b1ef7ea4ec5e83d944571cbcaed2272b5d1803a2f9b45e08
+  metadata.gz: 89495488ab78a6b6d95a745573530abcdb18f4e2c23fd42f7e52865a15ae0802e2234bd201e50240475a4150201531bc67432006851da299119ed70761424a99
+  data.tar.gz: 31ced33e906e14e7bc223aa72466634e28740edb2c2348f450f9c2c7317768eb75c7355814efd4139f5c8071823b5a5bc538435daa1e7b9420bd0ed2dceebb97

data/assets/index.coffee

@@ -1,39 +1,35 @@
+@Blade =
+  suiteDidBegin: (details) ->
+    publish("/tests", event: "begin", total: details.total)
+
+  testDidEnd: (details) ->
+    publish("/tests", event: "result", result: details.pass, name: details.name, message: details.message)
+
+  suiteDidEnd: (details) ->
+    publish("/tests", event: "end", total: details.total)
+
+publish = (channel, data = {}) ->
+  client.publish(channel, copy(data, {session_id})) if session_id?
+
+copy = (object, withAttributes = {}) ->
+  result = {}
+  result[key] = value for key, value of object
+  result[key] = value for key, value of withAttributes
+  result
+
 getWebSocketURL = ->
   element = document.querySelector("script[data-websocket]")
   element.src.replace(/\/client\.js$/, "")
 
-@client = new Faye.Client getWebSocketURL()
-session_id = document.cookie.match(/blade_session=(\w+)/)?[1]
+getSessionId = ->
+  document.cookie.match(/blade_session=(\w+)/)?[1]
 
-publish = ({channel, event, data}) ->
-  if session_id?
-    data = extend(copy(data), {event, session_id})
-    client.publish(channel, data)
+client = new Faye.Client(getWebSocketURL())
 
-copy = (object) ->
-  results = {}
-  results[key] = value for key, value of object
-  results
-
-extend = (object, attributes) ->
-  object[key] = value for key, value of attributes
-  object
-
-if session_id?
+if session_id = getSessionId()
   client.subscribe "/assets", (data) ->
     location.reload() if data.changed
 
   setInterval ->
-    publish(channel: "/browsers", event: "ping")
+    publish("/browsers", event: "ping")
   , 1000
-
-@Blade =
-  suiteBegin: ({total}) ->
-    publish("/tests", event: "begin", data: {total})
-
-  testResult: ({name, pass, message}) ->
-    result = pass
-    publish(channel: "/tests", event: "result", data: {result, name, message})
-
-  suiteEnd: (details) ->
-    publish(channel: "/tests", event: "end", data: details)

data/blade.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "blade-qunit_adapter"
+  spec.add_dependency "blade-qunit_adapter", "~> 0.3.0"
   spec.add_dependency "activesupport", ">= 3.0.0"
   spec.add_dependency "coffee-script", "~> 2.4.0"
   spec.add_dependency "coffee-script-source", "~> 1.9.0"

data/lib/blade/test_results.rb

@@ -1,5 +1,5 @@
 class Blade::TestResults
-  attr_reader :session_id, :status, :lines, :passes, :failures
+  attr_reader :session_id, :status, :lines, :passes, :failures, :total
 
   def initialize(session_id)
     @session_id = session_id
@@ -16,9 +16,8 @@ class Blade::TestResults
     @lines = []
     @passes = []
     @failures = []
-    @completed = false
     @status = "pending"
-    @total = nil
+    @total = 0
   end
 
   def process_test_result(details)
@@ -47,21 +46,13 @@ class Blade::TestResults
       publication.merge!(line: line, pass: pass)
     when "end"
       @status = failures.any? ? "failed" : "finished"
-      @completed = true
+      publication[:completed] = true
     end
 
-    publication.merge!(status: status, session_id: session_id, completed: @completed)
+    publication.merge!(status: status, session_id: session_id)
     Blade.publish("/results", publication)
   end
 
-  def total
-    if @total
-      @total
-    elsif @completed
-      passes.size + failures.size
-    end
-  end
-
   def to_s
     lines.join("\n") + "\n"
   end

data/lib/blade/version.rb

@@ -1,3 +1,3 @@
 module Blade
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blade
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Javan Makhmali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-29 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: blade-qunit_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement