charcoal 2.5.0 → 2.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 18071a651146b24dd3e0895cc4c0d2b0f2fdadc63b76c80463e92b8fcd70bec3
4
- data.tar.gz: a7ac7c15eeb1533551a23fa8d3c8b13168dabf457937440d9160b41877a554e6
3
+ metadata.gz: 00474cda870869c981bbaa283926961a92c19ae17907569765b4172c28969941
4
+ data.tar.gz: e3ef579eede5c0b88c0df4b7b0da9f4e402d82457d8f1adad7ccf147f8a3e75a
5
5
  SHA512:
6
- metadata.gz: 9ec8abcf90faf77291b778e638adc484d129b9e21678bae1bc95a45d1ddee5b014cafd44878352ca74a9728151c427e0c999b0c6f9c4ff462ea24ca71fd6d7a9
7
- data.tar.gz: a40fe1b116832065375d71b30927838a975d560baf309b4fd9416b3aefae319da0b688ca23c4d4a0e0f46d16be65c6d248ad1992dccccc31cf79525063ca7ec0
6
+ metadata.gz: 2adcee378a347920adf63fcd56939106c69d53901cc378e4ec192a420dbec304f96efb32959f29f56a8065e31c59d130ba59bb4d48b95e6282c34ef52d8f782c
7
+ data.tar.gz: 36a08ff680798e4e6427ba6ef51edce94d524718540477718e8a39a9dbd45a14c61108473845e307732a1bda152a8628e4da54cfd905294ac82db80b003b3c1d
@@ -15,10 +15,10 @@ module Charcoal
15
15
  methods = args.map(&:to_sym)
16
16
  methods = [:all] if methods.empty?
17
17
 
18
- if options[:unless]
19
- directive = lambda {|c| !parse_directive(options[:unless]).call(c)}
18
+ directive = if options[:unless]
19
+ lambda { |c| !parse_directive(options[:unless]).call(c) }
20
20
  else
21
- directive = parse_directive(options[:if] || true)
21
+ parse_directive(options[:if] || true)
22
22
  end
23
23
 
24
24
  methods.each do |method|
@@ -34,9 +34,9 @@ module Charcoal
34
34
  return directive if directive.respond_to?(:call)
35
35
 
36
36
  if directive.respond_to?(:to_sym) && method_defined?(directive.to_sym)
37
- lambda {|c| c.send(directive.to_sym)}
37
+ lambda { |c| c.send(directive.to_sym) }
38
38
  else
39
- lambda {|c| directive}
39
+ lambda { |c| directive }
40
40
  end
41
41
  end
42
42
  end
@@ -1,13 +1,13 @@
1
- require 'charcoal/controller_filter'
1
+ require "charcoal/controller_filter"
2
2
 
3
3
  module Charcoal
4
4
  module CrossOrigin
5
5
  def self.included(klass)
6
6
  klass.extend(ClassMethods)
7
7
  if klass.respond_to?(:around_action)
8
- klass.around_action :set_cors_headers_filter, :if => :cors_allowed?
8
+ klass.around_action :set_cors_headers_filter, if: :cors_allowed?
9
9
  else
10
- klass.around_filter :set_cors_headers_filter, :if => :cors_allowed?
10
+ klass.around_filter :set_cors_headers_filter, if: :cors_allowed?
11
11
  end
12
12
  end
13
13
 
@@ -15,7 +15,7 @@ module Charcoal
15
15
  include ControllerFilter
16
16
 
17
17
  def cors_allowed
18
- @cors_allowed ||= Hash.new(lambda {|_| false})
18
+ @cors_allowed ||= Hash.new(lambda { |_| false })
19
19
  end
20
20
 
21
21
  allow :cors do |method, directive|
@@ -1,9 +1,9 @@
1
1
  # This controller handles CORS preflight requests
2
2
  # See https://developer.mozilla.org/En/HTTP_access_control for documentation
3
3
 
4
- require 'action_controller/metal'
5
- require 'active_support/version'
6
- require 'charcoal/utilities'
4
+ require "action_controller/metal"
5
+ require "active_support/version"
6
+ require "charcoal/utilities"
7
7
 
8
8
  class Charcoal::CrossOriginController < ActionController::Metal
9
9
  include AbstractController::Callbacks
@@ -25,10 +25,10 @@ class Charcoal::CrossOriginController < ActionController::Metal
25
25
  set_cors_headers
26
26
  headers["Access-Control-Allow-Methods"] = allowed_methods.join(",").upcase
27
27
  headers["Access-Control-Max-Age"] = Charcoal.configuration["max-age"].to_s
28
- headers['Access-Control-Allow-Headers'] = Charcoal.configuration["allow-headers"].join(",")
28
+ headers["Access-Control-Allow-Headers"] = Charcoal.configuration["allow-headers"].join(",")
29
29
  end
30
30
 
31
- head :ok, :content_type => "text/plain"
31
+ head :ok, content_type: "text/plain"
32
32
  end
33
33
 
34
34
  private
@@ -1,4 +1,4 @@
1
- require 'charcoal/controller_filter'
1
+ require "charcoal/controller_filter"
2
2
 
3
3
  module Charcoal
4
4
  module JSONP
@@ -15,7 +15,7 @@ module Charcoal
15
15
  include ControllerFilter
16
16
 
17
17
  def jsonp_allowed
18
- @jsonp_allowed ||= Hash.new(lambda {|_| false})
18
+ @jsonp_allowed ||= Hash.new(lambda { |_| false })
19
19
  end
20
20
 
21
21
  allow :jsonp do |method, directive|
@@ -41,7 +41,7 @@ module Charcoal
41
41
  def add_jsonp_callback
42
42
  yield
43
43
 
