charcoal 0.1.2 → 0.1.3

data/Appraisals

@@ -1,11 +1,5 @@
-appraise "rails-2.3" do
-  gem "rails", "~> 2.3.5"
-end
-
-appraise "rails-3.1" do
-  gem "rails", "~> 3.1.0"
-end
-
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2.0"
+["2.3", "3.0", "3.1", "3.2"].each do |version|
+  appraise "rails-#{version}" do
+    gem "rails", "~> #{version}.0"
+  end
 end

data/Gemfile

@@ -5,7 +5,6 @@ gem "actionpack", ">= 2.3.5"
 
 gem "rake", :group => :development
 gem "yard", "~> 0.7", :group => :development
-gem "bundler", "~> 1.2.0", :group => :development
 gem "jeweler", "~> 1.8.4", :group => :development
 
 gem "rails", ">= 2.3.5", :group => :test

data/README.md

@@ -30,7 +30,7 @@ Included is a CORS pre-flight controller that must be hooked up to the Rails rou
 
 Rails 2:
 ```ruby
-map.connect "*path.:format", :conditions => { :method => :options }, :action => "preflight", :controller => "CORS", :namespace => "charcoal"
+map.connect "*path.:format", :conditions => { :method => :options }, :action => "preflight", :controller => "CORS", :namespace => "charcoal/"
 ```
 
 Rails 3:

data/charcoal.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "charcoal"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Davidovitz"]
-  s.date = "2012-11-27"
+  s.date = "2013-04-25"
   s.description = "Helps you support JSONP and CORS in your Rails app"
   s.email = "sdavidovitz@zendesk.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
     "charcoal.gemspec",
     "gemfiles/rails_2.3.gemfile",
     "gemfiles/rails_2.3.gemfile.lock",
+    "gemfiles/rails_3.0.gemfile",
+    "gemfiles/rails_3.0.gemfile.lock",
     "gemfiles/rails_3.1.gemfile",
     "gemfiles/rails_3.1.gemfile.lock",
     "gemfiles/rails_3.2.gemfile",
@@ -46,7 +48,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/steved555/charcoal"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Cross-Origin helper for Rails"
 
   if s.respond_to? :specification_version then
@@ -57,14 +59,12 @@ Gem::Specification.new do |s|
       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<bundler>, ["~> 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       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<bundler>, ["~> 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
@@ -72,7 +72,6 @@ Gem::Specification.new do |s|
     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<bundler>, ["~> 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
   end
 end

data/gemfiles/rails_2.3.gemfile

@@ -6,11 +6,10 @@ gem "activesupport", ">= 2.3.5"
 gem "actionpack", ">= 2.3.5"
 gem "rake", :group=>:development
 gem "yard", "~> 0.7", :group=>:development
-gem "bundler", "~> 1.2.0", :group=>:development
 gem "jeweler", "~> 1.8.4", :group=>:development
 gem "appraisal", ">= 0.5.0", :group=>:test
 gem "shoulda", ">= 0", :group=>:test
 gem "shoulda-context", ">= 0", :group=>:test
 gem "mocha", :group=>:test, :require=>false
-gem "rails", "~> 2.3.5"
+gem "rails", "~> 2.3.0"
 

data/gemfiles/rails_2.3.gemfile.lock

@@ -49,10 +49,9 @@ DEPENDENCIES
   actionpack (>= 2.3.5)
   activesupport (>= 2.3.5)
   appraisal (>= 0.5.0)
-  bundler (~> 1.2.0)
   jeweler (~> 1.8.4)
   mocha
-  rails (~> 2.3.5)
+  rails (~> 2.3.0)
   rake
   shoulda
   shoulda-context

data/gemfiles/rails_3.0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+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 "appraisal", ">= 0.5.0", :group=>:test
+gem "shoulda", ">= 0", :group=>:test
+gem "shoulda-context", ">= 0", :group=>:test
+gem "mocha", :group=>:test, :require=>false
+gem "rails", "~> 3.0.0"
+

data/gemfiles/rails_3.0.gemfile.lock

@@ -0,0 +1,104 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.17)
+      actionpack (= 3.0.17)
+      mail (~> 2.2.19)
+    actionpack (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+    activesupport (3.0.17)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.19)
+    mocha (0.13.0)
+      metaclass (~> 0.0.1)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.17)
+      actionmailer (= 3.0.17)
+      actionpack (= 3.0.17)
+      activerecord (= 3.0.17)
+      activeresource (= 3.0.17)
+      activesupport (= 3.0.17)
+      bundler (~> 1.0)
+      railties (= 3.0.17)
+    railties (3.0.17)
+      actionpack (= 3.0.17)
+      activesupport (= 3.0.17)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (10.0.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.1)
+    shoulda-matchers (1.4.1)
+      activesupport (>= 3.0.0)
+    thor (0.14.6)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    yard (0.8.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (>= 2.3.5)
+  activesupport (>= 2.3.5)
+  appraisal (>= 0.5.0)
+  jeweler (~> 1.8.4)
+  mocha
+  rails (~> 3.0.0)
+  rake
+  shoulda
+  shoulda-context
+  yard (~> 0.7)

data/gemfiles/rails_3.1.gemfile

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

data/gemfiles/rails_3.1.gemfile.lock

@@ -81,11 +81,11 @@ GEM
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    shoulda (3.1.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.2)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.3.0)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.1)
+    shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
     sprockets (2.0.4)
       hike (~> 1.2)
@@ -106,7 +106,6 @@ DEPENDENCIES
   actionpack (>= 2.3.5)
   activesupport (>= 2.3.5)
   appraisal (>= 0.5.0)
-  bundler (~> 1.2.0)
   jeweler (~> 1.8.4)
   mocha
   rails (~> 3.1.0)

data/gemfiles/rails_3.2.gemfile

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

data/gemfiles/rails_3.2.gemfile.lock

@@ -79,11 +79,11 @@ GEM
     rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    shoulda (3.1.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.2)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.3.0)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.1)
+    shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
     sprockets (2.1.3)
       hike (~> 1.2)
@@ -104,7 +104,6 @@ DEPENDENCIES
   actionpack (>= 2.3.5)
   activesupport (>= 2.3.5)
   appraisal (>= 0.5.0)
-  bundler (~> 1.2.0)
   jeweler (~> 1.8.4)
   mocha
   rails (~> 3.2.0)

data/lib/charcoal/cors_controller.rb

@@ -9,6 +9,8 @@ require 'charcoal/cors_helper'
 class Charcoal::CORSController < ActionController::Base
   include Charcoal::CORS
 
+  allow_cors :all
+
   # OPTIONS *
   def preflight
     allowed_methods = ActionController::Routing::HTTP_METHODS.select do |verb|
@@ -27,7 +29,10 @@ class Charcoal::CORSController < ActionController::Base
 
           action = route[:action] || params[:path].last.split(".").first
 
-          controller.respond_to?(:cors_allowed) && controller.cors_allowed?(self, action)
+          instance = controller.new
+          instance.request = request
+
+          controller.respond_to?(:cors_allowed) && controller.cors_allowed?(instance, action)
         else
           false
         end

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,22 +75,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +108,8 @@ files:
 - charcoal.gemspec
 - gemfiles/rails_2.3.gemfile
 - gemfiles/rails_2.3.gemfile.lock
+- gemfiles/rails_3.0.gemfile
+- gemfiles/rails_3.0.gemfile.lock
 - gemfiles/rails_3.1.gemfile
 - gemfiles/rails_3.1.gemfile.lock
 - gemfiles/rails_3.2.gemfile
@@ -155,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1049804046287482941
+      hash: 1307675170924878136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cross-Origin helper for Rails