multiplicity 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWRjYTBjYjRlNDU4OTE5M2M0ZWU5ZGRhOWE1YjA3MzgxZDlhOTM5ZA==
-  data.tar.gz: !binary |-
-    ZmNmOWQ3ZmVlMDgzMDEzZWQwNjNlYmFkOWQ2MGNkZGEyM2NlNGM1Mw==
+SHA1:
+  metadata.gz: baae9fd618937beb69067f45db9954aa6cb1514f
+  data.tar.gz: dcdcf7e0febd29000fb8f55b1b65d9f0b2e3df63
 SHA512:
-  metadata.gz: !binary |-
-    M2VjNTE3YWQ0OWE5ZTI3MGM0YTVhZGNmNjdmNmVkNTU4MGYzMzZjNzM2Nzky
-    YWZkMzE0ZjljNjRjMjA3MTk1ZDYyZjhhYTdjYTMyMDlmOGI2ODVjNTUxN2Iz
-    YTU0ZjA1ZjYzNTc0YWRkMmU5NWI5MDYzNzU4NDFlNDY5MWY4OTI=
-  data.tar.gz: !binary |-
-    NmUwMzFhZGMwYmUzMTc2MDU2ZDhmOGM4N2U2OGZkN2QzNjU2NWJmNDQwNDFk
-    ZDgxOTUzNTA2ZTliYjA4YTc3ZTNlZWNhOGY0M2JhNzM1NmQxNzU4YzkyMTM4
-    MTY3NjMxMDA0ZDkzOTk5NDk4NTQxYzQ2MmFlNWZkMGU5YzQ5MzQ=
+  metadata.gz: c2c98bc0a4c5b74de9138640d39cf025ea564dd374e0f31c9f015d62aee19cf7de79f8a177c37f4740118928259fa6abcca45ed6c1620824ab1e006e73293e8f
+  data.tar.gz: f0250644277faa8f835fd5dc42d6c551dfc0ca8f8b163e561ca7dc905678f100d23e80b1026919da69254b645981f7505a5535d98fcb00d2c3fca357956c1b6b

data/.gitignore

@@ -9,3 +9,4 @@
 /spec/examples.txt
 /tmp/
 .ruby-version
+gemfiles/*.lock

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [0.2.0] - 2016-08-12
+### Changed
+- Move `Multiplicity::Middleware` to `Mulitplicity::Middleware::Subdomain` to make room for additional strategies.

data/README.md

@@ -1,9 +1,9 @@
 # Multiplicity
 
-![build status](https://travis-ci.org/alassek/multiplicity.svg?branch=master)
+[![build status](https://travis-ci.org/alassek/multiplicity.svg?branch=master)](https://travis-ci.org/alassek/multiplicity)
+[![Gem Version](https://badge.fury.io/rb/multiplicity.svg)](https://rubygems.org/gems/multiplicity)
 
-Multiplicity is a gem for building a multitenant application in a Rack application,
-with a much less opinionated approach than e.g. [Apartment](https://github.com/influitive/apartment) might entail.
+Multiplicity is a gem for building multitenant Rack applications, with a much less opinionated approach than e.g. [Apartment](https://github.com/influitive/apartment) might entail.
 
 The goal of this gem is to provide the simplest tools required to isolate your data, and then get out of your way.
 

data/lib/multiplicity.rb

@@ -1,6 +1,5 @@
 require 'multiplicity/version'
 require 'multiplicity/tenant'
-require 'multiplicity/middleware'
 
 module Multiplicity
   def self.adapter; @adapter; end
@@ -24,5 +23,7 @@ module Multiplicity
   end
 end
 
+# Load Subdomain by default until there are multiple strategies
+require 'multiplicity/middleware/subdomain'
 # Always load AR adapter for now, until there is more than one
 require 'multiplicity/adapters/active_record'

data/lib/multiplicity/middleware/subdomain.rb

@@ -0,0 +1,51 @@
+module Multiplicity
+  module Middleware
+    class Subdomain
+      attr_reader :app, :header
+
+      def initialize(app, header = 'HTTP_HOST')
+        @app    = app
+        @header = header
+
+        unless defined?(Multiplicity::Adapters)
+          raise RuntimeError, "You must require an adapter to use Multiplicity"
+        end
+      end
+
+      def call(env)
+        subdomain = env[header].to_s.sub(/^http(s)?:\/\//, '').sub(/:[0-9]+$/, '')
+        subdomain = subdomain.split('.')[0..-3].join('.').downcase if subdomain.split('.').length > 2
+        subdomain = env.fetch('TENANT', 'localhost') if development?(subdomain)
+
+        if subdomain.length > 0
+          ::Multiplicity::Tenant.load(subdomain) or return not_found
+        else
+          return not_found
+        end
+
+        return gone if ::Multiplicity::Tenant.current.archived?
+
+        @app.call(env)
+      ensure
+        ::Multiplicity::Tenant.current = nil
+      end
+
+      def not_found
+        [404, { 'Content-Type' => 'text/plain', 'Content-Length' => '9' }, ['Not Found']]
+      end
+
+      def gone
+        [410, { 'Content-Type' => 'text/plain', 'Content-Length' => '15' }, ['Tenant archived']]
+      end
+
+    private
+
+      def development?(server_name)
+        return true if server_name =~ /^localhost(?:\:[0-9]+)$/
+        return true if server_name =~ /\.local$/
+        return true if server_name =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}(?:\:[0-9]+)$/
+        false
+      end
+    end
+  end
+end

data/lib/multiplicity/version.rb

@@ -1,3 +1,3 @@
 module Multiplicity
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: multiplicity
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Adam Lassek
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -129,9 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,14 +140,12 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/Gemfile.rails-3_2
-- gemfiles/Gemfile.rails-3_2.lock
 - gemfiles/Gemfile.rails-4_2
-- gemfiles/Gemfile.rails-4_2.lock
 - gemfiles/Gemfile.rails-5_0
 - gemfiles/Gemfile.rails-edge
 - lib/multiplicity.rb
 - lib/multiplicity/adapters/active_record.rb
-- lib/multiplicity/middleware.rb
+- lib/multiplicity/middleware/subdomain.rb
 - lib/multiplicity/tenant.rb
 - lib/multiplicity/version.rb
 - multiplicity.gemspec
@@ -160,19 +159,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple multitenancy for rack-based web servers
 test_files: []
-has_rdoc: 

data/gemfiles/Gemfile.rails-3_2.lock

@@ -1,83 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    multiplicity (0.1.0)
-      rack
-      virtus (>= 1.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.22.2)
-      activesupport (= 3.2.22.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.22.2)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.0.4)
-    coderay (1.1.1)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    equalizer (0.0.11)
-    i18n (0.7.0)
-    ice_nine (0.11.2)
-    method_source (0.8.2)
-    multi_json (1.12.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.4.7)
-    rake (11.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    slop (3.6.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (0.3.51)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.2)
-  bundler
-  multiplicity!
-  pry
-  rack (~> 1.4.5)
-  rake
-  rspec
-  rspec-expectations
-  sqlite3
-
-BUNDLED WITH
-   1.10.6

data/gemfiles/Gemfile.rails-4_2.lock

@@ -1,87 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    multiplicity (0.1.0)
-      rack
-      virtus (>= 1.0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
-      builder (~> 3.1)
-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
-      arel (~> 6.0)
-    activesupport (4.2.7)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.3)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
-    coderay (1.1.1)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    equalizer (0.0.11)
-    i18n (0.7.0)
-    ice_nine (0.11.2)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.9.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rake (11.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    slop (3.6.0)
-    sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 4.2)
-  bundler
-  multiplicity!
-  pry
-  rack (~> 1.6)
-  rake
-  rspec
-  rspec-expectations
-  sqlite3
-
-BUNDLED WITH
-   1.10.6

data/lib/multiplicity/middleware.rb

@@ -1,49 +0,0 @@
-module Multiplicity
-  class Middleware
-    attr_reader :app, :header
-
-    def initialize(app, header = 'HTTP_HOST')
-      @app    = app
-      @header = header
-
-      unless defined?(Multiplicity::Adapters)
-        raise RuntimeError, "You must require an adapter to use Multiplicity"
-      end
-    end
-
-    def call(env)
-      subdomain = env[header].to_s.sub(/^http(s)?:\/\//, '').sub(/:[0-9]+$/, '')
-      subdomain = subdomain.split('.')[0..-3].join('.').downcase if subdomain.split('.').length > 2
-      subdomain = env.fetch('TENANT', 'localhost') if development?(subdomain)
-
-      if subdomain.length > 0
-        ::Multiplicity::Tenant.load(subdomain) or return not_found
-      else
-        return not_found
-      end
-
-      return gone if ::Multiplicity::Tenant.current.archived?
-
-      @app.call(env)
-    ensure
-      ::Multiplicity::Tenant.current = nil
-    end
-
-    def not_found
-      [404, { 'Content-Type' => 'text/plain', 'Content-Length' => '9' }, ['Not Found']]
-    end
-
-    def gone
-      [410, { 'Content-Type' => 'text/plain', 'Content-Length' => '15' }, ['Tenant archived']]
-    end
-
-  private
-
-    def development?(server_name)
-      return true if server_name =~ /^localhost(?:\:[0-9]+)$/
-      return true if server_name =~ /\.local$/
-      return true if server_name =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}(?:\:[0-9]+)$/
-      false
-    end
-  end
-end