charcoal 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7622da23541be07303b649835824b230e39533a
-  data.tar.gz: d483edf4d2f4a76e590cdd7c5e0fb71dd3b809fa
+  metadata.gz: 257a79e961264afcc25572a670f923de1cd23d8d
+  data.tar.gz: 44acf3c34baf250bd418a657870c9c11448d4a00
 SHA512:
-  metadata.gz: 12e4efbd993a3ca883123a61266d9e726a3516f48451dc589177f3a3b41dcbd54eb5230cdb9424043f0f48660c0a2e4179b29dd352472fbc90c373f4af1bc279
-  data.tar.gz: b136b61fad42a87a3b391529eadf38b328a2f54adc1df2a1386f39f9a07d323a75dbc6459914fdf987eaa2c389ab9ec4c6e5177fcddfc57bd9cd3a4a7ee4a583
+  metadata.gz: bf9d1b46a477ed166559db85575d6b586d4369d4d47db0c8ac1844526cf4898c30356644e269990749510f3d56697de0cfd1e4229756da5df9fd7bd226c679c8
+  data.tar.gz: 899221ade18086627484ad80a6b15653509137b69b1b4302bf109189554fff273224b1727b4414e29e70bca0eedbf10264a6bb9612610cb3c600c27760b58937

data/lib/charcoal/cross_origin.rb

@@ -4,7 +4,7 @@ module Charcoal
   module CrossOrigin
     def self.included(klass)
       klass.extend(ClassMethods)
-      klass.after_filter :set_cors_headers, :if => :cors_allowed?
+      klass.around_filter :set_cors_headers_filter, :if => :cors_allowed?
     end
 
     module ClassMethods
@@ -30,6 +30,12 @@ module Charcoal
       self.class.cors_allowed?(self, params[:action])
     end
 
+    def set_cors_headers_filter
+      yield
+    ensure
+      set_cors_headers
+    end
+
     def set_cors_headers
       headers["Access-Control-Allow-Origin"] = allowed_origin
       headers["Access-Control-Allow-Credentials"] = Charcoal.configuration["credentials"].to_s

data/lib/charcoal/cross_origin_controller.rb

@@ -10,7 +10,7 @@ class Charcoal::CrossOriginController < ActionController::Base
   Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
 
   allow_cors :all
-  skip_after_filter :set_cors_headers
+  skip_around_filter :set_cors_headers_filter
 
   # OPTIONS *
   def preflight

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport