teaspoon 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925c0d611aedd7f504a1a26196bf3c0bb1ce085e
-  data.tar.gz: 3bbe87a54d66241b49eed717545ca8cbdeafda96
+  metadata.gz: baf9f6b71a048c4a8ca1490cc8ef46a05b993803
+  data.tar.gz: 2549ceb1312eb411c92f1592d5013263074093fc
 SHA512:
-  metadata.gz: f22aa8556ac90c824184eae69afe1d3ae96699f0e19dbab6e8daee2e57c6e6357861cce003f89ee419db44379478e87720d0be4a69ec0f82f271406911aff620
-  data.tar.gz: 3a28f2b2b9ce0663cfe8a6ae81f2890fc5d77e53ec208118530b38b2858a864bc1ab3f71b1653b60be6abcc3d6d2a823b251e696bd22ac369258616715895b5c
+  metadata.gz: a428ef8433d1bea881e3de18b3d1f87d6805c75fbd1e6ae604ed5da780ca14e447c26369a3887be8b7803768dffd6dfce99b5ad16048f84badf98c91062632db
+  data.tar.gz: e8bc26bd42a72786b80e461fce98fc254f587766049d59b602daa7ad05fccbd8b08a7d0ebf78f3b35eac03f87b6301e52a1dda1515ebc2ebcd3ac118a527aefc

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 #### Bug Fixes
 
+### 1.1.3
+
+#### Bug Fixes
+
+* Fix for version check of ActionView, to expand the version checking for security/bug fix releases.
+
 
 ### 1.1.2
 

data/app/controllers/teaspoon/suite_controller.rb

@@ -1,6 +1,10 @@
 class Teaspoon::SuiteController < ActionController::Base
-  before_filter :check_env
-  before_filter :prepend_fixture_paths
+  def self.before(*args)
+    respond_to?(:before_action) ? before_action(*args) : before_filter(*args)
+  end
+
+  before :check_env
+  before :prepend_fixture_paths
 
   layout false
 
@@ -14,8 +18,8 @@ class Teaspoon::SuiteController < ActionController::Base
 
   def hook
     hooks = Teaspoon::Suite.new(params).hooks[params[:hook].to_s]
-    hooks.each { |hook| hook.call(params[:args]) }
-    render nothing: true
+    hooks.each { |hook| hook.call(hook_params(params[:args])) }
+    head(:success)
   end
 
   def fixtures
@@ -33,4 +37,9 @@ class Teaspoon::SuiteController < ActionController::Base
       prepend_view_path Teaspoon.configuration.root.join(path)
     end
   end
+
+  def hook_params(params)
+    return params.permit!.to_h if params.respond_to?(:permit!)
+    params
+  end
 end

data/lib/teaspoon/engine.rb

@@ -98,12 +98,12 @@ end
 
 begin
   require 'action_view'
-  if ActionView::VERSION::STRING == '4.2.5'
+  if ActionView::VERSION::STRING == "4.2.5" || ActionView::VERSION::MAJOR >= 5
     require 'action_view/helpers/asset_tag_helper'
     module ActionView::Helpers::AssetTagHelper
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!('protocol', 'extname').symbolize_keys
+        path_options = options.extract!('protocol', 'extname', 'host').symbolize_keys
         path_options[:debug] = options['allow_non_precompiled']
         sources.uniq.map { |source|
           tag_options = {

data/lib/teaspoon/version.rb

@@ -1,3 +1,3 @@
 module Teaspoon
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teaspoon
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - jejacks0n
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -22,7 +22,7 @@ dependencies:
         version: 3.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 3.2.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 description: Run Javascript tests using Jasmine, Mocha or QUnit in the browser or
   headless using PhantomJS, Selenium Webdriver, or Capybara Webkit
 email: