houser 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7aeb0f4ccfe958efe519ab55f195012cbf538d96
-  data.tar.gz: 0b8f4ee6b11be8e70614b36499a1876271c7a068
+  metadata.gz: a37a9a6b52d4e15a8bf6f4be8b69a19386f2272a
+  data.tar.gz: f0f2777b9488166cd7172e8aca074fb876cda626
 SHA512:
-  metadata.gz: ae825a8d53bd433d3ba2497f505368cc6f3ae652361f5cac9c461f1aff21351457b30ae5b67f65241c89fec3c579eb0584be60c93229c6220fbd41e69c1948f2
-  data.tar.gz: 89a97b6d8ce97260c4f338f1aff7f438ff8c55b1900102d1a075004242910ee6aa6afe738adc055f7de1d4302467d5054e71e76f3076d19e22f516260dd90661
+  metadata.gz: b4589b6cd35ef614f1ec56e309e7d8f4a4498e867c4544179c9054f90eade5da87eb26e889f0d9c033d5b5160ca79dd21e2274537274ed1440b2127ef37daffa
+  data.tar.gz: 33bf73317fe420f8bcef9768f04c700fa4c71c5fc609a3cdcdf90912b6767b29aedef009b8a2a67d7e5c6387ebb8d0533e28f7b1679139ab09d27c7b29321c6e

data/.travis.yml

@@ -0,0 +1 @@
+script: 'bundle exec rspec spec'

data/README.md

@@ -1,5 +1,7 @@
 # Houser
 
+![Build Status](https://api.travis-ci.org/radar/houser.png?branch=master)
+
 This is the multitenancy gem that will be used in the Multitenancy with Rails book as an alternative method to PostgreSQL schemas which can have their own set of problems.
 
 Houser provides you with two Rack environment variables which can then be used in your application to scope resources correctly. That is all it does for the time being, and it will probably do more in the future.

data/lib/houser/middleware.rb

@@ -2,9 +2,11 @@ require 'rack'
 
 module Houser
   class Middleware
+    attr_accessor :options
+
     def initialize(app, options={})
       @options = options
-      @options[:class_name] = Object.const_get(@options[:class_name])
+      @options[:class] = Object.const_get(options[:class_name])
       @options[:tld_length] ||= 1
       @app = app
     end
@@ -12,7 +14,7 @@ module Houser
     def call(env)
       domain_parts = env['HTTP_HOST'].split('.')
 
-      if domain_parts.length > 1 + @options[:tld_length]
+      if domain_parts.length > 1 + options[:tld_length]
         subdomain = domain_parts[0]
         find_tenant(env, subdomain)
       end
@@ -23,7 +25,7 @@ module Houser
     private
 
     def find_tenant(env, subdomain)
-      object = Account.find_by(subdomain: subdomain)
+      object = options[:class].find_by(subdomain: subdomain)
       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.1"
+  VERSION = "1.0.2"
 end

data/spec/houser_spec.rb

@@ -17,17 +17,57 @@ describe Houser::Middleware do
 
   let(:subdomain) { 'account1' }
 
+  before do
+    stub_const('Account', Class.new)
+  end
+
   def env_for(url, opts={})
     opts.merge!('HTTP_HOST' => URI.parse(url).host)
     Rack::MockRequest.env_for(url, opts)
   end
 
   it "does nothing for non-subdomained requests" do
-    stub_const('Account', Class.new)
     expect(Account).to_not receive(:find_by)
     code, env = middleware.call(env_for("http://example.com"))
     expect(env['X-Houser-Subdomain']).to be_nil
-    expect(env['X-Houser-ID']).to be_nil
+    expect(env['X-Houser-Object']).to be_nil
+  end
+
+  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)
+    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)
+    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 "with a different class name" do
+    let(:options) do
+      { 
+        class_name: 'Store'
+      }
+    end
+
+    let(:store) { double(id: 2) }
+
+    before do
+      stub_const('Store', Class.new)
+    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)
+      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)
+    end
   end
 
   context "with more than one-level of TLD" do
@@ -38,29 +78,11 @@ describe Houser::Middleware do
       }
     end
 
-    it "support more than one-level of TLD" do
-      stub_const('Account', Class.new)
+    it "supports more than one-level of TLD" do
       expect(Account).to_not receive(:find_by)
       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
   end
-    
-  it "sets X-HOUSER-ID header for known subdomains" do
-    stub_const('Account', Class.new)
-    account = double(id: 1)
-    expect(Account).to receive(:find_by).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-ID']).to eq(1)
-  end
-
-  it "returns no headers for unknown subdomains" do
-    stub_const('Account', Class.new)
-    expect(Account).to receive(:find_by).with(subdomain: subdomain).and_return(nil)
-    code, env = middleware.call(env_for("http://#{subdomain}.example.com"))
-    expect(env['X-Houser-Subdomain']).to be_nil
-    expect(env['X-Houser-ID']).to be_nil
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: houser
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan Bigg
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt