gusto 1.0.0.beta11 → 1.0.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de263843ab3b190ea1a2d0ef8266b0b7d4e85073
-  data.tar.gz: 596d9a3cb5595adb0ddbf16080bf3d2e8dc4514a
+  metadata.gz: 2f4d920e872884a37580166a39e194890f412ea4
+  data.tar.gz: 63557788ec1dbf8881303ba618a33c343c64ad26
 SHA512:
-  metadata.gz: bdf0f74553ebe3a947cf8cb35ed1c45f8c30f99f5d41cce8c44f1113485c507f1ed24653e307af321a1dcf635187dd24f19e6373550dd2286673d275f1851ece
-  data.tar.gz: e169d8ff132e7fa2ae1f2fbea7e259e544780e4776d6c7bfb8eaccc357b93ada9a4c8c14ea1b05a52ebd40b73d0f69e06b77d7d3760a63d2a2ae82b378a9158a
+  metadata.gz: 8a4f789b06d7cd4b905c923e32ae4ea2c84bd7e0b97e0700f1a14ad20055928cafeb7f47048d7fd24ff066d503bce21fef85939a26df3b1bc2b54ce96d7d8eef
+  data.tar.gz: 207fe7eff5dd1b2d3fdda6fed3adecde97118971032d90b7fd6f3b573d298fa501d345c83782ed518814e9b0c432d1a9899b7338f37122721b3928ca9a8477a3

data/lib/Spec/DSL.coffee

@@ -9,14 +9,28 @@ window.Spec.DSL = DSL =
   before: (action) ->
     @__spec_definingSuite.filter null, action
 
-  # Allows an assertion on a non-object value
+  # Sets up an expected result for this test
   expect: (object) ->
+    # Specifies that the object should receive a positive response from a
+    # matcher function
     to: (matcher) ->
-      result = matcher(object)
-      throw new Spec.ExpectationError("expected #{result[1]}") unless result[0]
+      match = matcher(object)
+      throw new Spec.ExpectationError("expected #{match.description}") unless match.result
+
+    # Specifies that the object should receive a negative response
     notTo: (matcher) ->
-      result = matcher(object)
-      throw new Spec.ExpectationError("expected not #{result[1]}") if result[0]
+      match = matcher(object)
+      throw new Spec.ExpectationError("expected not #{match.description}") if match.result
+
+    # Sets up a stub on the given method, with a delayed expectation that this
+    # stub method be called
+    toReceive: (method) ->
+      Spec.MethodStub.stub(object, method).expect()
+
+    # Sets up a stub on the given method, with a delayed expectation that this
+    # stub method is never called
+    notToReceive: (method) ->
+      Spec.MethodStub.stub(object, method).expect().never()
 
   # Syntactic sugar to create a before method that prepares a variable
   #

data/lib/Spec/DelayedExpectation.coffee

@@ -14,7 +14,7 @@ class window.Spec.DelayedExpectation
 
   @assert: ->
     asserting = @expectations
-    @expectations = []
+    @reset()
     for expectation in asserting
       expectation.assert()
 
@@ -25,6 +25,11 @@ class window.Spec.DelayedExpectation
     @met      = 0
     @desired  = 1
 
+  # Specifies that this expectation should not be met
+  never: ->
+    @desired = 0
+    this
+
   # Specifies that this expectation must be met twice to count
   # as a success.
   twice: ->

data/lib/Spec/Matchers.coffee

@@ -4,23 +4,25 @@ window.Spec.Matchers =
   # Tests if matched value === expected value
   be: (expected) ->
     (value) ->
-      [value is expected, "to be #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"]
+      result:       value is expected
+      description:  "be #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
 
   # Tests that value type matches specified class
   beA: (klass) ->
     switch klass
-      when Boolean  then _haveType 'boolean'
-      when Function then _haveType 'function'
-      when Number   then _haveType 'number'
-      when String   then _haveType 'string'
-      when Object   then _haveType 'object'
+      when Boolean  then _haveType 'boolean', klass
+      when Function then _haveType 'function', klass
+      when Number   then _haveType 'number', klass
+      when String   then _haveType 'string', klass
+      when Object   then _haveType 'object', klass
       else _beAnInstanceOf klass
 
   # Tests if matched value == expected value
   equal: (expected) ->
     (value) ->
-      [String(value) == String(expected), "“#{String value}” to equal “#{String expected}” – #{$.trim diffString(String(value), String(expected))}"]
-  
+      result:       String(value) == String(expected)
+      description:  "equal “#{String expected}”, actual “#{String value}” – #{$.trim diffString(String(value), String(expected))}"
+
   # All-purpose inclusion matcher
   include: (expected) ->
     if expected instanceof Array
@@ -28,7 +30,8 @@ window.Spec.Matchers =
         match = true
         for test in expected
           match = false unless (value.indexOf && value.indexOf(test) >= 0) || value[test]?
-        [match, "to include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"]
+        result:       match
+        description:  "include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}"
     else if typeof expected == 'object'
       (value) ->
         missing = {}
@@ -38,10 +41,11 @@ window.Spec.Matchers =
             unless value[test] isnt undefined && String(value[test]) == String(expected[test])
               match = false
               missing[test] = expected[test]
-        [match, "to include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}, missing #{Spec.Util.inspect missing}"]
+        result:       match
+        description:  "include #{Spec.Util.inspect expected}, actual #{Spec.Util.inspect value}, missing #{Spec.Util.inspect missing}"
     else
       include([expected])
-  
+
   # Tests if a function causes an error to be thrown when called
   throwError: (message) ->
     (fn) ->
@@ -50,20 +54,26 @@ window.Spec.Matchers =
         fn()
       catch e
         thrown = e.message
-      finally
-        if thrown
-          return [thrown == message, "to throw an error with message “#{String thrown}”, actual message “#{String message}” – #{$.trim diffString(String(thrown), String(message))}"]
-        else
-          return [false, "to throw an error with message “#{message}”, no error thrown"]
+      if thrown
+        result:      thrown == message
+        description: "throw an error with message “#{String thrown}”, actual message “#{String message}” – #{$.trim diffString(String(thrown), String(message))}"
+      else
+        result:      false
+        description: "throw an error with message “#{message}”, no error thrown"
 
-  # Tests a value type using typeof
-  _haveType: (type) ->
-    (value) ->
-      [typeof value is type, "to have type “#{type}”, actual “#{typeof value}”"]
+  # Tests a value type using typeof, falling back to instanceof if type is an object
+  _haveType: (type, klass) ->
+    (value) =>
+      if typeof value is 'object'
+        @_beAnInstanceOf(klass)(value)
+      else
+        result:       typeof value is type
+        description:  "to have type “#{type}”, actual “#{typeof value}”"
 
   # Tests if matched value is an instance of class
   _beAnInstanceOf: (klass) ->
     (value) ->
-      [value instanceof klass, "to be an instance of “#{klass}”"]
+      result:      value instanceof klass
+      description: "#{value} to be an instance of “#{klass.name || klass}”, actually “#{Spec.Util.inspectClass value}"
 
 window.Spec.Matchers.beAn = window.Spec.Matchers.beA

data/lib/Spec/MethodStub/PossibleCall.coffee

@@ -31,6 +31,11 @@ class window.Spec.MethodStub.PossibleCall
     @expectation ||= Spec.DelayedExpectation.add('get called')
     this
 
+  # Delegates to expectation
+  never: ->
+    @expectation.never()
+    this
+
   # Delegates to expectation
   twice: ->
     @expectation.twice()

data/lib/Spec/MethodStub.coffee

@@ -13,6 +13,13 @@ class window.Spec.MethodStub
     while stub = @stubs.pop()
       stub.remove()
 
+  @stub: (object, method) ->
+    stub = if object[method] && object[method]._stub
+      object[method]._stub
+    else
+      new Spec.MethodStub(object, method)
+    stub.possibleCall()
+
   constructor: (@object, @method) ->
     @possibleCalls = []
     @_replaceMethodOnObject()

data/lib/Spec/ObjectDSL.coffee

@@ -3,11 +3,7 @@ window.Spec ||= {}
 window.Spec.ObjectDSL =
   # Stubs a method on object
   stub: (method) ->
-    stub = if @[method] && @[method]._stub
-      @[method]._stub
-    else
-      new Spec.MethodStub(this, method)
-    stub.possibleCall()
+    Spec.MethodStub.stub(this, method)
 
   # Tests for a positive match
   should: (matcher) ->
@@ -19,8 +15,8 @@ window.Spec.ObjectDSL =
 
   # Creates a stub method with an expectation
   shouldReceive: (method) ->
-    @stub(method).expect()
+    expect(this).toReceive method
 
   # Creates a stub method, with an expectation of no calls
-  shouldNotReceive: (name) ->
-    @shouldReceive(name).exactly(0).times
+  shouldNotReceive: (method) ->
+    expect(this).notToReceive method

data/lib/Spec/Util.coffee

@@ -1,15 +1,14 @@
 window.Spec ||= {}
 
 window.Spec.Util =
