charcoal 0.1.5 → 0.1.6

data/README.md

@@ -35,7 +35,7 @@ map.connect "*path.:format", :conditions => { :method => :options }, :action =>
 
 Rails 3:
 ```ruby
-TODO
+map.connect "*path.:format", :conditions => { :method => :options }, :action => "preflight", :controller => "C_O_R_S", :namespace => "charcoal/"
 ```
 
 #### Configuration
@@ -44,7 +44,13 @@ The configuration options and defaults for CORS are as follows:
 
 ```ruby
 # Access-Control-Allow-Origin
-"allow-origin" => "*"
+Charcoal.configuration["allow-origin"] # => "*"
+# Can be set to a string
+Charcoal.configuration["allow-origin"] = "https://google.com"
+# Or a block
+Charcoal.configuration["allow-origin"] = lambda do |controller|
+  controller.request.host
+end
 
 # Access-Control-Allow-Headers
 "allow-headers" => ["X-Requested-With", "X-Prototype-Version"]

data/Rakefile

@@ -43,11 +43,11 @@ Rake::TestTask.new(:test) do |test|
 end
 
 desc 'Test the plugin under all supported Rails versions.'
-task :all => ["appraisal:cleanup", "appraisal:install"] do
+task :all => ["appraisal:install"] do
   exec('rake appraisal test')
 end
 
-task :default => :test
+task :default => :all
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/charcoal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "charcoal"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Davidovitz"]
-  s.date = "2013-04-25"
+  s.date = "2013-07-17"
   s.description = "Helps you support JSONP and CORS in your Rails app"
   s.email = "sdavidovitz@zendesk.com"
   s.extra_rdoc_files = [

data/lib/charcoal/cors.rb

@@ -31,9 +31,14 @@ module Charcoal
     end
 
     def set_cors_headers
-      headers["Access-Control-Allow-Origin"] = Charcoal.configuration["allow-origin"].to_s
+      headers["Access-Control-Allow-Origin"] = allowed_origin
       headers["Access-Control-Allow-Credentials"] = Charcoal.configuration["credentials"].to_s
       headers["Access-Control-Expose-Headers"] = Charcoal.configuration["expose-headers"].join(",")
     end
+
+    def allowed_origin
+      value = Charcoal.configuration["allow-origin"]
+      value.respond_to?(:call) ? value.call(self) : value.to_s
+    end
   end
 end

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/cors_test.rb

@@ -46,6 +46,26 @@ class TestCorsControllerTest < ActionController::TestCase
         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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3685152782529225018
+      hash: -2898595895829027545
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: