charcoal 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: c2b9d115a474b7323570364469ac972460ab8dc0
-  data.tar.gz: b285b15b478984c94aec28b60a566496a67c2672
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmYyMGE0ZTYxOGUyNDJhNDE0YTZkODUzODBhYjg5NmZiNzY4N2Y4Ng==
+  data.tar.gz: !binary |-
+    ZTdlYmJhOTZkZWYwY2Y5NTUyMzRkYzVlODRlY2U0MWYwMmZlY2I2Ng==
 SHA512:
-  metadata.gz: 5d96db339355db4e360e7d483846e4f5ca9f7cd81214a96d8b7f911153abc501a32c9e294b3efbdb2b7e022aff6f4bc79abf0aa4d071953f163ac404d1605941
-  data.tar.gz: 43fe4602cad6fe0c8e54d0b14aa9e9ea7ac5716581b191d0a0aec13a14eee489fb64e2292b7b75cfcb3693d28442d4123d9229d56f19638c2757a5475dcc9c2e
+  metadata.gz: !binary |-
+    N2RlZDY2YTc5Y2ZjNzAxY2I4MDRjM2UyMGU2YWU4NmRmZDQ1ODAwZDFjYjlk
+    MWE1ZjNlMzI2NmE2NTNjOTJhNDRiYWE3NGU2NjYzYTA4MjkyNTdjMGUzY2Ix
+    NDE2Njg3NzA2MDVkYzk3NTViZjhiOWJiNWQxMzM4OGY5ODcwNzQ=
+  data.tar.gz: !binary |-
+    NTYxMDk2YTZkOGE0MWRjMGMxOWY5OGY2YTJmNGE5ZjU4NGQxNjk3YTE1MTBh
+    NDM1OGRjODA0OTBmMzA5ZWVhYjRiZWJlYTZjYWIwMTkwODg1MWMwYTE4MGEy
+    MDhhMjE2NjVhMDVmZmM0YjZmOGY3MDE4Yzk4NWFiZDBiNjNmYTA=

data/charcoal.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: charcoal 0.2.0 ruby lib
+# stub: charcoal 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "charcoal"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Davidovitz"]
-  s.date = "2013-12-19"
+  s.date = "2013-12-21"
   s.description = "Helps you support JSONP and CORS in your Rails app"
   s.email = "sdavidovitz@zendesk.com"
   s.extra_rdoc_files = [

data/gemfiles/rails_2.3.gemfile

@@ -7,7 +7,7 @@ gem "activesupport", ">= 2.3.5"
 gem "actionpack", ">= 2.3.5"
 gem "rake", :group=>:development
 gem "yard", "~> 0.7", :group=>:development
-gem "jeweler", "~> 1.8.4", :group=>:development
+gem "jeweler", :group=>:development
 gem "appraisal", ">= 0.5.0", :group=>:test
 gem "shoulda", "~> 3.0", :group=>:test
 gem "shoulda-context", :group=>:test

data/gemfiles/rails_3.2.gemfile

@@ -7,7 +7,7 @@ gem "activesupport", ">= 2.3.5"
 gem "actionpack", ">= 2.3.5"
 gem "rake", :group=>:development
 gem "yard", "~> 0.7", :group=>:development
-gem "jeweler", "~> 1.8.4", :group=>:development
+gem "jeweler", :group=>:development
 gem "appraisal", ">= 0.5.0", :group=>:test
 gem "shoulda", "~> 3.0", :group=>:test
 gem "shoulda-context", :group=>:test

data/lib/charcoal/cors_controller.rb

@@ -29,32 +29,39 @@ class Charcoal::CORSController < ActionController::Base
     @allowed_methods ||= ActionController::Routing::HTTP_METHODS.select do |verb|
       next if verb == :options
 
-      begin
-        route = if ActiveSupport::VERSION::MAJOR >= 3
-          Rails.application.routes.recognize_path(request.path, request.env.merge(:method => verb))
-        else
-          ActionController::Routing::Routes.routes.find {|r| r.recognize(request.path, request.env.merge(:method => verb))}
-        end
+      route = find_route(request.path, request.env.merge(:method => verb))
 
-        if route
-          route = route.requirements if ActiveSupport::VERSION::MAJOR < 3
+      if route
+        controller = route[:controller].camelize
+        controller = "#{controller}Controller".constantize
 
-          controller = route[:controller].camelize
-          controller = "#{controller}Controller".constantize
+        action = route[:action] || params[:path].last.split(".").first
 
-          action = route[:action] || params[:path].last.split(".").first
+        instance = controller.new
+        instance.request = request
+        instance.response = response
 
-          instance = controller.new
-          instance.request = request
-          instance.response = response
+        controller.respond_to?(:cors_allowed) && controller.cors_allowed?(instance, action)
+      else
+        false
+      end
+    end
+  end
 
-          controller.respond_to?(:cors_allowed) && controller.cors_allowed?(instance, action)
-        else
-          false
+  def find_route(path, env)
+    if ActiveSupport::VERSION::MAJOR >= 3
+      [Rails.application.routes, *Rails.application.railties.engines.map(&:routes)].each do |route_set|
+        begin
+          return route_set.recognize_path(path, env)
+        rescue ActionController::RoutingError
         end
-      rescue ActionController::RoutingError
-        false
       end
+
+      nil
+    else
+      ActionController::Routing::Routes.routes.find {|r| r.recognize(path, env)}.try(:requirements)
     end
+  rescue ActionController::RoutingError
+    nil
   end
 end

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/cors_controller_test.rb

@@ -8,6 +8,14 @@ class TestController < ActionController::Base
   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
@@ -50,5 +58,31 @@ class Charcoal::CORSControllerTest < ActionController::TestCase
         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/helper.rb

@@ -29,11 +29,19 @@ if ActiveSupport::VERSION::MAJOR >= 3
     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", :conditions => { :method => :options }, :action => "preflight", :controller => "C_O_R_S", :namespace => "charcoal/"
+    match '*path.:format' => 'charcoal/C_O_R_S#preflight', :via => :options
     match ':controller/:action'
   end
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Helps you support JSONP and CORS in your Rails app
@@ -133,12 +133,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []