charcoal 0.2.2 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fda5dfba100b8fcd078a883a677592325a604fe7
+  data.tar.gz: 269dce65316a9da4bbd1b6422d1b4bb4e8e04e41
+SHA512:
+  metadata.gz: 0837c0cb9c6d537909ad952506f72d953644e3c3a6fbb82f66207f3e89f807df07b35e38087802d7fa988646e34de46e7d496e16786291c12f0f008f7d48a60c
+  data.tar.gz: 12743fae3e6df84e2ec3ce4f3ecd88d37a62a1d484b5d287da3c424e3cf7e399e81d4239e0dda1f0276f340a5b7a8f3d4d249f82f80f3a1d3dc1a451a176e4f9

data/README.md

@@ -33,9 +33,9 @@ Rails 2:
 map.connect "*path.:format", :conditions => { :method => :options }, :action => "preflight", :controller => "CORS", :namespace => "charcoal/"
 ```
 
-Rails 3:
+Rails 3 / 4:
 ```ruby
-match '*path' => 'charcoal/C_O_R_S#preflight', :via => :options
+match '*path.:format' => 'charcoal/cors#preflight', :via => :options
 ```
 
 #### Configuration
@@ -106,7 +106,7 @@ This example adds the `allow_animals` directive that logs "QUACK!" if an applica
 
 ## Supported Versions
 
-Tested with Ruby 1.9.3 and 2.0 and Rails 2.3 and 3.2.
+Tested with Ruby 1.9.3, 2.0 and 2.1.1 and Rails 2.3, 3.2, 4.0 and 4.1.
 [![Build Status](https://secure.travis-ci.org/steved555/charcoal.png?branch=master)](http://travis-ci.org/steved555/charcoal)
 
 ## Contributing to charcoal

data/lib/charcoal/cors_controller.rb

@@ -9,6 +9,8 @@ require 'charcoal/cors_helper'
 class Charcoal::CORSController < ActionController::Base
   include Charcoal::CORS
 
+  Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
+
   allow_cors :all
   skip_after_filter :set_cors_headers
 
@@ -27,7 +29,7 @@ class Charcoal::CORSController < ActionController::Base
   private
 
   def allowed_methods
-    @allowed_methods ||= ActionController::Routing::HTTP_METHODS.select do |verb|
+    @allowed_methods ||= Routing::HTTP_METHODS.select do |verb|
       next if verb == :options
 
       route = find_route(request.path, request.env.merge(:method => verb))
@@ -51,7 +53,13 @@ class Charcoal::CORSController < ActionController::Base
 
   def find_route(path, env)
     if ActiveSupport::VERSION::MAJOR >= 3
-      [Rails.application.routes, *Rails.application.railties.engines.map(&:routes)].each do |route_set|
+      routes = [Rails.application.routes]
+
+      railties = Rails.application.railties
+      railties = railties.respond_to?(:all) ? railties.all : railties._all
+      routes += railties.select {|tie| tie.is_a?(Rails::Engine)}.map(&:routes)
+
+      routes.each do |route_set|
         begin
           return route_set.recognize_path(path, env)
         rescue ActionController::RoutingError

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,112 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5'
 description: Helps you support JSONP and CORS in your Rails app
 email: sdavidovitz@zendesk.com
 executables: []
@@ -115,15 +58,8 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .travis.yml
-- Appraisals
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- charcoal.gemspec
-- gemfiles/rails_2.3.gemfile
-- gemfiles/rails_3.2.gemfile
 - lib/charcoal.rb
 - lib/charcoal/controller_filter.rb
 - lib/charcoal/cors.rb
@@ -131,37 +67,29 @@ files:
 - lib/charcoal/cors_helper.rb
 - lib/charcoal/jsonp.rb
 - lib/charcoal/version.rb
-- test/cors_controller_test.rb
-- test/cors_test.rb
-- test/filters_test.rb
-- test/helper.rb
-- test/jsonp_test.rb
-homepage: http://github.com/steved555/charcoal
+homepage: https://github.com/steved555/charcoal
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2616342384870554307
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cross-Origin helper for Rails
 test_files: []
+has_rdoc: 

data/.travis.yml

@@ -1,12 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-gemfile:
-  - gemfiles/rails_2.3.gemfile
-  - gemfiles/rails_3.2.gemfile
-cache: bundler
-script: "bundle exec rake test"
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_2.3.gemfile

data/Appraisals

@@ -1,7 +0,0 @@
-appraise "rails-2.3" do
-  gem "rails", "~> 2.3.0"
-end
-
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2.0"
-end

data/Gemfile

@@ -1,16 +0,0 @@
-source "http://rubygems.org"
-
-gem "bundler"
-
-gem "activesupport", ">= 2.3.5"
-gem "actionpack", ">= 2.3.5"
-
-gem "rake", :group => :development
-gem "yard", "~> 0.7", :group => :development
-gem "jeweler", :group => :development
-
-gem "rails", ">= 2.3.5", :group => :test
-gem "appraisal", ">= 0.5.0", :group => :test
-gem "shoulda", "~> 3.0", :group => :test
-gem "shoulda-context", :group => :test
-gem "mocha", :group => :test, :require => false

data/Rakefile

@@ -1,53 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development, :test)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
-require 'charcoal/version'
-
-require 'rake'
-require 'jeweler'
-
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "charcoal"
-  gem.version = Charcoal::VERSION
-  gem.homepage = "http://github.com/steved555/charcoal"
-  gem.license = "MIT"
-  gem.summary = %Q{Cross-Origin helper for Rails}
-  gem.description = %Q{Helps you support JSONP and CORS in your Rails app}
-  gem.email = "sdavidovitz@zendesk.com"
-  gem.authors = ["Steven Davidovitz"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'appraisal'
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-desc 'Test the plugin under all supported Rails versions.'
-task :all => ["appraisal:install"] do
-  exec('rake appraisal test')
-end
-
-task :default => :all
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/charcoal.gemspec

@@ -1,75 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "charcoal"
-  s.version = "0.2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steven Davidovitz"]
-  s.date = "2013-12-24"
-  s.description = "Helps you support JSONP and CORS in your Rails app"
-  s.email = "sdavidovitz@zendesk.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".travis.yml",
-    "Appraisals",
-    "Gemfile",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "charcoal.gemspec",
-    "gemfiles/rails_2.3.gemfile",
-    "gemfiles/rails_3.2.gemfile",
-    "lib/charcoal.rb",
-    "lib/charcoal/controller_filter.rb",
-    "lib/charcoal/cors.rb",
-    "lib/charcoal/cors_controller.rb",
-    "lib/charcoal/cors_helper.rb",
-    "lib/charcoal/jsonp.rb",
-    "lib/charcoal/version.rb",
-    "test/cors_controller_test.rb",
-    "test/cors_test.rb",
-    "test/filters_test.rb",
-    "test/helper.rb",
-    "test/jsonp_test.rb"
-  ]
-  s.homepage = "http://github.com/steved555/charcoal"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Cross-Origin helper for Rails"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bundler>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 2.3.5"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<actionpack>, [">= 2.3.5"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.7"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<actionpack>, [">= 2.3.5"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.7"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-

data/gemfiles/rails_2.3.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "bundler"
-gem "activesupport", ">= 2.3.5"
-gem "actionpack", ">= 2.3.5"
-gem "rake", :group=>:development
-gem "yard", "~> 0.7", :group=>:development
-gem "jeweler", :group=>:development
-gem "appraisal", ">= 0.5.0", :group=>:test
-gem "shoulda", "~> 3.0", :group=>:test
-gem "shoulda-context", :group=>:test
-gem "mocha", :group=>:test, :require=>false
-gem "rails", "~> 2.3.0"
-

data/gemfiles/rails_3.2.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "bundler"
-gem "activesupport", ">= 2.3.5"
-gem "actionpack", ">= 2.3.5"
-gem "rake", :group=>:development
-gem "yard", "~> 0.7", :group=>:development
-gem "jeweler", :group=>:development
-gem "appraisal", ">= 0.5.0", :group=>:test
-gem "shoulda", "~> 3.0", :group=>:test
-gem "shoulda-context", :group=>:test
-gem "mocha", :group=>:test, :require=>false
-gem "rails", "~> 3.2.0"
-

data/test/cors_controller_test.rb

@@ -1,92 +0,0 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-
-class TestController < ActionController::Base
-  include Charcoal::CORS
-  allow_cors :test
-
-  # GET, PUT
-  def test; end
-end
-
-class EngineController < ActionController::Base
-  include Charcoal::CORS
-  allow_cors :test
-
-  # POST
-  def test; end
-end
-
-class Charcoal::CORSControllerTest < ActionController::TestCase
-  context Charcoal::CORSController do
-    setup do
-      @request.env["HTTPS"] = "on"
-    end
-
-    context "unrecognized path to #preflight" do
-      setup do
-        @request.stubs(:path => "/my_unrecognized_path")
-        get :preflight
-      end
-
-      should "not set allow-origin" do
-        assert_nil @response.headers["Access-Control-Allow-Origin"], @response.headers.inspect
-      end
-
-      should "allow proper methods" do
-        assert_nil @response.headers["Access-Control-Allow-Methods"], @response.headers.inspect
-      end
-    end
-
-    context "OPTIONS to #preflight" do
-      context "with request method = OPTIONS" do
-        setup do
-          @request.stubs(:path => "/test")
-          get :preflight
-        end
-
-        should "allow proper methods" do
-          assert_equal "GET,PUT", @response.headers["Access-Control-Allow-Methods"], @response.headers.inspect
-        end
-
-        should "set Access-Control-Allow-Headers header" do
-          assert_equal Charcoal.configuration["allow-headers"].join(","), @response.headers["Access-Control-Allow-Headers"], @response.headers.inspect
-        end
-
-        should "set Access-Control-Max-Age header" do
-          assert_equal Charcoal.configuration["max-age"].to_s, @response.headers["Access-Control-Max-Age"], @response.headers.inspect
-        end
-
-        should "render text/plain response" do
-          assert_equal " ", @response.body
-          assert_match %r[text/plain], @response.headers["Content-Type"], @response.headers.inspect
-        end
-      end
-    end
-
-    if ActiveSupport::VERSION::MAJOR >= 3
-      context "engine request path" do
-        setup do
-          @request.stubs(:path => "/engine/abc/test")
-          get :preflight
-        end
-
-        should "allow proper methods" do
-          assert_equal "POST", @response.headers["Access-Control-Allow-Methods"], @response.headers.inspect
-        end
-
-        should "set Access-Control-Allow-Headers header" do
-          assert_equal Charcoal.configuration["allow-headers"].join(","), @response.headers["Access-Control-Allow-Headers"], @response.headers.inspect
-        end
-
-        should "set Access-Control-Max-Age header" do
-          assert_equal Charcoal.configuration["max-age"].to_s, @response.headers["Access-Control-Max-Age"], @response.headers.inspect
-        end
-
-        should "render text/plain response" do
-          assert_equal " ", @response.body
-          assert_match %r[text/plain], @response.headers["Content-Type"], @response.headers.inspect
-        end
-      end
-    end
-  end
-end

data/test/cors_test.rb

@@ -1,90 +0,0 @@
-require File.expand_path('helper', File.dirname(__FILE__))
-
-class TestCorsController < ActionController::Base
-  include Charcoal::CORS
-
-  allow_cors :test_action
-
-  def test_action
-    render :text => "noop"
-  end
-end
-
-class TestCorsControllerTest < ActionController::TestCase
-  context TestCorsController do
-    context "allowing cors" do
-      subject { TestCorsController.new }
-
-      setup do
-        subject.params = { :action => "test_action" }
-      end
-
-      should "allow cors" do
-        assert subject.send(:cors_allowed?)
-      end
-    end
-
-    context "cors callback" do
-      {
-        "Access-Control-Allow-Origin" => "allow-origin",
-        "Access-Control-Allow-Credentials" => "credentials",
-      }.each do |header, key|
-        context "CORS header -> #{header}" do
-          setup do
-            @original, Charcoal.configuration[key] = Charcoal.configuration[key], "test"
-
-            get :test_action
-          end
-
-          teardown do
-            Charcoal.configuration[key] = @original
-          end
-
-          should "be the same as the configuration" do
-            assert_equal "test", @response.headers[header], @response.headers.inspect
-          end
-        end
-      end
-
-      context "when Allow-Origin is a block" do
-        setup do
-          block = lambda do |controller|
-            controller.class.name
-          end
-
-          @original, Charcoal.configuration["allow-origin"] = Charcoal.configuration["allow-origin"], block
-
-          get :test_action
-        end
-
-        teardown do
-          Charcoal.configuration["allow-origin"] = @original
-        end
-
-        should "be the same as the configuration" do
-          assert_equal "TestCorsController", @response.headers["Access-Control-Allow-Origin"], @response.headers.inspect
-        end
-      end
-
-      context "without any other request method" do
-        setup do
-          @original, Charcoal.configuration["expose-headers"] = Charcoal.configuration["expose-headers"], %w{test 123}
-
-          get :test_action
-        end
-
-        teardown do
-          Charcoal.configuration["expose-headers"] = @original
-        end
-
-        should "render action" do
-          assert_equal "noop", @response.body
-        end
-
-        should "set Access-Control-Expose-Headers" do
-          assert_equal "test,123", @response.headers["Access-Control-Expose-Headers"], @response.headers.inspect
-        end
-      end
-    end
-  end
-end

data/test/filters_test.rb

@@ -1,128 +0,0 @@
-require File.expand_path('helper', File.dirname(__FILE__))
-
-class FiltersControllerTester < ActionController::Base
-  class << self
-    include Charcoal::ControllerFilter
-
-    allow :filtering do |method, directive|
-      filtering_allowed[method] = directive
-    end
-
-    def filtering_allowed
-      @filtering_allowed ||= Hash.new(lambda {|_| false })
-    end
-
-    def filtering_allowed?(instance, action)
-      filtering_allowed[action.to_sym].try(:call, instance) ||
-        (action != :all && filtering_allowed?(instance, :all))
-    end
-  end
-
-  def filtering_allowed?
-    self.class.filtering_allowed?(self, params[:action])
-  end
-
-  def test_action1; true; end
-  def test_action2; false; end
-end
-
-class FiltersTest < ActiveSupport::TestCase
-  context Charcoal::ControllerFilter do
-    subject { FiltersControllerTester.new  }
-    setup do
-      subject.params = {}
-    end
-
-    context "controller action filtering" do
-      teardown do
-        FiltersControllerTester.filtering_allowed.clear
-      end
-
-      context "if" do
-        context "with a lambda" do
-          setup { FiltersControllerTester.allow_filtering :test_action1, :if => lambda {|c| c.test_action1 } }
-
-          should "should allow filtering for test_action1" do
-            subject.params.replace(:action => :test_action1)
-            assert subject.filtering_allowed?
-          end
-        end
-
-        context "with a method" do
-          setup { FiltersControllerTester.allow_filtering :test_action1, :if => :test_action1 }
-
-          should "should allow filtering for test_action1" do
-            subject.params.replace(:action => :test_action1)
-            assert subject.filtering_allowed?
-          end
-        end
-
-        context "with a true/false" do
-          setup { FiltersControllerTester.allow_filtering :test_action1, :if => true }
-
-          should "should allow filtering for test_action1" do
-            subject.params.replace(:action => :test_action1)
-            assert subject.filtering_allowed?
-          end
-        end
-      end
-
-      context "unless" do
-        context "with a lambda" do
-          setup { FiltersControllerTester.allow_filtering :test_action1, :unless => lambda {|c| c.test_action2 } }
-
-          should "should allow filtering for test_action1" do
-            subject.params.replace(:action => :test_action1)
-            assert subject.filtering_allowed?
-          end
-        end
-
-        context "with a method" do
-          setup { FiltersControllerTester.allow_filtering :test_action1, :unless => :test_action2 }
-
-          should "should allow filtering for test_action1" do
-            subject.params.replace(:action => :test_action1)
-            assert subject.filtering_allowed?
-          end
-        end
-
-        context "with a true/false" do
-          setup { FiltersControllerTester.allow_filtering :test_action1, :unless => false }
-
-          should "should allow filtering for test_action1" do
-            subject.params.replace(:action => :test_action1)
-            assert subject.filtering_allowed?
-          end
-        end
-      end
-
-      context "only" do
-        setup { FiltersControllerTester.allow_filtering :test_action1 }
-
-        should "should allow filtering for test_action1" do
-          subject.params.replace(:action => :test_action1)
-          assert subject.filtering_allowed?
-        end
-
-        should "should not allow filtering for test_action2" do
-          subject.params.replace(:action => :test_action2)
-          assert !subject.filtering_allowed?
-        end
-      end
-
-      context "none" do
-        setup { FiltersControllerTester.allow_filtering }
-
-        should "should allow filtering for test_action1" do
-          subject.params.replace(:action => :test_action1)
-          assert subject.filtering_allowed?
-        end
-
-        should "should allow filtering for test_action2" do
-          subject.params.replace(:action => :test_action1)
-          assert subject.filtering_allowed?
-        end
-      end
-    end
-  end
-end

data/test/helper.rb

@@ -1,68 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-ENV["RAILS_ENV"] = "test"
-
-begin
-  Bundler.setup(:default, :development, :test)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'test/unit'
-require 'mocha/setup'
-
-# https://github.com/freerange/mocha/issues/94
-Mocha::Integration::TestUnit::AssertionCounter = Mocha::Integration::AssertionCounter
-
-require 'shoulda'
-require 'active_support/version'
-
-if ActiveSupport::VERSION::MAJOR >= 3
-  require "action_controller/railtie"
-  require "rails/test_unit/railtie"
-
-  class TestApp < Rails::Application
-    config.active_support.deprecation = :stderr
-    config.logger = Logger.new(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i ? 'NUL:' : '/dev/null')
-  end
-
-  class TestEngine < Rails::Engine
-  end
-
-  TestApp.initialize!
-
-  TestEngine.routes.draw do
-    match '/engine/abc/test' => "engine#test", :via => :post
-  end
-
-  TestApp.routes.draw do
-    mount TestEngine => ''
-    match '/test' => "test#test", :via => [:get, :put]
-    match '*path.:format' => 'charcoal/C_O_R_S#preflight', :via => :options
-    match ':controller/:action'
-  end
-
-  class ActionController::TestCase
-    def setup
-      @routes = TestApp.routes
-    end
-  end
-else
-  require "action_controller"
-  require "active_support"
-
-  MissingSourceFile::REGEXPS.push([/^cannot load such file -- (.+)$/i, 1])
-
-  ActionController::Routing::Routes.draw do |map|
-    map.connect '/test', :controller => :test, :action => :test, :conditions => { :method => [:get, :put] }
-    map.connect "*path.:format", :conditions => { :method => :options }, :action => "preflight", :controller => "CORS", :namespace => "charcoal/"
-    map.connect ':controller/:action'
-  end
-
-  ActionDispatch = ActionController
-end
-
-require 'charcoal'

data/test/jsonp_test.rb

@@ -1,105 +0,0 @@
-require File.expand_path('helper', File.dirname(__FILE__))
-
-class JSONPControllerTester < ActionController::Base
-  include Charcoal::JSONP
-
-  caches_action :test
-  allow_jsonp :test
-
-  def test
-    render :json => { :key => :value }
-  end
-end
-
-class JSONPTest < ActionController::TestCase
-  tests JSONPControllerTester
-
-  context JSONPControllerTester do
-    context "with caching" do
-      setup do
-        @caching, ActionController::Base.perform_caching = ActionController::Base.perform_caching, true
-        @cache_store, ActionController::Base.cache_store = ActionController::Base.cache_store, :memory_store
-      end
-
-      teardown do
-        ActionController::Base.perform_caching = @caching
-        ActionController::Base.cache_store = @cache_store
-      end
-
-      context "a GET to :test" do
-        setup do
-          get :test, :callback => "hello"
-        end
-
-        should "return a proper response" do
-          assert_match /hello\(.*\)/, @response.body
-        end
-
-        should "return a proper response type" do
-          assert_equal "application/javascript", @response.content_type
-        end
-
-        context "a second call" do
-          setup do
-            get :test, :callback => "hello"
-          end
-
-          should "properly cache the response" do
-            assert_match /hello\(.*\)/, @response.body
-          end
-
-          should "properly cache the response type" do
-            assert_equal "application/javascript", @response.content_type
-          end
-        end
-      end
-    end
-  end
-
-  context Charcoal::JSONP do
-    subject { JSONPControllerTester.new }
-
-    setup do
-      subject.params = {}
-    end
-
-    context "jsonp callback" do
-      setup do
-        @response = '{"test": 123}'
-        @content_type = "application/json"
-
-        subject.response = ActionDispatch::Response.new
-        subject.response.body = @response
-        subject.response.status = '200 OK'
-        subject.response.content_type = @content_type
-      end
-
-      context "with params" do
-        setup do
-          subject.params.replace(:callback => "callback", :action => "test")
-          subject.send(:add_jsonp_callback) {}
-        end
-
-        should "add jsonp if there is a callback" do
-          assert_equal "callback(#{@response})", subject.response.body
-        end
-
-        should "change content-type" do
-          assert_equal "application/javascript", subject.response.content_type
-        end
-      end
-
-      context "without params" do
-        setup { subject.send(:add_jsonp_callback) {} }
-
-        should "not add jsonp callback" do
-          assert_equal @response, subject.response.body
-        end
-
-        should "not change content-type" do
-          assert_equal @content_type, subject.response.content_type
-        end
-      end
-    end
-  end
-end