44
- if response.status.to_s.starts_with?('200') && jsonp_request?
44
+ if response.status.to_s.starts_with?("200") && jsonp_request?
45
45
  response.content_type = "application/javascript"
46
46
  response.body = "#{params[:callback]}(#{response.body})"
47
47
  end
@@ -1,4 +1,4 @@
1
- require 'action_controller'
1
+ require "action_controller"
2
2
 
3
3
  module Charcoal::Utilities
4
4
  Routing = defined?(ActionDispatch) ? ActionDispatch::Routing : ActionController::Routing
@@ -15,7 +15,7 @@ module Charcoal::Utilities
15
15
  Routing::HTTP_METHODS.select do |verb|
16
16
  next if verb == :options
17
17
 
18
- route = find_route(request.path, request.env.merge(:method => verb))
18
+ route = find_route(request.path, request.env.merge(method: verb))
19
19
 
20
20
  if route
21
21
  controller = route[:controller].camelize
@@ -28,7 +28,7 @@ module Charcoal::Utilities
28
28
  instance.response = response
29
29
 
30
30
  method_name = "#{protocol}_allowed"
31
- controller.respond_to?(method_name.to_sym) && controller.send(method_name + '?', instance, action)
31
+ controller.respond_to?(method_name.to_sym) && controller.send(method_name + "?", instance, action)
32
32
  else
33
33
  false
34
34
  end
@@ -40,13 +40,11 @@ module Charcoal::Utilities
40
40
 
41
41
  railties = Rails.application.railties
42
42
  railties = railties.respond_to?(:all) ? railties.all : railties._all
43
- routes += railties.select {|tie| tie.is_a?(Rails::Engine)}.map(&:routes)
43
+ routes += railties.select { |tie| tie.is_a?(Rails::Engine) }.map(&:routes)
44
44
 
45
45
  routes.each do |route_set|
46
- begin
47
- return route_set.recognize_path(path, env)
48
- rescue ActionController::RoutingError
49
- end
46
+ return route_set.recognize_path(path, env)
47
+ rescue ActionController::RoutingError
50
48
  end
51
49
 
52
50
  nil
@@ -1,3 +1,3 @@
1
1
  module Charcoal
2
- VERSION = "2.5.0"
2
+ VERSION = "2.7.0"
3
3
  end
data/lib/charcoal.rb CHANGED
@@ -2,17 +2,16 @@ module Charcoal
2
2
  def self.configuration
3
3
  @configuration ||= {
4
4
  "credentials" => true,
5
- "expose-headers" => %w{},
6
- "allow-headers" => %w{X-Requested-With X-Prototype-Version},
5
+ "expose-headers" => %w[],
6
+ "allow-headers" => %w[X-Requested-With X-Prototype-Version],
7
7
  "max-age" => 86400,
8
8
  "allow-origin" => "*"
9
9
  }
10
10
  end
11
11
 
12
- autoload :ControllerFilter, 'charcoal/controller_filter'
13
- autoload :CrossOrigin, 'charcoal/cross_origin'
14
- autoload :JSONP, 'charcoal/jsonp'
12
+ autoload :ControllerFilter, "charcoal/controller_filter"
13
+ autoload :CrossOrigin, "charcoal/cross_origin"
14
+ autoload :JSONP, "charcoal/jsonp"
15
15
 
16
- autoload :CrossOriginController, 'charcoal/cross_origin_controller'
16
+ autoload :CrossOriginController, "charcoal/cross_origin_controller"
17
17
  end
18
-
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: charcoal
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.0
4
+ version: 2.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steven Davidovitz
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-11-17 00:00:00.000000000 Z
11
+ date: 2023-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,40 +16,40 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 5.0.0
19
+ version: '5.2'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: '7.1'
22
+ version: '7.2'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 5.0.0
29
+ version: '5.2'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: '7.1'
32
+ version: '7.2'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: actionpack
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: 5.0.0
39
+ version: '5.2'
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: '7.1'
42
+ version: '7.2'
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 5.0.0
49
+ version: '5.2'
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: '7.1'
52
+ version: '7.2'
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: rake
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -64,20 +64,6 @@ dependencies:
64
64
  - - ">="
65
65
  - !ruby/object:Gem::Version
66
66
  version: '0'
67
- - !ruby/object:Gem::Dependency
68
- name: bump
69
- requirement: !ruby/object:Gem::Requirement
70
- requirements:
71
- - - ">="
72
- - !ruby/object:Gem::Version
73
- version: '0'
74
- type: :development
75
- prerelease: false
76
- version_requirements: !ruby/object:Gem::Requirement
77
- requirements:
78
- - - ">="
79
- - !ruby/object:Gem::Version
80
- version: '0'
81
67
  - !ruby/object:Gem::Dependency
82
68
  name: yard
83
69
  requirement: !ruby/object:Gem::Requirement
@@ -123,7 +109,7 @@ homepage: https://github.com/zendesk/charcoal
123
109
  licenses:
124
110
  - MIT
125
111
  metadata: {}
126
- post_install_message:
112
+ post_install_message:
127
113
  rdoc_options: []
128
114
  require_paths:
129
115
  - lib
@@ -131,15 +117,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
131
117
  requirements:
132
118
  - - ">="
133
119
  - !ruby/object:Gem::Version
134
- version: '2.5'
120
+ version: '2.7'
135
121
  required_rubygems_version: !ruby/object:Gem::Requirement
136
122
  requirements:
137
123
  - - ">="
138
124
  - !ruby/object:Gem::Version
139
125
  version: '0'
140
126
  requirements: []
141
- rubygems_version: 3.1.6
142
- signing_key:
127
+ rubygems_version: 3.0.3.1
128
+ signing_key:
143
129
  specification_version: 4
144
130
  summary: Cross-Origin helper for Rails
145
131
  test_files: []