houser 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a37a9a6b52d4e15a8bf6f4be8b69a19386f2272a
-  data.tar.gz: f0f2777b9488166cd7172e8aca074fb876cda626
+  metadata.gz: d50dc68ec3f594a6648bee55ba34edb32125b769
+  data.tar.gz: 6f892bba2adb73499b267b31b33b9c5e166d7fac
 SHA512:
-  metadata.gz: b4589b6cd35ef614f1ec56e309e7d8f4a4498e867c4544179c9054f90eade5da87eb26e889f0d9c033d5b5160ca79dd21e2274537274ed1440b2127ef37daffa
-  data.tar.gz: 33bf73317fe420f8bcef9768f04c700fa4c71c5fc609a3cdcdf90912b6767b29aedef009b8a2a67d7e5c6387ebb8d0533e28f7b1679139ab09d27c7b29321c6e
+  metadata.gz: 9aa002ff57efc25dab9b52d5f9ec16ef678477a51c24a6092589529462a7a795c3244e991ececcd07feb895c32c77f6710789a80696cc10b39537471e5b71e24
+  data.tar.gz: 2ef326f2e61d8faab3f3a8927890a86fb36377347303698299a6d2a4bf1587cda249a59c168402df290eaa482946538492725e2d0718c75ec3edd889fa817658

data/.travis.yml

@@ -1 +1,4 @@
 script: 'bundle exec rspec spec'
+gemfile:
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails4.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails3" do
+  gem "rails", "3.2.17"
+end
+
+appraise "rails4" do
+  gem "rails", "4.0.4"
+end

data/README.md

@@ -28,7 +28,26 @@ If you're using a TLD like `.co.uk` instead of `.com`, you will need to specify
     config.middleware.use Houser::Middleware, 
       :class_name => 'Model',
       :tld_length => 2
+      
+## Usage
+
+There are two rack environment variables set by the Houser middleware that you can use throughout your application to scope resources. 
+
+If no object is found for the subdomain the request is received on, both of these variables will be nil. 
+
+### `env['X-Houser-Subdomain']`
+
+The complete subdomain of the request. The following domains have the following subdomains:
+
+* `sub1.example.com => sub1`
+* `sub2.sub1.example.com => sub2.sub1`
+* `sub1.example.co.uk => sub1`
+* `sub2.sub1.example.co.uk => sub2.sub1`
+
+### `env['X-Houser-Object']`
+
+The instance of the Class that is found based on the subdomain. 
 
 ## Contributing
 
-Please see [CONTRIBUTING.md](https://github.com/radar/houser/CONTRIBUTING.md)
+Please see [CONTRIBUTING.md](https://github.com/radar/houser/CONTRIBUTING.md)

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'appraisal'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/gemfiles/rails3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "3.2.17"
+
+gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: ../
+  specs:
+    houser (1.0.2)
+      rack
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
+      builder (~> 3.0.0)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.3)
+    builder (3.0.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.4)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
+      bundler (~> 1.0)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.2.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec-core (2.99.0.beta1)
+    rspec-expectations (2.99.0.beta1)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.0.beta1)
+    rspec-rails (2.99.0.beta1)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (= 2.99.0.beta1)
+      rspec-expectations (= 2.99.0.beta1)
+      rspec-mocks (= 2.99.0.beta1)
+    slop (3.5.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5.2)
+  bundler (~> 1.5)
+  houser!
+  pry
+  rails (= 3.2.17)
+  rake
+  rspec-rails (= 2.99.0.beta1)

data/gemfiles/rails4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.0.4"
+
+gemspec :path=>"../"

data/gemfiles/rails4.gemfile.lock

@@ -0,0 +1,115 @@
+PATH
+  remote: ../
+  specs:
+    houser (1.0.2)
+      rack
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
+      mail (~> 2.5.4)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
+      builder (~> 3.1.0)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.4)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.2)
+    atomic (1.1.16)
+    builder (3.1.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.9.2)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.4)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.2.2)
+    rspec-core (2.99.0.beta1)
+    rspec-expectations (2.99.0.beta1)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.0.beta1)
+    rspec-rails (2.99.0.beta1)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (= 2.99.0.beta1)
+      rspec-expectations (= 2.99.0.beta1)
+      rspec-mocks (= 2.99.0.beta1)
+    slop (3.5.0)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.1)
+      atomic (>= 1.1.7, < 2)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5.2)
+  bundler (~> 1.5)
+  houser!
+  pry
+  rails (= 4.0.4)
+  rake
+  rspec-rails (= 2.99.0.beta1)

data/houser.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails", "2.99.0.beta1"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency 'appraisal', '~> 0.5.2'
 end

data/lib/houser/middleware.rb

@@ -6,6 +6,7 @@ module Houser
 
     def initialize(app, options={})
       @options = options
+      @options[:subdomain_column] ||= "subdomain"
       @options[:class] = Object.const_get(options[:class_name])
       @options[:tld_length] ||= 1
       @app = app
@@ -15,7 +16,8 @@ module Houser
       domain_parts = env['HTTP_HOST'].split('.')
 
       if domain_parts.length > 1 + options[:tld_length]
-        subdomain = domain_parts[0]
+        domain_name = domain_parts[(-options[:tld_length] - 1)..-1]
+        subdomain = (domain_parts - domain_name).join('.')
         find_tenant(env, subdomain)
       end
 
@@ -25,7 +27,7 @@ module Houser
     private
 
     def find_tenant(env, subdomain)
-      object = options[:class].find_by(subdomain: subdomain)
+      object = options[:class].where(options[:subdomain_column].to_sym => subdomain).first
       if object
         env['X-Houser-Subdomain'] = subdomain
         env['X-Houser-Object'] = object

data/lib/houser/version.rb

@@ -1,3 +1,3 @@
 module Houser
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/houser_spec.rb

@@ -27,7 +27,7 @@ describe Houser::Middleware do
   end
 
   it "does nothing for non-subdomained requests" do
-    expect(Account).to_not receive(:find_by)
+    expect(Account).to_not receive(:where)
     code, env = middleware.call(env_for("http://example.com"))
     expect(env['X-Houser-Subdomain']).to be_nil
     expect(env['X-Houser-Object']).to be_nil
@@ -35,19 +35,32 @@ describe Houser::Middleware do
 
   it "sets X-HOUSER-ID header for known subdomains" do
     account = double(id: 1)
-    expect(Account).to receive(:find_by).with(subdomain: subdomain).and_return(account)
+    expect(Account).to receive(:where).with(subdomain: subdomain).and_return([account])
     code, env = middleware.call(env_for("http://#{subdomain}.example.com"))
     expect(env['X-Houser-Subdomain']).to eq(subdomain)
     expect(env['X-Houser-Object']).to eq(account)
   end
 
   it "returns no headers for unknown subdomains" do
-    expect(Account).to receive(:find_by).with(subdomain: subdomain).and_return(nil)
+    expect(Account).to receive(:where).with(subdomain: subdomain).and_return([])
     code, env = middleware.call(env_for("http://#{subdomain}.example.com"))
     expect(env['X-Houser-Subdomain']).to be_nil
     expect(env['X-Houser-Object']).to be_nil
   end
 
+
+  context "double subdomain" do
+    let(:subdomain) { 'ruby.melbourne' }
+
+    it "sets X-HOUSER-ID header for known subdomains within subdomains" do
+      account = double(id: 1)
+      expect(Account).to receive(:where).with(subdomain: subdomain).and_return([account])
+      code, env = middleware.call(env_for("http://#{subdomain}.example.com"))
+      expect(env['X-Houser-Subdomain']).to eq(subdomain)
+      expect(env['X-Houser-Object']).to eq(account)
+    end
+  end
+
   context "with a different class name" do
     let(:options) do
       { 
@@ -62,8 +75,8 @@ describe Houser::Middleware do
     end
 
     it "calls the right class" do
-      expect(Account).to_not receive(:find_by)
-      expect(Store).to receive(:find_by).with(subdomain: subdomain).and_return(store)
+      expect(Account).to_not receive(:where)
+      expect(Store).to receive(:where).with(subdomain: subdomain).and_return([store])
       code, env = middleware.call(env_for("http://#{subdomain}.example.com"))
       expect(env['X-Houser-Subdomain']).to eq(subdomain)
       expect(env['X-Houser-Object']).to eq(store)
@@ -79,10 +92,39 @@ describe Houser::Middleware do
     end
 
     it "supports more than one-level of TLD" do
-      expect(Account).to_not receive(:find_by)
+      expect(Account).to_not receive(:where)
       code, env = middleware.call(env_for("http://example.co.uk"))
       expect(env['X-Houser-Subdomain']).to be_nil
       expect(env['X-Houser-ID']).to be_nil
     end
+
+    context "double subdomain" do
+      let(:subdomain) { 'ruby.melbourne' }
+
+      it "sets X-HOUSER-ID header for known subdomains within subdomains" do
+        account = double(id: 1)
+        expect(Account).to receive(:where).with(subdomain: subdomain).and_return([account])
+        code, env = middleware.call(env_for("http://#{subdomain}.example.co.uk"))
+        expect(env['X-Houser-Subdomain']).to eq(subdomain)
+        expect(env['X-Houser-Object']).to eq(account)
+      end
+    end
+  end
+
+  context "with a different column name" do
+    let(:options) do
+      { 
+        subdomain_column: 'foo',
+        class_name: 'Account'
+      }
+    end
+
+    it "finds by an alternative column" do
+      account = double(id: 1)
+      expect(Account).to receive(:where).with(:foo => subdomain).and_return([account])
+      code, env = middleware.call(env_for("http://#{subdomain}.example.com"))
+      expect(env['X-Houser-Subdomain']).to eq(subdomain)
+      expect(env['X-Houser-Object']).to eq(account)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houser
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 description: Lightweight multitenancy gem.
 email:
 - radarlistener@gmail.com
@@ -89,11 +103,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
+- gemfiles/rails4.gemfile
+- gemfiles/rails4.gemfile.lock
 - houser.gemspec
 - lib/houser.rb
 - lib/houser/middleware.rb