charcoal 2.1.3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d24eacee4c04f78986e956f53472167d2d166aab4035ad14fa862e122ae4a6
-  data.tar.gz: 62ea8f2b4fa8f0079858a314de61a2dd9119705ee8cd0324922a14db61f07499
+  metadata.gz: ef2a06d4d75ba9de3fe1fec8cb8f128c89cb9201df3fb54979b9ad9c56aeb443
+  data.tar.gz: f1f16e6875234a4d00ccf26103b8cc2aecdbeefb0f5027c58651918939865bd0
 SHA512:
-  metadata.gz: 3bcf3421356e12f9eea20f988a2fa8401f9f9bc99622415550fbc2e8bc652e46946ee6ed79ef0b002352ebdf8d85800421747f0de194ac6aad67add83edd5acf
-  data.tar.gz: a55906cc7348fa3a75de0497efb6c9d6090ff3842883f8d7aede4580248703384d9d8817109c71f8d76890507ae8809af3635e13fa9931b939213012959336c6
+  metadata.gz: 2d784702c58f8845400eb5089984a8baf81ab6a9fd08b3b96216f4d9bf05c148156a93eb1e0cfb394c85ea8a8a1c968dc2f96ee397bf5b16940b6023c51062c2
+  data.tar.gz: c287591a440aa6907971299d1ffb7ddc9688d57b4f6e08edf7b6176376b1ba54466ad20d6a73abefbcbaa318d5b0dae1065af56cf3beba48a733428ec1cc9cfa

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.3"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.4.0
 platform: ruby
 authors:
 - Steven Davidovitz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2021-01-14 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.2'
   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.2'
 - !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.2'
   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.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,20 +64,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  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: bump
   requirement: !ruby/object:Gem::Requirement
@@ -131,12 +117,13 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,16 +131,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: Cross-Origin helper for Rails
 test_files: []