teaspoon 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17feb8da692ba7ff472c5bf6d3735085ab3ad6e4
-  data.tar.gz: 33e3ca26a7d1d24b20238eeebeb8b679d6751dd2
+  metadata.gz: c6947cdfc11c4b82dfb1c0db440b2effbcaa2b69
+  data.tar.gz: 0d792be5439b2f8b55c458620556e0ee9030aca4
 SHA512:
-  metadata.gz: 912fef66a4bb0eb74c877c821c1b7e4ad0dd20a30897e6de8e5c95392085424b8a0e7f0a58c917fe01154353c8d9aac3d377f301b01186ec14184bf78883ae13
-  data.tar.gz: 1e09ccfd90a16392134f958350f3eb41b7bd70e042896852a5b0df9c8c3bdd79848fbce9f2c5b55ec34f465fc2f80ea1fbbda0d8ddd82f4d6ae7710f2fe51e79
+  metadata.gz: eb2cc7fb2e22d878e9f6a5877ddc71b8c21c7b004d17b1dfc76e3d6ea8e2fad666f9927cfe9b532fec219963ed27d21a0abb0dc3d712007b0057bf0a7a42a544
+  data.tar.gz: d7eab6abba8e2479aad8fe1551ea1e3c3358fe1b54b9cf8262acc7504f992e7df6ba392996b869f9458a6733eaf9d33160f6df4169695c713f65f5b20914280e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ### Unreleased
 
+### 1.0.2 (5/5/15)
+
+#### Bug Fixes
+
+* Use a more robust phantomjs polyfill (#360)
+* Revive support for 1.9.3 (#361)
+
 
 ### 1.0.1 (5/5/15)
 

data/app/assets/javascripts/support/phantomjs-shims.js

@@ -0,0 +1,35 @@
+(function() {
+
+var Ap = Array.prototype;
+var slice = Ap.slice;
+var Fp = Function.prototype;
+
+if (!Fp.bind) {
+  // PhantomJS doesn't support Function.prototype.bind natively, so
+  // polyfill it whenever this module is required.
+  Fp.bind = function(context) {
+    var func = this;
+    var args = slice.call(arguments, 1);
+
+    function bound() {
+      var invokedAsConstructor = func.prototype && (this instanceof func);
+      return func.apply(
+        // Ignore the context parameter when invoking the bound function
+        // as a constructor. Note that this includes not only constructor
+        // invocations using the new keyword but also calls to base class
+        // constructors such as BaseClass.call(this, ...) or super(...).
+        !invokedAsConstructor && context || this,
+        args.concat(slice.call(arguments))
+      );
+    }
+
+    // The bound function must share the .prototype of the unbound
+    // function so that any object created by one constructor will count
+    // as an instance of both constructors.
+    bound.prototype = func.prototype;
+
+    return bound;
+  };
+}
+
+})();

data/lib/teaspoon/exceptions.rb

@@ -1,109 +1,101 @@
 module Teaspoon
   class Error < StandardError
+    protected
+
+    def build_message(msg_or_options)
+      if msg_or_options.is_a?(String)
+        msg_or_options
+      else
+        yield msg_or_options
+      end
+    end
   end
 
   class Failure < Teaspoon::Error
   end
 
   class EnvironmentNotFound < Teaspoon::Error
-    def initialize(msg = nil, searched:)
-      msg ||= "Unable to locate environment; searched in [#{searched}]. Have you run the installer?"
-      super(msg)
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unable to locate environment; searched in [#{options[:searched]}]. Have you run the installer?"
+      end)
     end
   end
 
   # loading / configuration errors
 
   class UnknownFramework < Teaspoon::Error
-    def initialize(msg = nil, name:, available:)
-      msg ||= "Unknown framework: expected \"#{name}\" to be a registered framework. Available frameworks are #{available}."
-      if available.blank?
-        msg += " Do you need to update your Gemfile to use the teaspoon-#{name} gem? If you are upgrading, please see https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md"
-      end
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        msg = "Unknown framework: expected \"#{options[:name]}\" to be a registered framework. Available frameworks are #{options[:available]}."
+        if options[:available].blank?
+          msg += " Do you need to update your Gemfile to use the teaspoon-#{options[:name]} gem? If you are upgrading, please see https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md"
+        end
+      end)
     end
   end
 
   class UnknownFrameworkVersion < Teaspoon::Error
-    def initialize(msg = nil, name:, version:)
-      msg ||= "Unknown framework version: expected \"#{name}\" to have version #{version}."
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unknown framework version: expected \"#{options[:name]}\" to have version #{options[:version]}."
+      end)
     end
   end
 
   class UnknownDriver < Teaspoon::Error
-    def initialize(msg = nil, name:, available:)
-      msg ||= "Unknown driver: expected \"#{name}\" to be a registered driver. Available drivers are #{available}"
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unknown driver: expected \"#{options[:name]}\" to be a registered driver. Available drivers are #{options[:available]}"
+      end)
     end
   end
 
   class UnknownFormatter < Teaspoon::Error
-    def initialize(msg = nil, name:, available:)
-      msg ||= "Unknown formatter: expected \"#{name}\" to be a registered formatter. Available formatters are #{available}"
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unknown formatter: expected \"#{options[:name]}\" to be a registered formatter. Available formatters are #{options[:available]}"
+      end)
     end
   end
 
   class UnspecifiedFramework < Teaspoon::Error
-    def initialize(msg = nil, name:)
-      msg ||= "Missing framework: expected \"#{name}\" suite to configure one using `suite.use_framework`."
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Missing framework: expected \"#{options[:name]}\" suite to configure one using `suite.use_framework`."
+      end)
     end
   end
 
   class UnspecifiedDependencies < Teaspoon::Error
-    def initialize(msg = nil, framework:, version:)
-      msg ||= "Missing dependencies: expected framework \"#{framework}\" (#{version}) to specify the `dependencies` option when registering."
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Missing dependencies: expected framework \"#{options[:framework]}\" (#{options[:version]}) to specify the `dependencies` option when registering."
+      end)
     end
   end
 
   class UnknownSuite < Teaspoon::Error
-    def initialize(msg = nil, name:)
-      msg ||= "Unknown suite configuration: expected \"#{name}\" to be a configured suite."
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unknown suite configuration: expected \"#{options[:name]}\" to be a configured suite."
+      end)
     end
   end
 
   class UnknownCoverage < Teaspoon::Error
-    def initialize(msg = nil, name:)
-      msg ||= "Unknown coverage configuration: expected \"#{name}\" to be a configured coverage."
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unknown coverage configuration: expected \"#{options[:name]}\" to be a configured coverage."
+      end)
     end
   end
 
   class NotFoundInRegistry < Teaspoon::Error
-    def initialize(msg = nil, name:, available:)
-      msg ||= "Unknown configuration: expected \"#{name}\" to be registered. Available options are #{available}"
-      super(msg)
-    end
-
-    def available
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unknown configuration: expected \"#{options[:name]}\" to be registered. Available options are #{options[:available]}"
+      end)
     end
   end
 
@@ -130,23 +122,26 @@ module Teaspoon
   end
 
   class ServerError < Teaspoon::Error
-    def initialize(msg = nil, desc: nil)
-      msg ||= "Unable to start teaspoon server; #{desc || 'for an unknown reason'}."
-      super(msg)
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unable to start teaspoon server; #{options[:desc] || 'for an unknown reason'}."
+      end)
     end
   end
 
   class DriverOptionsError < Teaspoon::Error
-    def initialize(msg = nil, types: nil)
-      msg ||= "Malformed driver options#{types ? ": expected a valid #{types}." : '.'}"
-      super(msg)
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Malformed driver options#{options[:types] ? ": expected a valid #{options[:types]}." : '.'}"
+      end)
     end
   end
 
   class AssetNotServableError < Teaspoon::Error
-    def initialize(msg = nil, filename: nil)
-      msg ||= "Unable to serve asset: expected \"#{filename || 'unknown file'}\" to be within a registered asset path."
-      super(msg)
+    def initialize(msg_or_options)
+      super(build_message(msg_or_options) do |options|
+        "Unable to serve asset: expected \"#{options[:filename] || 'unknown file'}\" to be within a registered asset path."
+      end)
     end
   end
 

data/lib/teaspoon/framework/base.rb

@@ -20,7 +20,10 @@ module Teaspoon
           name.present? ? @_framework_name ||= name.to_sym : @_framework_name
         end
 
-        def register_version(version, js_runner, dependencies: [], dev_deps: [])
+        def register_version(version, js_runner, options = {})
+          dependencies = options[:dependencies] || []
+          dev_deps = options[:dev_deps] || []
+
           if ENV["TEASPOON_DEVELOPMENT"] && dev_deps.any?
             dependencies = dev_deps
           end

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/teaspoon-devkit.rb

@@ -21,9 +21,15 @@ module Teaspoon
     end
   end
 
-  def self.setup_framework_tasks(framework:, framework_name:, framework_const:, framework_root:, compile_assets:)
+  def self.setup_framework_tasks(options)
     extend Rake::DSL
 
+    framework = options[:framework]
+    framework_name = options[:framework_name]
+    framework_const = options[:framework_const]
+    framework_root = options[:framework_root]
+    compile_assets = options[:compile_assets]
+
     namespace :teaspoon do
       namespace framework do
         desc "Run the #{framework_name} code examples"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -46,6 +46,7 @@ files:
 - MIT.LICENSE
 - README.md
 - app/assets/javascripts/support/bind-poly.js
+- app/assets/javascripts/support/phantomjs-shims.js
 - app/assets/javascripts/support/sinon.js
 - app/assets/javascripts/teaspoon-filterer.js
 - app/assets/javascripts/teaspoon/error.coffee