charcoal 2.1.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a62743439d4ec19dae5b53e08511138105e83b64
-  data.tar.gz: 22f4273d278cae65b23fdacacd877e4507456eb7
+SHA256:
+  metadata.gz: f1c9e686108450bbf02c66b8baab2a1f1d99c08584ce2859da903cd6bb374da2
+  data.tar.gz: f43f57c491c9e29bf94cd94e309bba934f004b1f94afab5fc01b63dcf673a26d
 SHA512:
-  metadata.gz: 325b79b0c83831771e6eab58563802e8ae9a29290b25941437289ade1cc096b9529eda550f54a22f001c45cbaac0b0475dc062e5c9d82eb99adb18b1749638dc
-  data.tar.gz: 7ec48e229f4684498d0f2cc66bc52c2d39569b530a98ec79f7aa5f23baad958a6e5f7332bc4ae778895ef0543f77e64feed0a6b36df614790a6145d0b9e1598a
+  metadata.gz: 86d9cd403d5d0ad9870cfe01eae8c9e7d3cef14fdbc70a0a06e9d66d9bebbb0d4a96e1dae06a0acd6c937f15aaf48eb345b0e1df315351ef37045543330bdbec
+  data.tar.gz: db9bab1419a9d7c01a04e7af3a8df342b14a614fd336b3f7803147148cd67f4c209cf7d49f8806559e043e8b9acb9232cd59f74ea84f8ad5cbab6a3c375aaae1

data/lib/charcoal/cross_origin.rb

@@ -42,7 +42,7 @@ module Charcoal
 
     def set_cors_headers
       headers["Access-Control-Allow-Origin"] = allowed_origin
-      headers["Access-Control-Allow-Credentials"] = Charcoal.configuration["credentials"].to_s
+      headers["Access-Control-Allow-Credentials"] = "true" if credentials_allowed?
       headers["Access-Control-Expose-Headers"] = Charcoal.configuration["expose-headers"].join(",")
     end
 
@@ -50,5 +50,10 @@ module Charcoal
       value = Charcoal.configuration["allow-origin"]
       value.respond_to?(:call) ? value.call(self) : value.to_s
     end
+
+    def credentials_allowed?
+      value = Charcoal.configuration["credentials"]
+      value.respond_to?(:call) ? value.call(self) : value
+    end
   end
 end

data/lib/charcoal/cross_origin_controller.rb

@@ -1,13 +1,16 @@
 # This controller handles CORS preflight requests
 # See https://developer.mozilla.org/En/HTTP_access_control for documentation
 
-require 'action_controller'
+require 'action_controller/metal'
 require 'active_support/version'
+require 'charcoal/utilities'
 
-class Charcoal::CrossOriginController < ActionController::Base
+class Charcoal::CrossOriginController < ActionController::Metal
+  include AbstractController::Callbacks
+  include ActionController::Head
+  include ActionController::Instrumentation
   include Charcoal::CrossOrigin
-
-  Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
+  include Charcoal::Utilities
 
   allow_cors :all
   if respond_to?(:skip_around_action)
@@ -31,44 +34,6 @@ class Charcoal::CrossOriginController < ActionController::Base
   private
 
   def allowed_methods
-    @allowed_methods ||= Routing::HTTP_METHODS.select do |verb|
-      next if verb == :options
-
-      route = find_route(request.path, request.env.merge(:method => verb))
-
-      if route
-        controller = route[:controller].camelize
-        controller = "#{controller}Controller".constantize
-
-        action = route[:action] || params[:path].last.split(".").first
-
-        instance = controller.new
-        instance.request = request
-        instance.response = response
-
-        controller.respond_to?(:cors_allowed) && controller.cors_allowed?(instance, action)
-      else
-        false
-      end
-    end
-  end
-
-  def find_route(path, env)
-    routes = [Rails.application.routes]
-
-    railties = Rails.application.railties
-    railties = railties.respond_to?(:all) ? railties.all : railties._all
-    routes += railties.select {|tie| tie.is_a?(Rails::Engine)}.map(&:routes)
-
-    routes.each do |route_set|
-      begin
-        return route_set.recognize_path(path, env)
-      rescue ActionController::RoutingError
-      end
-    end
-
-    nil
-  rescue ActionController::RoutingError
-    nil
+    allowed_methods_for?(:cors)
   end
 end

data/lib/charcoal/utilities.rb

@@ -0,0 +1,56 @@
+require 'action_controller'
+
+module Charcoal::Utilities
+  Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
+
+  def allowed_methods_for?(protocol)
+    @allowed_methods ||= {}
+    return @allowed_methods[protocol] if @allowed_methods[protocol]
+    @allowed_methods[protocol] = methods_allowed_for?(protocol)
+  end
+
+  private
+
+  def methods_allowed_for?(protocol)
+    Routing::HTTP_METHODS.select do |verb|
+      next if verb == :options
+
+      route = find_route(request.path, request.env.merge(:method => verb))
+
+      if route
+        controller = route[:controller].camelize
+        controller = "#{controller}Controller".constantize
+
+        action = route[:action] || params[:path].last.split(".").first
+
+        instance = controller.new
+        instance.request = request
+        instance.response = response
+
+        method_name = "#{protocol}_allowed"
+        controller.respond_to?(method_name.to_sym) && controller.send(method_name + '?', instance, action)
+      else
+        false
+      end
+    end
+  end
+
+  def find_route(path, env)
+    routes = [Rails.application.routes]
+
+    railties = Rails.application.railties
+    railties = railties.respond_to?(:all) ? railties.all : railties._all
+    routes += railties.select {|tie| tie.is_a?(Rails::Engine)}.map(&:routes)
+
+    routes.each do |route_set|
+      begin
+        return route_set.recognize_path(path, env)
+      rescue ActionController::RoutingError
+      end
+    end
+
+    nil
+  rescue ActionController::RoutingError
+    nil
+  end
+end

data/lib/charcoal/version.rb

@@ -1,3 +1,3 @@
 module Charcoal
-  VERSION = "2.1.2"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2020-11-09 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.2'
+        version: '6.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.2'
+        version: '6.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.2'
+        version: '6.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.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,16 +96,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -120,34 +120,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-context
-  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
-  name: mocha
-  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
 email: sdavidovitz@zendesk.com
 executables: []
@@ -159,6 +131,7 @@ files:
 - lib/charcoal/cross_origin.rb
 - lib/charcoal/cross_origin_controller.rb
 - lib/charcoal/jsonp.rb
+- lib/charcoal/utilities.rb
 - lib/charcoal/version.rb
 homepage: https://github.com/zendesk/charcoal
 licenses:
@@ -172,15 +145,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Cross-Origin helper for Rails