sinatra-subdomain 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08247d5419cc684ee82146875f924297a68f89d6
-  data.tar.gz: 0f38bbcf7aec377e4f3f6c10bd414e0545f1bfb4
+  metadata.gz: e8842478e8af1a0b347a8f1af15e48bfabed5610
+  data.tar.gz: 3264574516fbd993d2d768463c198e88b18c0771
 SHA512:
-  metadata.gz: ccad68580ee9adc7b692dfc9ab9234c1d9398225419cc20b211c396ca1a089721df9c8e1fab00950ed54eedcc98df7468ade3053316867f3a93f23e3bd37cc6a
-  data.tar.gz: 5f39b2df84cd7fd9a962ed3ad25de5587d1e63f5ff0ed0ce731d8e293d5f5d12b169152f64df87a586a0431cff6c91fcc594200407fdee6832eb3a2a5898ad39
+  metadata.gz: 1c6c4b4520b1cea1dc1f0b1d03ad3fd941d9c563f9ebf03212f7624779117625b231409e2afc1fa8449f5f5bb770a339ef56dd6bf1c043a0191c2ca917ff9af7
+  data.tar.gz: a5d04262a271551df22ac3e3b84b9669e6db3c238e400312132b28fcc55a4d939fe2c805e6b4f691f56a0152558af3d9c6d4d24e44263f2b8dfec86b316f88e5

data/.gitignore

@@ -1,2 +1,3 @@
 pkg
 *.lock
+coverage

data/.travis.yml

@@ -1,12 +1,19 @@
 language: ruby
 cache: bundler
 sudo: false
-notifictions:
+
+notifications:
   email: false
+
 rvm:
-- 2.3.0
-- '2.2'
-- '2.1'
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+
+gemfile:
+  - gemfiles/sinatra_2.gemfile
+  - gemfiles/sinatra_1.gemfile
+
 env:
   global:
     secure: Zq3YrKeSaVI0U5bcYDDnCOxbQDHPpPmTrNGe0M2qtVwN1tibpULIdZVMGOjJ4C4Ulk8OXqpI63aLkWm7fKIT0bQXvGK+w3bksUIHk2jODHfKb/ZDDfAoKhfU1APXnxcGbw06/FDyihWJFYdxrLZBilnvDmcqVz47DvmFBAlPuQ4=

data/Gemfile

@@ -1,2 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
+
 gemspec

data/README.md

@@ -40,16 +40,20 @@ require "sinatra"
 require "sinatra/subdomain"
 
 # Specify which subdomain you want
-subdomain :foo do
-  get '/' do
-    "render page for FOO"
+class MyApp < Sinatra::Base
+  register Sinatra::Subdomain
+
+  subdomain :foo do
+    get '/' do
+      "render page for FOO"
+    end
   end
-end
 
-# If any subdomain is set
-subdomain do
-  get '/' do
-    "render page for #{subdomain} subdomain"
+  # If any subdomain is set
+  subdomain do
+    get '/' do
+      "render page for #{subdomain} subdomain"
+    end
   end
 end
 ```

data/gemfiles/sinatra_1.gemfile

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

data/gemfiles/sinatra_2.gemfile

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

data/lib/sinatra/subdomain.rb

@@ -19,7 +19,7 @@ module Sinatra
       end
     end
 
-    def subdomain(expected_subdomain = true, &block)
+    def subdomain(expected_subdomain = true)
       ::Sinatra::Subdomain.tap do |mod|
         mod.app = self
         mod.subdomain = expected_subdomain
@@ -37,7 +37,7 @@ module Sinatra
       host =~ Resolv::IPv4::Regex || host =~ Resolv::IPv6::Regex
     end
 
-    def self.route_added(verb, path, block)
+    def self.route_added(verb, _path, _block)
       return unless subdomain && app
 
       routes = app.instance_variable_get("@routes")
@@ -47,14 +47,24 @@ module Sinatra
       condition = app.instance_eval do
         generate_method :subdomain do
           if expected == true
-            subdomain != nil
+            !subdomain.nil?
           else
             subdomain.to_s == expected.to_s
           end
         end
       end
 
-      last_route[2] << condition
+      add_condition(last_route, condition)
+    end
+
+    if Gem::Requirement.create(["~>2.0"]).satisfied_by?(Gem::Version.create(Sinatra::VERSION))
+      def self.add_condition(last_route, condition)
+        last_route[1] << condition
+      end
+    else
+      def self.add_condition(last_route, condition)
+        last_route[2] << condition
+      end
     end
 
     def self.registered(app)

data/lib/sinatra/subdomain/version.rb

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

data/test/test_helper.rb

@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+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.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -106,6 +106,8 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- gemfiles/sinatra_1.gemfile
+- gemfiles/sinatra_2.gemfile
 - lib/sinatra/subdomain.rb
 - lib/sinatra/subdomain/version.rb
 - sinatra-subdomain.gemspec
@@ -136,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Separate routes for subdomains on Sinatra