milia 0.2.0 → 0.3.2

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3@projects
+rvm 1.9.3@milia

data/Gemfile

@@ -3,15 +3,18 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-  gem 'activerecord', '>= 3.1'
+  gem 'rails', '>= 3.1'
   gem 'devise', ">= 1.4.8"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-group :development do
+group :development, :test do
+  gem 'pg'
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem 'rdoc'
+  gem  'test-unit'
+  gem 'turn', :require => false
 end

data/Gemfile.lock

@@ -1,6 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
     activemodel (3.1.1)
       activesupport (= 3.1.1)
       builder (~> 3.0.0)
@@ -10,8 +24,12 @@ GEM
       activesupport (= 3.1.1)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
     activesupport (3.1.1)
       multi_json (~> 1.0)
+    ansi (1.3.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
@@ -19,21 +37,65 @@ GEM
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
+    erubis (2.7.0)
     git (1.2.5)
+    hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.6.1)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
     multi_json (1.0.3)
     orm_adapter (0.0.5)
+    pg (0.11.0)
+    polyglot (0.3.2)
     rack (1.3.4)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
     rcov (0.9.11)
     rdoc (3.10)
       json (~> 1.4)
     shoulda (2.11.3)
+    sprockets (2.0.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    test-unit (2.4.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    turn (0.8.3)
+      ansi
     tzinfo (0.3.30)
     warden (1.0.6)
       rack (>= 1.0)
@@ -42,10 +104,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.1)
   bundler (~> 1.0.0)
   devise (>= 1.4.8)
   jeweler (~> 1.6.4)
+  pg
+  rails (>= 3.1)
   rcov
   rdoc
   shoulda
+  test-unit
+  turn

data/README.rdoc

@@ -40,13 +40,20 @@ Or in the Gemfile:
   
 == Getting started
 
+=== Rails setup
+Milia expects a user session, so please set one up
+
+  $ rails g session_migration
+      invoke  active_record
+      create    db/migrate/20111012060818_add_sessions_table.rb
+  
 === Devise setup
 * See https://github.com/plataformatec/devise for how to set up devise.
 * The current version of milia requires that devise use a *User* model.
 
 === Milia setup
 *ALL* models require a tenanting field, whether they are to be universal or to
-be tenanted.
+be tenanted. So make sure the following is added to each migration
 
 <i>db/migrate</i>
 
@@ -177,6 +184,16 @@ immediately after the new tenant has been created).
     return tenant
   end
 
+=== Alternate use case: user belongs to multiple tenants
+Your application might allow a user to belong to multiple tenants. You will need
+to provide some type of mechanism to allow the user to choose which account
+(thus tenant) they wish to access. Once chosen, in your controller, you will need
+to put:
+
+<i>app/controllers/any_controller.rb</i>
+  
+  set_current_tenant( new_tenant_id )
+
 
 == Cautions
 * Milia designates a default_scope for all models (both universal and tenanted). From Rails 3.2 onwards, the last designated default scope overrides any prior scopes.

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/dsaronin/milia"
   gem.license = "MIT"
   gem.summary = %Q{Multi-tenanting for hosted Rails 3.1+ applications}
-  gem.description = %Q{enables row-based multi-tenanting that is transparent to application}
+  gem.description = %Q{Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications}
   gem.email = "dsaronin@gmail.com"
   gem.authors = ["David Anderson"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.2

data/app/controllers/registrations_controller.rb

@@ -6,6 +6,8 @@ module Milia
 # ------------------------------------------------------------------------------
 
 # ------------------------------------------------------------------------------
+# create -- intercept the POST create action upon new sign-up
+# new tenant account is vetted, then created, then proceed with devise create user
 # ------------------------------------------------------------------------------
     def create
       
@@ -23,8 +25,17 @@ module Milia
       end
             
     end   # def create
+
+# ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
+  private
 # ------------------------------------------------------------------------------
+# sign_out_session! -- force the devise session signout
+# ------------------------------------------------------------------------------
+
+    def sign_out_session!()
+      Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name) if user_signed_in?
+    end
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------

data/milia.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.2.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Anderson"]
   s.date = "2011-10-12"
-  s.description = "enables row-based multi-tenanting that is transparent to application"
+  s.description = "Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications"
   s.email = "dsaronin@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -35,6 +35,73 @@ Gem::Specification.new do |s|
     "lib/milia/tasks.rb",
     "milia.gemspec",
     "test/helper.rb",
+    "test/rails_app/.gitignore",
+    "test/rails_app/Gemfile",
+    "test/rails_app/Gemfile.lock",
+    "test/rails_app/Procfile",
+    "test/rails_app/README",
+    "test/rails_app/Rakefile",
+    "test/rails_app/app/assets/images/rails.png",
+    "test/rails_app/app/assets/javascripts/application.js",
+    "test/rails_app/app/assets/javascripts/home.js.coffee",
+    "test/rails_app/app/assets/stylesheets/application.css",
+    "test/rails_app/app/assets/stylesheets/home.css.scss",
+    "test/rails_app/app/controllers/application_controller.rb",
+    "test/rails_app/app/controllers/home_controller.rb",
+    "test/rails_app/app/helpers/application_helper.rb",
+    "test/rails_app/app/helpers/home_helper.rb",
+    "test/rails_app/app/mailers/.gitkeep",
+    "test/rails_app/app/models/.gitkeep",
+    "test/rails_app/app/models/tenant.rb",
+    "test/rails_app/app/models/user.rb",
+    "test/rails_app/app/views/home/index.html.erb",
+    "test/rails_app/app/views/layouts/application.html.erb",
+    "test/rails_app/config.ru",
+    "test/rails_app/config/application.rb",
+    "test/rails_app/config/boot.rb",
+    "test/rails_app/config/database.yml",
+    "test/rails_app/config/environment.rb",
+    "test/rails_app/config/environments/development.rb",
+    "test/rails_app/config/environments/production.rb",
+    "test/rails_app/config/environments/test.rb",
+    "test/rails_app/config/initializers/backtrace_silencers.rb",
+    "test/rails_app/config/initializers/devise.rb",
+    "test/rails_app/config/initializers/inflections.rb",
+    "test/rails_app/config/initializers/mime_types.rb",
+    "test/rails_app/config/initializers/secret_token.rb",
+    "test/rails_app/config/initializers/session_store.rb",
+    "test/rails_app/config/initializers/wrap_parameters.rb",
+    "test/rails_app/config/locales/devise.en.yml",
+    "test/rails_app/config/locales/en.yml",
+    "test/rails_app/config/routes.rb",
+    "test/rails_app/db/migrate/20111012050340_devise_create_users.rb",
+    "test/rails_app/db/migrate/20111012050532_create_tenants.rb",
+    "test/rails_app/db/migrate/20111012050600_create_tenants_users.rb",
+    "test/rails_app/db/migrate/20111012060818_add_sessions_table.rb",
+    "test/rails_app/db/schema.rb",
+    "test/rails_app/db/seeds.rb",
+    "test/rails_app/lib/assets/.gitkeep",
+    "test/rails_app/lib/tasks/.gitkeep",
+    "test/rails_app/log/.gitkeep",
+    "test/rails_app/public/404.html",
+    "test/rails_app/public/422.html",
+    "test/rails_app/public/500.html",
+    "test/rails_app/public/favicon.ico",
+    "test/rails_app/script/rails",
+    "test/rails_app/test/fixtures/.gitkeep",
+    "test/rails_app/test/fixtures/tenants.yml",
+    "test/rails_app/test/fixtures/users.yml",
+    "test/rails_app/test/functional/.gitkeep",
+    "test/rails_app/test/functional/home_controller_test.rb",
+    "test/rails_app/test/integration/.gitkeep",
+    "test/rails_app/test/performance/browsing_test.rb",
+    "test/rails_app/test/test_helper.rb",
+    "test/rails_app/test/unit/.gitkeep",
+    "test/rails_app/test/unit/helpers/home_helper_test.rb",
+    "test/rails_app/test/unit/tenant_test.rb",
+    "test/rails_app/test/unit/user_test.rb",
+    "test/rails_app/vendor/assets/stylesheets/.gitkeep",
+    "test/rails_app/vendor/plugins/.gitkeep",
     "test/test_milia.rb"
   ]
   s.homepage = "http://github.com/dsaronin/milia"
@@ -47,30 +114,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1"])
       s.add_runtime_dependency(%q<devise>, [">= 1.4.8"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<turn>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.1"])
+      s.add_dependency(%q<rails>, [">= 3.1"])
       s.add_dependency(%q<devise>, [">= 1.4.8"])
+      s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<turn>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.1"])
+    s.add_dependency(%q<rails>, [">= 3.1"])
     s.add_dependency(%q<devise>, [">= 1.4.8"])
+    s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<turn>, [">= 0"])
   end
 end
 

data/test/rails_app/.gitignore

@@ -0,0 +1,5 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/

data/test/rails_app/Gemfile

@@ -0,0 +1,42 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.1.1'
+
+# Bundle edge Rails instead:
+# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+
+gem  'thin'
+gem  'pg'
+gem   'rdoc'
+gem 'devise', ">= 1.4.8"
+gem 'foreman'
+  
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.1.4'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+group :test do
+  # Pretty printed test output
+  gem 'turn', :require => false
+end
+
+gem 'milia', :path => "../../../milia"

data/test/rails_app/Gemfile.lock

@@ -0,0 +1,149 @@
+PATH
+  remote: ../../../milia
+  specs:
+    milia (0.3.2)
+      devise (>= 1.4.8)
+      rails (>= 3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    ansi (1.3.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.2)
+    daemons (1.1.4)
+    devise (1.4.8)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
+    erubis (2.7.0)
+    eventmachine (0.12.10)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
+    foreman (0.24.0)
+      term-ansicolor (~> 1.0.5)
+      thor (>= 0.13.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.14)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.1)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    orm_adapter (0.0.5)
+    pg (0.11.0)
+    polyglot (0.3.2)
+    rack (1.3.4)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.10)
+      json (~> 1.4)
+    sass (3.1.10)
+    sass-rails (3.1.4)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
+    sprockets (2.0.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    term-ansicolor (1.0.6)
+    thin (1.2.11)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    turn (0.8.3)
+      ansi
+    tzinfo (0.3.30)
+    uglifier (1.0.3)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    warden (1.0.6)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-rails (~> 3.1.1)
+  devise (>= 1.4.8)
+  foreman
+  jquery-rails
+  milia!
+  pg
+  rails (= 3.1.1)
+  rdoc
+  sass-rails (~> 3.1.4)
+  thin
+  turn
+  uglifier (>= 1.0.3)