charcoal 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39523d154ea7e30b2bebab0190db9549e5906d883a1ec627a8c19660fa204fc2
-  data.tar.gz: 248e3b6e60c1945d6ace5e9dd7c57b38c706f9a0d9fa3b9fc13c94748c06db99
+  metadata.gz: 909f8ba9bf0ffdda5f2a0d5f45e07f4deb10d2571c5912150cc23215fe01ab4c
+  data.tar.gz: 5b1408731b2c94193a5d3527eb339519f8a0cd1c1673daecd9cbb3d980d934c1
 SHA512:
-  metadata.gz: ba01154e073e4824251902474ab42c6cf7f89811e2612fa06eeb935177156db5088df100dd76cf49e68819e6ee21ad704c37840158bd4c8acc0a7141c615cf6e
-  data.tar.gz: e6d5b1cc4e08f96d22dcac886d79887852c53814145417cb386681b8b01d4f38d8a52e107eecc0361bfd7d14b1509d5c72c238d5002ee1907eec00fed6476ce2
+  metadata.gz: 122d3bbdcebf2133f24a8d325207207d5084b0c87e4309f9b767f0ec1f8274ba071fce5b98b5c3607fd18cdbd802e47e7a4e0999d766010667e1ca41b0d0ebfa
+  data.tar.gz: 9a44e83eab4bfb324c1d346b6bbfbde48f19e0669330665a23dc09e437a484afeab8f4d3d8d64efaf98ad7c1400bf7ac8dbccbd6796057d624baf73f7b4d8d9c

data/lib/charcoal/cross_origin_controller.rb

@@ -3,11 +3,11 @@
 
 require 'action_controller'
 require 'active_support/version'
+require 'charcoal/utilities'
 
 class Charcoal::CrossOriginController < ActionController::Base
   include Charcoal::CrossOrigin
-
-  Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
+  include Charcoal::Utilities
 
   allow_cors :all
   if respond_to?(:skip_around_action)
@@ -31,44 +31,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.5"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charcoal
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Steven Davidovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2020-03-30 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: '6.0'
+        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: '6.0'
+        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: '6.0'
+        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: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,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:
@@ -144,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.7.6
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Cross-Origin helper for Rails