rack-cors 1.1.1 → 2.0.0.rc1

data/test/unit/dsl_test.rb

@@ -1,69 +1,70 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'minitest/autorun'
 require 'rack/cors'
 
-
 describe Rack::Cors, 'DSL' do
   it 'should support explicit config object dsl mode' do
-    cors = Rack::Cors.new(Proc.new {}) do |cfg|
+    cors = Rack::Cors.new(proc {}) do |cfg|
       cfg.allow do |allow|
-        allow.origins 'localhost:3000', '127.0.0.1:3000' do |source,env|
-          source == "http://10.10.10.10:3000" &&
-          env["USER_AGENT"] == "test-agent"
+        allow.origins 'localhost:3000', '127.0.0.1:3000' do |source, env|
+          source == 'http://10.10.10.10:3000' &&
+            env['USER_AGENT'] == 'test-agent'
         end
-        allow.resource '/get-only', :methods => :get
-        allow.resource '/', :headers => :any
+        allow.resource '/get-only', methods: :get
+        allow.resource '/', headers: :any
       end
     end
     resources = cors.send :all_resources
 
-    resources.length.must_equal 1
-    resources.first.allow_origin?('http://localhost:3000').must_equal true
-    resources.first.allow_origin?('http://10.10.10.10:3000',{"USER_AGENT" => "test-agent" }).must_equal true
-    resources.first.allow_origin?('http://10.10.10.10:3001',{"USER_AGENT" => "test-agent" }).wont_equal true
-    resources.first.allow_origin?('http://10.10.10.10:3000',{"USER_AGENT" => "other-agent"}).wont_equal true
+    _(resources.length).must_equal 1
+    _(resources.first.allow_origin?('http://localhost:3000')).must_equal true
+    _(resources.first.allow_origin?('http://10.10.10.10:3000', { 'USER_AGENT' => 'test-agent' })).must_equal true
+    _(resources.first.allow_origin?('http://10.10.10.10:3001', { 'USER_AGENT' => 'test-agent' })).wont_equal true
+    _(resources.first.allow_origin?('http://10.10.10.10:3000', { 'USER_AGENT' => 'other-agent' })).wont_equal true
   end
 
   it 'should support implicit config object dsl mode' do
-    cors = Rack::Cors.new(Proc.new {}) do
+    cors = Rack::Cors.new(proc {}) do
       allow do
-        origins 'localhost:3000', '127.0.0.1:3000' do |source,env|
-          source == "http://10.10.10.10:3000" &&
-          env["USER_AGENT"] == "test-agent"
+        origins 'localhost:3000', '127.0.0.1:3000' do |source, env|
+          source == 'http://10.10.10.10:3000' &&
+            env['USER_AGENT'] == 'test-agent'
         end
-        resource '/get-only', :methods => :get
-        resource '/', :headers => :any
+        resource '/get-only', methods: :get
+        resource '/', headers: :any
       end
     end
     resources = cors.send :all_resources
 
-    resources.length.must_equal 1
-    resources.first.allow_origin?('http://localhost:3000').must_equal true
-    resources.first.allow_origin?('http://10.10.10.10:3000',{"USER_AGENT" => "test-agent" }).must_equal true
-    resources.first.allow_origin?('http://10.10.10.10:3001',{"USER_AGENT" => "test-agent" }).wont_equal true
-    resources.first.allow_origin?('http://10.10.10.10:3000',{"USER_AGENT" => "other-agent"}).wont_equal true
+    _(resources.length).must_equal 1
+    _(resources.first.allow_origin?('http://localhost:3000')).must_equal true
+    _(resources.first.allow_origin?('http://10.10.10.10:3000', { 'USER_AGENT' => 'test-agent' })).must_equal true
+    _(resources.first.allow_origin?('http://10.10.10.10:3001', { 'USER_AGENT' => 'test-agent' })).wont_equal true
+    _(resources.first.allow_origin?('http://10.10.10.10:3000', { 'USER_AGENT' => 'other-agent' })).wont_equal true
   end
 
   it 'should support "file://" origin' do
-    cors = Rack::Cors.new(Proc.new {}) do
+    cors = Rack::Cors.new(proc {}) do
       allow do
         origins 'file://'
-        resource '/', :headers => :any
+        resource '/', headers: :any
       end
     end
     resources = cors.send :all_resources
 
-    resources.first.allow_origin?('file://').must_equal true
+    _(resources.first.allow_origin?('file://')).must_equal true
   end
 
   it 'should default credentials option to false' do
-    cors = Rack::Cors.new(Proc.new {}) do
+    cors = Rack::Cors.new(proc {}) do
       allow do
         origins 'example.net'
-        resource '/', :headers => :any
+        resource '/', headers: :any
       end
     end
     resources = cors.send :all_resources