+  # Extends one object with all properties from one or more other objects.
+  # This differs from extend methods in frameworks like jQuery and Underscore
+  # in that it will not overwrite properties that already exist
   extend: (object, extensions...) ->
     for extension in extensions
       for key, value of extension
-        object[key] = value
-
-  unextend: (object, extensions...) ->
-    for extension in extensions
-      for key, value of extension
-        delete object[key]
+        object[key] ||= value
+    object
 
   reference: (value) ->
     if typeof value is 'function'
@@ -47,17 +46,7 @@ window.Spec.Util =
 
   # Returns an HTML representation of any kind of object
   inspect: (object) ->
-    if object instanceof Array
-      s = '['
-      first = true
-      for item in object
-        if first
-          first = false
-        else
-          first += ', '
-        s += "“#{@escape(String(item))}”"
-      s + ']'
-    else if object is null
+    if object is null
       'null'
     else if object is undefined
       'undefined'
@@ -65,21 +54,24 @@ window.Spec.Util =
       'true'
     else if object is false
       'false'
+    else if object instanceof Array
+      items = for item in object
+        Spec.Util.inspect item
+      "[#{items.join ', '}]"
     else if typeof object == 'object'
-      s = "{"
-      first = true
-      for key of object
+      properties = []
+      for key, value of object
         # Access hasOwnProperty through Object.prototype to work around bug
         # in IE6/7/8 when calling hasOwnProperty on a DOM element
         if Object.prototype.hasOwnProperty.call(object, key)
-          if first
-            first = false
-          else
-            s += ", "
-          s += @escape(key) + ': “' + @escape(String(object[key])) + '”'
-      s + "}"
+          properties.push Spec.Util.escape(key) + ': ' + Spec.Util.inspect(value)
+      "{#{properties.join ', '}}"
     else
-      "“#{@escape(object)}”"
+      "“#{Spec.Util.escape(object)}”"
+
+  # Gets the class name of an object using JavaScript magic
+  inspectClass: (object) ->
+    Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1]
 
   # Escapes text for HTML
   escape: (string) ->

data/lib/Spec.coffee

@@ -52,7 +52,6 @@ Spec.Util.extend window.Spec,
       Number,
       RegExp,
       String,
-      @root,
       Element,
       jQuery,
       Spec.Mock

data/lib/gusto/version.rb

@@ -1,3 +1,3 @@
 module Gusto
-  VERSION = "1.0.0.beta11"
+  VERSION = "1.0.0.beta12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gusto
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta11
+  version: 1.0.0.beta12
 platform: ruby
 authors:
 - Tobias Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -130,36 +130,36 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- assets/test_results.sass
 - assets/colors.sass
-- assets/spec.css.sass
 - assets/result_summary.sass
+- assets/spec.css.sass
+- assets/test_results.sass
 - bin/gusto
-- lib/Spec.coffee
-- lib/gusto.rb
 - lib/HtmlReport.coffee
-- lib/gusto/sprockets.rb
-- lib/gusto/configuration.rb
-- lib/gusto/version.rb
-- lib/gusto/server.rb
-- lib/gusto/cli_renderer.rb
-- lib/gusto/runner.rb
+- lib/Spec.coffee
+- lib/Spec/DSL.coffee
+- lib/Spec/DelayedExpectation.coffee
 - lib/Spec/Matchers.coffee
-- lib/Spec/Mock.coffee
-- lib/Spec/MethodStub/PossibleCall.coffee
 - lib/Spec/MethodStub.coffee
+- lib/Spec/MethodStub/PossibleCall.coffee
+- lib/Spec/Mock.coffee
 - lib/Spec/ObjectDSL.coffee
-- lib/Spec/DSL.coffee
 - lib/Spec/Report.coffee
-- lib/Spec/Test.coffee
 - lib/Spec/RootSuite.coffee
-- lib/Spec/Util.coffee
 - lib/Spec/Suite.coffee
-- lib/Spec/DelayedExpectation.coffee
+- lib/Spec/Test.coffee
+- lib/Spec/Util.coffee
+- lib/gusto.rb
+- lib/gusto/cli_renderer.rb
+- lib/gusto/configuration.rb
+- lib/gusto/runner.rb
+- lib/gusto/server.rb
+- lib/gusto/sprockets.rb
+- lib/gusto/version.rb
 - phantom/headless_runner.js
-- public/jsdiff.js
 - public/ie.js
 - public/jquery-1.10.2.js
+- public/jsdiff.js
 - public/stacktrace.js
 - views/index.slim
 homepage: https://github.com/tobico/gusto
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Coffeescript testing framework