sinatra-subdomain 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8842478e8af1a0b347a8f1af15e48bfabed5610
-  data.tar.gz: 3264574516fbd993d2d768463c198e88b18c0771
+  metadata.gz: e503ce75701c38cf44dacb5e113445a0c318961e
+  data.tar.gz: d693c87a48d2061ef0066da58795764e93244bb3
 SHA512:
-  metadata.gz: 1c6c4b4520b1cea1dc1f0b1d03ad3fd941d9c563f9ebf03212f7624779117625b231409e2afc1fa8449f5f5bb770a339ef56dd6bf1c043a0191c2ca917ff9af7
-  data.tar.gz: a5d04262a271551df22ac3e3b84b9669e6db3c238e400312132b28fcc55a4d939fe2c805e6b4f691f56a0152558af3d9c6d4d24e44263f2b8dfec86b316f88e5
+  metadata.gz: ae45d43735b5e6f8e66122ba052cdb832035030b364e69cb7df5109571176bfc60f90e6ee8acede0fd30d218731a9f4c2efae0d481289922e3112952e82ef3f5
+  data.tar.gz: fc0cb786be4891dc12cdb80e528af1934311594ce0f708f6307e5ad625e62391f4ffcc524f8b4ada12a4009b3fbe8af05ea0a486d1d92ee84ad7fffa707ff84d

data/README.md

@@ -20,14 +20,14 @@ require "sinatra/subdomain"
 
 # Specify which subdomain you want
 subdomain :foo do
-  get '/' do
+  get "/" do
     "render page for FOO"
   end
 end
 
 # If any subdomain is set
 subdomain do
-  get '/' do
+  get "/" do
     "render page for #{subdomain} subdomain"
   end
 end
@@ -44,14 +44,35 @@ class MyApp < Sinatra::Base
   register Sinatra::Subdomain
 
   subdomain :foo do
-    get '/' do
+    get "/" do
       "render page for FOO"
     end
   end
 
   # If any subdomain is set
   subdomain do
-    get '/' do
+    get "/" do
+      "render page for #{subdomain} subdomain"
+    end
+  end
+end
+```
+
+You can also pass an array or regular expressions to match subdomains:
+
+```ruby
+class MyApp < Sinatra::Base
+  register Sinatra::Subdomain
+
+  subdomain [:foo, :bar, :zaz] do
+    get "/" do
+      "render page for #{subdomain}"
+    end
+  end
+
+  # Matches www, www1, www2, etc.
+  subdomain /\Awww\d*\z/ do
+    get "/" do
       "render page for #{subdomain} subdomain"
     end
   end
@@ -68,8 +89,6 @@ require "sinatra/subdomain"
 set :tld_size, 2
 ```
 
-This extension was based on http://github.com/akahn/sinatra-subdomain/
-
 # License
 
 (The MIT License)

data/gemfiles/sinatra_1.gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
-
 gemspec path: ".."
 
-gem 'sinatra', '~> 1.4', '>= 1.4.7'
+gem "sinatra", "~> 1.4", ">= 1.4.7"

data/gemfiles/sinatra_2.gemfile

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

data/lib/sinatra/subdomain/version.rb

@@ -2,8 +2,8 @@ module Sinatra
   module Subdomain
     module Version
       MAJOR = 0
-      MINOR = 2
-      PATCH = 1
+      MINOR = 3
+      PATCH = 0
       STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
     end
   end

data/lib/sinatra/subdomain.rb

@@ -37,20 +37,29 @@ module Sinatra
       host =~ Resolv::IPv4::Regex || host =~ Resolv::IPv6::Regex
     end
 
+    def self.match_subdomain?(expected, actual)
+      expected.any? do |expected_subdomain|
+        case expected_subdomain
+        when true
+          !actual.nil?
+        when Symbol
+          actual.to_s == expected_subdomain.to_s
+        else
+          expected_subdomain === actual
+        end
+      end
+    end
+
     def self.route_added(verb, _path, _block)
       return unless subdomain && app
 
       routes = app.instance_variable_get("@routes")
       last_route = routes[verb].last
-      expected = subdomain
+      expected = [subdomain].flatten.compact
 
       condition = app.instance_eval do
         generate_method :subdomain do
-          if expected == true
-            !subdomain.nil?
-          else
-            subdomain.to_s == expected.to_s
-          end
+          ::Sinatra::Subdomain.match_subdomain?(expected, subdomain)
         end
       end
 

data/sinatra-subdomain.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   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"

data/test/sinatra-subdomain/subdomains_test.rb

@@ -0,0 +1,35 @@
+require "test_helper"
+
+class SubdomainsTest < Minitest::Test
+  def app
+    App
+  end
+
+  test "renders listed subdomain (a)" do
+    header "HOST", "a.example.com"
+    get "/"
+
+    assert_equal "array: a", last_response.body
+  end
+
+  test "renders listed subdomain (b)" do
+    header "HOST", "b.example.com"
+    get "/"
+
+    assert_equal "array: b", last_response.body
+  end
+
+  test "renders matched subdomain (c)" do
+    header "HOST", "c.example.com"
+    get "/"
+
+    assert_equal "regex: c", last_response.body
+  end
+
+  test "renders matched subdomain (d)" do
+    header "HOST", "d.example.com"
+    get "/"
+
+    assert_equal "regex: d", last_response.body
+  end
+end

data/test/support/app.rb

@@ -11,6 +11,14 @@ class App < Sinatra::Base
     get("/about") { "multiple: about #{subdomain}" }
   end
 
+  subdomain [:a, :b] do
+    get("/") { "array: #{subdomain}" }
+  end
+
+  subdomain /\A(c|d)\z/ do
+    get("/") { "regex: #{subdomain}" }
+  end
+
   subdomain do
     get("/") { "any: #{subdomain}" }
     get("/about") { "any: about #{subdomain}" }

data/test/support/subdomain_tests.rb

@@ -1,9 +1,9 @@
 module SubdomainTests
   def app
-    _tld = tld
+    current_tld = tld
 
     Class.new(App) do
-      set :tld_size, _tld.split(".").size - 1
+      set :tld_size, current_tld.split(".").size - 1
     end
   end
 
@@ -27,42 +27,42 @@ module SubdomainTests
         header "HOST", "mail.example#{tld}"
         get "/"
 
-        assert_equal "any: mail",last_response.body
+        assert_equal "any: mail", last_response.body
       end
 
       test "when any subdomain is required - renders about page" do
         header "HOST", "mail.example#{tld}"
         get "/about"
 
-        assert_equal "any: about mail",last_response.body
+        assert_equal "any: about mail", last_response.body
       end
 
       test "when no subdomain is required - renders root page" do
         header "HOST", "example#{tld}"
         get "/"
 
-        assert_equal "root",last_response.body
+        assert_equal "root", last_response.body
       end
 
       test "when no subdomain is required - renders about page" do
         header "HOST", "example#{tld}"
         get "/about"
 
-        assert_equal "about",last_response.body
+        assert_equal "about", last_response.body
       end
 
       test "when multi-subdomain is required - renders root page" do
         header "HOST", "foo.bar.example#{tld}"
         get "/"
 
-        assert_equal "multiple: foo.bar",last_response.body
+        assert_equal "multiple: foo.bar", last_response.body
       end
 
       test "when multi-subdomain is required - renders about page" do
         header "HOST", "foo.bar.example#{tld}"
         get "/about"
 
-        assert_equal "multiple: about foo.bar",last_response.body
+        assert_equal "multiple: about foo.bar", last_response.body
       end
     end
   end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require 'simplecov'
+require "simplecov"
 SimpleCov.start
 
 require "bundler/setup"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-subdomain
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -115,6 +115,7 @@ files:
 - test/sinatra-subdomain/multiple_subdomain_test.rb
 - test/sinatra-subdomain/multiple_tlds_test.rb
 - test/sinatra-subdomain/single_tld_test.rb
+- test/sinatra-subdomain/subdomains_test.rb
 - test/support/app.rb
 - test/support/subdomain_tests.rb
 - test/test_helper.rb
@@ -147,6 +148,7 @@ test_files:
 - test/sinatra-subdomain/multiple_subdomain_test.rb
 - test/sinatra-subdomain/multiple_tlds_test.rb
 - test/sinatra-subdomain/single_tld_test.rb
+- test/sinatra-subdomain/subdomains_test.rb
 - test/support/app.rb
 - test/support/subdomain_tests.rb
 - test/test_helper.rb