charcoal 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257a79e961264afcc25572a670f923de1cd23d8d
-  data.tar.gz: 44acf3c34baf250bd418a657870c9c11448d4a00
+  metadata.gz: fd99905bdc14133c87f559bc1cbd5bd95f6b44a3
+  data.tar.gz: 1122dffafdb9edb2953ac881a7bc6af2fc55b73a
 SHA512:
-  metadata.gz: bf9d1b46a477ed166559db85575d6b586d4369d4d47db0c8ac1844526cf4898c30356644e269990749510f3d56697de0cfd1e4229756da5df9fd7bd226c679c8
-  data.tar.gz: 899221ade18086627484ad80a6b15653509137b69b1b4302bf109189554fff273224b1727b4414e29e70bca0eedbf10264a6bb9612610cb3c600c27760b58937
+  metadata.gz: 3619644700d9e3db18045865085568a017630de36c9bf5de472a63555be90c264eaa6cae762d158e05a5da545daece0b50c07670cb2bacf9ab6518cca640c8d9
+  data.tar.gz: 771ec9e559eb78d1a897e657dc887418d8f865bb7980bb10e8ff0088fb5f0174b3c3d575e1b58b88f13988c5efcb899792ab409dc2a0cbd34190b537c0eb59a7

data/lib/charcoal/cross_origin.rb

@@ -4,7 +4,11 @@ module Charcoal
   module CrossOrigin
     def self.included(klass)
       klass.extend(ClassMethods)
-      klass.around_filter :set_cors_headers_filter, :if => :cors_allowed?
+      if klass.respond_to?(:around_action)
+        klass.around_action :set_cors_headers_filter, :if => :cors_allowed?
+      else
+        klass.around_filter :set_cors_headers_filter, :if => :cors_allowed?
+      end
     end
 
     module ClassMethods

data/lib/charcoal/cross_origin_controller.rb

@@ -10,7 +10,11 @@ class Charcoal::CrossOriginController < ActionController::Base
   Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
 
   allow_cors :all
-  skip_around_filter :set_cors_headers_filter
+  if respond_to?(:skip_around_action)
+    skip_around_action :set_cors_headers_filter
+  else
+    skip_around_filter :set_cors_headers_filter
+  end
 
   # OPTIONS *
   def preflight

data/lib/charcoal/jsonp.rb

@@ -4,7 +4,11 @@ module Charcoal
   module JSONP
     def self.included(klass)
       klass.extend(ClassMethods)
-      klass.prepend_around_filter :add_jsonp_callback
+      if klass.respond_to?(:prepend_around_action)
+        klass.prepend_around_action :add_jsonp_callback
+      else
+        klass.prepend_around_filter :add_jsonp_callback
+      end
     end
 
     module ClassMethods
@@ -38,8 +42,8 @@ module Charcoal
       yield
 
       if response.status.to_s.starts_with?('200') && jsonp_request?
-        response.body = "#{params[:callback]}(#{response.body})"
         response.content_type = "application/javascript"
+        response.body = "#{params[:callback]}(#{response.body})"
       end
     end
   end

data/lib/charcoal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 3.2.21
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement