sinatra-subdomain 0.1.1 → 0.1.2

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile.lock

@@ -1,49 +1,53 @@
 PATH
   remote: .
   specs:
-    sinatra-subdomain (0.1.1)
+    sinatra-subdomain (0.1.2)
       sinatra
 
 GEM
   remote: http://rubygems.org/
   specs:
-    capybara (1.1.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    ffi (1.0.9)
-    json_pure (1.5.4)
-      spruz (~> 0.2.8)
-    mime-types (1.16)
-    nokogiri (1.5.0)
-    rack (1.3.2)
+    awesome_print (1.0.2)
+    coderay (0.9.8)
+    diff-lcs (1.1.3)
+    method_source (0.6.7)
+      ruby_parser (>= 2.3.1)
+    pry (0.9.7.4)
+      coderay (~> 0.9.8)
+      method_source (~> 0.6.7)
+      ruby_parser (>= 2.3.1)
+      slop (~> 2.1.0)
+    rack (1.4.0)
+    rack-protection (1.2.0)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    spruz (0.2.13)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    ruby_parser (2.3.1)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.10)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    slop (2.1.0)
     tilt (1.3.3)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
+  awesome_print
+  pry
   rack-test
   rake
+  rspec
   sinatra-subdomain!

data/README.rdoc

@@ -23,6 +23,14 @@
     end
   end
 
+If you're not building a classic app, make sure to register Sinatra::Subdomain yourself:
+
+  class Application < Sinatra::Base
+    register Sinatra::Subdomain 
+    
+    ...
+  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>.
 

data/Rakefile

@@ -1,11 +1,9 @@
 require "bundler"
 Bundler::GemHelper.install_tasks
 
-desc "Run tests"
-task :test do
-  # Hack needed: some tests failed when using different Rack apps
-  # with rake/testtask
-  %w[ subdomain_test.rb multiple_tlds_test.rb ].each do |file|
-    system "ruby -rubygems -Ilib -Itest test/#{file}"
-  end
-end
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.libs << "test" << "lib"
+  t.test_files = FileList["test/*_test.rb"]
+  t.verbose = true
+end

data/lib/sinatra/subdomain.rb

@@ -3,6 +3,10 @@ require "uri"
 
 module Sinatra
   module Subdomain
+    class << self
+      attr_accessor :app, :subdomain
+    end
+
     module Helpers
       def subdomain
         uri = URI.parse("http://#{request.env["HTTP_HOST"]}")
@@ -12,18 +16,38 @@ module Sinatra
       end
     end
 
-    def subdomain(expected_subdomain = nil, &block)
-      condition do
-        if expected_subdomain
-          expected_subdomain.to_s == subdomain
-        elsif subdomain
-          true
-        else
-          false
-        end
+    def subdomain(expected_subdomain = true, &block)
+      ::Sinatra::Subdomain.tap do |mod|
+        mod.app = self
+        mod.subdomain = expected_subdomain
       end
 
       yield
+
+      ::Sinatra::Subdomain.tap do |mod|
+        mod.app = nil
+        mod.subdomain = nil
+      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
+
+      condition = app.instance_eval do
+        generate_method :subdomain do
+          if expected == true
+            subdomain != nil
+          else
+            subdomain.to_s == expected.to_s
+          end
+        end
+      end
+
+      last_route[2] << condition
     end
 
     def self.registered(app)

data/lib/sinatra/subdomain/version.rb

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

data/sinatra-subdomain.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "sinatra"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "rake"
   s.add_development_dependency "rack-test"
-  s.add_development_dependency "capybara"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "awesome_print"
 end

data/spec/multiple_tlds_spec.rb

@@ -0,0 +1,6 @@
+require "spec_helper"
+
+describe "multiple TLDs" do
+  let(:tld) { ".com.br" }
+  it_behaves_like "subdomain"
+end

data/spec/single_tld_spec.rb

@@ -0,0 +1,6 @@
+require "spec_helper"
+
+describe "single TLD" do
+  let(:tld) { ".org" }
+  it_behaves_like "subdomain"
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require "rack/test"
+require "sinatra/subdomain"
+require "yaml"
+
+Dir["spec/support/**/*.rb"].each {|file| require file }
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+end

data/spec/support/subdomain_shared.rb

@@ -0,0 +1,73 @@
+shared_examples_for "subdomain" do
+  def app
+    @app ||= begin
+      _tld = tld
+
+      @app = Class.new(Sinatra::Base) do
+        register Sinatra::Subdomain
+        set :tld_size, _tld.split(".").size - 1
+
+        subdomain :foo do
+          get("/") { "set: #{subdomain}" }
+          get("/about") { "set: about #{subdomain}" }
+        end
+
+        subdomain do
+          get("/") { "any: #{subdomain}" }
+          get("/about") { "any: about #{subdomain}" }
+        end
+
+        get("/") { "root" }
+        get("/about") { "about" }
+      end
+    end
+  end
+
+  context "when specific subdomain is required" do
+    it "renders root page" do
+      header "HOST", "foo.example#{tld}"
+      get "/"
+
+      last_response.body.should eql("set: foo")
+    end
+
+    it "renders about page" do
+      header "HOST", "foo.example#{tld}"
+      get "/about"
+
+      last_response.body.should eql("set: about foo")
+    end
+  end
+
+  context "when any subdomain is required" do
+    it "renders root page" do
+      header "HOST", "mail.example#{tld}"
+      get "/"
+
+      last_response.body.should eql("any: mail")
+    end
+
+    it "renders about page" do
+      header "HOST", "mail.example#{tld}"
+      get "/about"
+
+      last_response.body.should eql("any: about mail")
+    end
+  end
+
+  context "when no subdomain is required" do
+    it "renders root page" do
+      header "HOST", "example#{tld}"
+      get "/"
+
+      last_response.body.should eql("root")
+    end
+
+    it "renders about page" do
+      header "HOST", "example#{tld}"
+      get "/about"
+
+      last_response.body.should eql("about")
+    end
+  end
+end

data/test/multiple_tlds_test.rb

@@ -1,25 +1,46 @@
 require "test_helper"
 
 class MultipleTldsTest < Test::Unit::TestCase
-  def setup
-    Capybara.app = MultipleTldsApp
+  App = Class.new(Sinatra::Base) do
+    register Sinatra::Subdomain
+    set :tld_size, 2
+
+    subdomain :foo do
+      get("/") { "set: #{subdomain}" }
+    end
+
+    subdomain do
+      get("/") { "any: #{subdomain}" }
+    end
+
+    get("/") { "root" }
+  end
+
+  def app
+    App
   end
 
   def test_specified_subdomain
-    visit "http://foo.smackaho.smackaho.st:9887/"
-    assert page.has_content? "set: foo"
+    header "HOST", "foo.example.com.br"
+    get "/"
+
+    assert_equal "set: foo", last_response.body
   end
 
   def test_any_subdomain
-    visit "http://status.smackaho.smackaho.st:9887/"
-    assert page.has_content? "any: status"
+    header "HOST", "status.example.com.br"
+    get "/"
+    assert_equal "any: status", last_response.body
 
-    visit "http://mail.smackaho.smackaho.st:9887/"
-    assert page.has_content? "any: mail"
+    header "HOST", "mail.example.com.br"
+    get "/"
+    assert_equal "any: mail", last_response.body
   end
 
   def test_root
-    visit "http://smackaho.smackaho.st:9887/"
-    assert page.has_content? "root"
+    header "HOST", "example.com.br"
+    get "/"
+
+    assert_equal "root", last_response.body
   end
 end

data/test/subdomain_test.rb

@@ -1,25 +1,45 @@
 require "test_helper"
 
 class SubdomainTest < Test::Unit::TestCase
-  def setup
-    Capybara.app = SampleApp
+  App = Class.new(Sinatra::Base) do
+    register Sinatra::Subdomain
+
+    subdomain :foo do
+      get("/") { "set: #{subdomain}" }
+    end
+
+    subdomain do
+      get("/") { "any: #{subdomain}" }
+    end
+
+    get("/") { "root" }
+  end
+
+  def app
+    App
   end
 
   def test_specified_subdomain
-    visit "http://foo.smackaho.st:9887/"
-    assert page.has_content? "set: foo"
+    header "HOST", "foo.example.org"
+    get "/"
+
+    assert_equal "set: foo", last_response.body
   end
 
   def test_any_subdomain
-    visit "http://status.smackaho.st:9887/"
-    assert page.has_content? "any: status"
+    header "HOST", "status.example.org"
+    get "/"
+    assert_equal "any: status", last_response.body
 
-    visit "http://mail.smackaho.st:9887/"
-    assert page.has_content? "any: mail"
+    header "HOST", "mail.example.org"
+    get "/"
+    assert_equal "any: mail", last_response.body
   end
 
   def test_root
-    visit "http://smackaho.st:9887/"
-    assert page.has_content? "root"
+    header "HOST", "example.org"
+    get "/"
+
+    assert_equal "root", last_response.body
   end
 end

data/test/test_helper.rb

@@ -1,41 +1,8 @@
 require "test/unit"
 require "rack/test"
-require "capybara"
-require "capybara/dsl"
 
 require "sinatra/subdomain"
 
-Capybara.default_driver = :selenium
-
 class Test::Unit::TestCase
-  include Capybara::DSL
-end
-
-class SampleApp < Sinatra::Base
-  register Sinatra::Subdomain
-
-  subdomain :foo do
-    get("/") { "set: #{subdomain}" }
-  end
-
-  subdomain do
-    get("/") { "any: #{subdomain}" }
-  end
-
-  get("/") { "root" }
-end
-
-class MultipleTldsApp < Sinatra::Base
-  register Sinatra::Subdomain
-  set :tld_size, 2
-
-  subdomain :foo do
-    get("/") { "set: #{subdomain}" }
-  end
-
-  subdomain do
-    get("/") { "any: #{subdomain}" }
-  end
-
-  get("/") { "root" }
+  include Rack::Test::Methods
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-subdomain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70271793132080 !ruby/object:Gem::Requirement
+  requirement: &70095704587020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271793132080
+  version_requirements: *70095704587020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70095704586600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70095704586600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70271793129920 !ruby/object:Gem::Requirement
+  requirement: &70095704586180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271793129920
+  version_requirements: *70095704586180
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70271793128720 !ruby/object:Gem::Requirement
+  requirement: &70095704585720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70095704585720
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70095704585240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271793128720
+  version_requirements: *70095704585240
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70271793143680 !ruby/object:Gem::Requirement
+  name: awesome_print
+  requirement: &70095704584780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271793143680
+  version_requirements: *70095704584780
 description: Separate routes for subdomains on Sinatra
 email:
 - fnando.vieira@gmail.com
@@ -63,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -70,6 +93,10 @@ files:
 - lib/sinatra/subdomain.rb
 - lib/sinatra/subdomain/version.rb
 - sinatra-subdomain.gemspec
+- spec/multiple_tlds_spec.rb
+- spec/single_tld_spec.rb
+- spec/spec_helper.rb
+- spec/support/subdomain_shared.rb
 - test/multiple_tlds_test.rb
 - test/subdomain_test.rb
 - test/test_helper.rb
@@ -87,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -355263696072099514
+      hash: 632946571034999382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,14 +123,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -355263696072099514
+      hash: 632946571034999382
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Separate routes for subdomains on Sinatra
 test_files:
+- spec/multiple_tlds_spec.rb
+- spec/single_tld_spec.rb
+- spec/spec_helper.rb
+- spec/support/subdomain_shared.rb
 - test/multiple_tlds_test.rb
 - test/subdomain_test.rb
 - test/test_helper.rb