-    resources.first.resources.first.credentials.must_equal false
+    _(resources.first.resources.first.credentials).must_equal false
   end
 end

data/test/unit/insecure.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/cors'
 
 use Rack::Cors do

data/test/unit/non_http.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/cors'
 
 use Rack::Cors do

data/test/unit/test.ru

@@ -1,26 +1,29 @@
+# frozen_string_literal: true
+
 require 'rack/cors'
 
-#use Rack::Cors, :debug => true, :logger => ::Logger.new(STDOUT) do
+# use Rack::Cors, :debug => true, :logger => ::Logger.new(STDOUT) do
 use Rack::Lint
 use Rack::Cors do
   allow do
     origins 'localhost:3000',
             '127.0.0.1:3000',
-            /http:\/\/192\.168\.0\.\d{1,3}(:\d+)?/,
+            %r{http://192\.168\.0\.\d{1,3}(:\d+)?},
             'file://',
-            /http:\/\/(.*?)\.example\.com/
-
-    resource '/get-only', :methods => :get
-    resource '/', :headers => :any, :methods => :any
-    resource '/options', :methods => :options
-    resource '/single_header', :headers => 'x-domain-token'
-    resource '/two_headers', :headers => %w{x-domain-token x-requested-with}
-    resource '/expose_single_header', :expose => 'expose-test'
-    resource '/expose_multiple_headers', :expose => %w{expose-test-1 expose-test-2}
-    resource '/conditional', :methods => :get, :if => proc { |env| !!env['HTTP_X_OK'] }
-    resource '/vary_test', :methods => :get, :vary => %w{ Origin Host }
-    resource '/patch_test', :methods => :patch
-    resource '/wildcard/*', :methods => :any
+            %r{http://(.*?)\.example\.com},
+            'custom-protocol://abcdefg'
+
+    resource '/get-only', methods: :get
+    resource '/', headers: :any, methods: :any
+    resource '/options', methods: :options
+    resource '/single_header', headers: 'x-domain-token'
+    resource '/two_headers', headers: %w[x-domain-token x-requested-with]
+    resource '/expose_single_header', expose: 'expose-test'
+    resource '/expose_multiple_headers', expose: %w[expose-test-1 expose-test-2]
+    resource '/conditional', methods: :get, if: proc { |env| !!env['HTTP_X_OK'] }
+    resource '/vary_test', methods: :get, vary: %w[Origin Host]
+    resource '/patch_test', methods: :patch
+    resource '/wildcard/*', methods: :any
     # resource '/file/at/*',
     #     :methods => [:get, :post, :put, :delete],
     #     :headers => :any,
@@ -28,14 +31,14 @@ use Rack::Cors do
   end
 
   allow do
-    origins do |source,env|
-      source.end_with?("10.10.10.10:3000")
+    origins do |source, _env|
+      source.end_with?('10.10.10.10:3000')
     end
     resource '/proc-origin'
   end
 
   allow do
-    origins -> (source, env) { source.end_with?("10.10.10.10:3000") }
+    origins ->(source, _env) { source.end_with?('10.10.10.10:3000') }
     resource '/lambda-origin'
   end
 
@@ -43,17 +46,17 @@ use Rack::Cors do
     origins '*'
     resource '/public'
     resource '/public/*'
-    resource '/public_without_credentials', :credentials => false
+    resource '/public_without_credentials', credentials: false
   end
 
   allow do
     origins 'mucho-grande.com'
-    resource '/multi-allow-config', :max_age => 600
+    resource '/multi-allow-config', max_age: 600
   end
 
   allow do
     origins '*'
-    resource '/multi-allow-config', :max_age => 300, :credentials => false
+    resource '/multi-allow-config', max_age: 300, credentials: false
   end
 
   allow do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-cors
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Calvin Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2022-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -45,47 +45,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 5.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 5.11.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.80.1
 description: 'Middleware that will make Rack-based apps CORS compatible. Fork the
   project here: https://github.com/cyu/rack-cors'
 email:
@@ -108,6 +136,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -115,8 +144,13 @@ files:
 - README.md
 - Rakefile
 - lib/rack/cors.rb
+- lib/rack/cors/resource.rb
+- lib/rack/cors/resources.rb
+- lib/rack/cors/resources/cors_misconfiguration_error.rb
+- lib/rack/cors/result.rb
 - lib/rack/cors/version.rb
 - rack-cors.gemspec
+- test/.rubocop.yml
 - test/cors/expect.js
 - test/cors/mocha.css
 - test/cors/mocha.js
@@ -143,15 +177,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.10
 signing_key: 
 specification_version: 4
 summary: Middleware for enabling Cross-Origin Resource Sharing in Rack apps
 test_files:
+- test/.rubocop.yml
 - test/cors/expect.js
 - test/cors/mocha.css
 - test/cors/mocha.js