sinatra-subdomain 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e503ce75701c38cf44dacb5e113445a0c318961e
-  data.tar.gz: d693c87a48d2061ef0066da58795764e93244bb3
+SHA256:
+  metadata.gz: 2f8c53e74401f55a751115abc8e9100a54a5610e8ce6560e796885841e86b8e0
+  data.tar.gz: a4c173180de33d07cd060c566c4d4cff7f83174b31e0e61f3b71386c5a12cab5
 SHA512:
-  metadata.gz: ae45d43735b5e6f8e66122ba052cdb832035030b364e69cb7df5109571176bfc60f90e6ee8acede0fd30d218731a9f4c2efae0d481289922e3112952e82ef3f5
-  data.tar.gz: fc0cb786be4891dc12cdb80e528af1934311594ce0f708f6307e5ad625e62391f4ffcc524f8b4ada12a4009b3fbe8af05ea0a486d1d92ee84ad7fffa707ff84d
+  metadata.gz: 49bfccce1571b7ea19670bac0aee42959efc3ec6af384a47a949c19d46e2f08f2aaca3ae82dff3c0092d2af7a92d9e60577ce41d3b5311502da509ec8ed9d9ad
+  data.tar.gz: a51325cf941367814569bdf4700f665b90ec54d42e521e49384763049a17db48026298ecaed11986355065f1db54fce195d11964a1c90513670ea8b058f009db

data/.github/FUNDING.yml

@@ -0,0 +1,3 @@
+---
+github: [fnando]
+custom: ["https://www.paypal.me/nandovieira/🍕"]

data/.rubocop.yml

@@ -0,0 +1,23 @@
+---
+inherit_gem:
+  rubocop-fnando: .rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
+
+Naming/FileName:
+  Exclude:
+    - lib/sinatra-subdomain.rb
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false

data/.travis.yml

@@ -6,13 +6,13 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.7.1
+  - 2.6.5
 
 gemfile:
-  - gemfiles/sinatra_2.gemfile
-  - gemfiles/sinatra_1.gemfile
+  - gemfiles/sinatra_2_1.gemfile
+  - gemfiles/sinatra_2_0.gemfile
+  - gemfiles/sinatra_1_4.gemfile
 
 env:
   global:

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -1,8 +1,7 @@
 # Sinatra Subdomain
 
-[![Travis-CI](https://travis-ci.org/fnando/sinatra-subdomain.png)](https://travis-ci.org/fnando/sinatra-subdomain)
+[![Travis-CI](https://travis-ci.org/fnando/sinatra-subdomain.svg)](https://travis-ci.org/fnando/sinatra-subdomain)
 [![Code Climate](https://codeclimate.com/github/fnando/sinatra-subdomain/badges/gpa.svg)](https://codeclimate.com/github/fnando/sinatra-subdomain)
-[![Test Coverage](https://codeclimate.com/github/fnando/sinatra-subdomain/badges/coverage.svg)](https://codeclimate.com/github/fnando/sinatra-subdomain/coverage)
 [![Gem](https://img.shields.io/gem/v/sinatra-subdomain.svg)](https://rubygems.org/gems/sinatra-subdomain)
 [![Gem](https://img.shields.io/gem/dt/sinatra-subdomain.svg)](https://rubygems.org/gems/sinatra-subdomain)
 
@@ -33,7 +32,8 @@ subdomain do
 end
 ```
 
-If you're not building a classic app, make sure to register Sinatra::Subdomain yourself:
+If you're not building a classic app, make sure to register Sinatra::Subdomain
+yourself:
 
 ```ruby
 require "sinatra"
@@ -58,7 +58,7 @@ class MyApp < Sinatra::Base
 end
 ```
 
-You can also pass an array or regular expressions to match subdomains:
+You can also pass an array, regular expressions to match subdomains, or a proc:
 
 ```ruby
 class MyApp < Sinatra::Base
@@ -76,11 +76,22 @@ class MyApp < Sinatra::Base
       "render page for #{subdomain} subdomain"
     end
   end
+
+  app_matcher = lambda do |subdomain|
+    App.where(subdomain: actual_subdomain).exist?
+  end
+
+  subdomain(app_matcher) do
+    get "/" do
+      "render page for #{subdomain} app"
+    end
+  end
 end
 ```
 
 By default, sinatra-subdomain will consider 1 TLD as in <tt>example.com</tt>.
-You can specify your TLD size for domains like <tt>example.com.br</tt> or <tt>example.co.uk</tt>.
+You can specify your TLD size for domains like <tt>example.com.br</tt> or
+<tt>example.co.uk</tt>.
 
 ```ruby
 require "sinatra"
@@ -95,8 +106,19 @@ set :tld_size, 2
 
 Copyright © 2010 - Nando Vieira (http://nandovieira.com)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the ‘Software’), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "rubocop/rake_task"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -7,4 +10,6 @@ Rake::TestTask.new(:test) do |t|
   t.warning = false
 end
 
-task default: :test
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/gemfiles/{sinatra_2.gemfile → sinatra_2_0.gemfile}

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 gemspec path: ".."
 
-gem "sinatra", "~> 2.0.0.beta2"
+gem "sinatra", "~> 2.0.0"

data/gemfiles/sinatra_2_1.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "sinatra", "~> 2.1.0"

data/lib/sinatra/subdomain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "sinatra/base"
 require "uri"
 require "resolv"
@@ -8,10 +10,15 @@ module Sinatra
       attr_accessor :app, :subdomain
     end
 
+    SINATRA_V2 = Gem::Requirement.create([">=2.0"]).satisfied_by?(
+      Gem::Version.create(Sinatra::VERSION)
+    )
+
     module Helpers
       def subdomain
-        uri = URI.parse("http://#{request.env["HTTP_HOST"]}")
+        uri = URI.parse("http://#{request.env['HTTP_HOST']}")
         return if Sinatra::Subdomain.ip_address?(uri.host)
+
         parts = uri.host.split(".")
         parts.pop(settings.tld_size + 1)
 
@@ -19,6 +26,17 @@ module Sinatra
       end
     end
 
+    # This is how this works:
+    #
+    # 1. Whenever you call `subdomain(&block)`, this is the method that's going
+    #    to be executed.
+    # 2. For each `subdomain` block, we set the app and subdomain condition as
+    #    `Sinatra::Subdomain.app` and `Sinatra::Subdomain.subdomain`.
+    # 3. Then, we yield the block, which will add the routes as needed.
+    # 4. After each route is added, Sinatra triggers a hook called
+    #    `:route_added`, handled by the `routed_added` method below.
+    # 5. The `routed_added` method will hijack the routes, adding the subdomain
+    #    condition.
     def subdomain(expected_subdomain = true)
       ::Sinatra::Subdomain.tap do |mod|
         mod.app = self
@@ -45,7 +63,7 @@ module Sinatra
         when Symbol
           actual.to_s == expected_subdomain.to_s
         else
-          expected_subdomain === actual
+          expected_subdomain === actual # rubocop:disable Style/CaseEquality
         end
       end
     end
@@ -58,7 +76,7 @@ module Sinatra
       expected = [subdomain].flatten.compact
 
       condition = app.instance_eval do
-        generate_method :subdomain do
+        generate_method :subdomain_matcher do
           ::Sinatra::Subdomain.match_subdomain?(expected, subdomain)
         end
       end
@@ -66,7 +84,7 @@ module Sinatra
       add_condition(last_route, condition)
     end
 
-    if Gem::Requirement.create(["~>2.0"]).satisfied_by?(Gem::Version.create(Sinatra::VERSION))
+    if SINATRA_V2
       def self.add_condition(last_route, condition)
         last_route[1] << condition
       end

data/lib/sinatra/subdomain/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Sinatra
   module Subdomain
     module Version
       MAJOR = 0
-      MINOR = 3
+      MINOR = 4
       PATCH = 0
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end

data/sinatra-subdomain.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./lib/sinatra/subdomain/version"
 
 Gem::Specification.new do |s|
@@ -10,16 +12,21 @@ Gem::Specification.new do |s|
   s.summary     = "Separate routes for subdomains on Sinatra"
   s.license     = "MIT"
   s.description = s.summary
+  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`
+                    .split("\n")
+                    .map {|f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_dependency "sinatra"
   s.add_development_dependency "minitest-utils"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rack-test"
   s.add_development_dependency "pry-meta"
-  s.add_development_dependency "codeclimate-test-reporter"
+  s.add_development_dependency "rack-test"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rubocop"
+  s.add_development_dependency "rubocop-fnando"
+  s.add_development_dependency "simplecov"
 end

data/test/sinatra-subdomain/ip_address_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class IpAddressTest < Minitest::Test

data/test/sinatra-subdomain/multiple_subdomain_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class MultipleSubdomainTest < Minitest::Test

data/test/sinatra-subdomain/multiple_tlds_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class MultipleTldsTest < Minitest::Test

data/test/sinatra-subdomain/single_tld_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class SingleTldTest < Minitest::Test

data/test/sinatra-subdomain/subdomains_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class SubdomainsTest < Minitest::Test
@@ -32,4 +34,11 @@ class SubdomainsTest < Minitest::Test
 
     assert_equal "regex: d", last_response.body
   end
+
+  test "renders matched subdomain (e)" do
+    header "HOST", "e.example.com"
+    get "/"
+
+    assert_equal "proc: e", last_response.body
+  end
 end

data/test/support/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class App < Sinatra::Base
   register Sinatra::Subdomain
 
@@ -15,10 +17,14 @@ class App < Sinatra::Base
     get("/") { "array: #{subdomain}" }
   end
 
-  subdomain /\A(c|d)\z/ do
+  subdomain(/\A(c|d)\z/) do
     get("/") { "regex: #{subdomain}" }
   end
 
+  subdomain(->(actual) { actual == "e" }) do
+    get("/") { "proc: #{subdomain}" }
+  end
+
   subdomain do
     get("/") { "any: #{subdomain}" }
     get("/about") { "any: about #{subdomain}" }

data/test/support/subdomain_tests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SubdomainTests
   def app
     current_tld = tld

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "simplecov"
 SimpleCov.start
 
@@ -9,7 +11,7 @@ require "rack/test"
 require "sinatra/subdomain"
 require "yaml"
 
-Dir["./test/support/**/*.rb"].each {|file| require file }
+Dir["./test/support/**/*.rb"].sort.each {|file| require file }
 
 module Minitest
   class Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-subdomain
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-meta
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rubocop
+  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: rubocop-fnando
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,13 +129,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
-- gemfiles/sinatra_1.gemfile
-- gemfiles/sinatra_2.gemfile
+- gemfiles/sinatra_1_4.gemfile
+- gemfiles/sinatra_2_0.gemfile
+- gemfiles/sinatra_2_1.gemfile
 - lib/sinatra/subdomain.rb
 - lib/sinatra/subdomain/version.rb
 - sinatra-subdomain.gemspec
@@ -123,7 +154,7 @@ homepage: http://rubygems.org/gems/sinatra-subdomain
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,16 +162,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Separate routes for subdomains on Sinatra
 test_files: