milia 0.3.2 → 0.3.7

data/Gemfile

@@ -15,6 +15,5 @@ group :development, :test do
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
   gem 'rdoc'
-  gem  'test-unit'
   gem 'turn', :require => false
 end

data/Gemfile.lock

@@ -33,7 +33,7 @@ GEM
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    devise (1.4.8)
+    devise (1.4.9)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -50,12 +50,12 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     orm_adapter (0.0.5)
     pg (0.11.0)
-    polyglot (0.3.2)
-    rack (1.3.4)
+    polyglot (0.3.3)
+    rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -79,16 +79,15 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rcov (0.9.11)
-    rdoc (3.10)
+    rdoc (3.11)
       json (~> 1.4)
     shoulda (2.11.3)
-    sprockets (2.0.2)
+    sprockets (2.0.3)
       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)
@@ -112,5 +111,4 @@ DEPENDENCIES
   rcov
   rdoc
   shoulda
-  test-unit
   turn

data/README.rdoc

@@ -52,6 +52,8 @@ Milia expects a user session, so please set one up
 * The current version of milia requires that devise use a *User* model.
 
 === Milia setup
+
+==== migrations
 *ALL* models require a tenanting field, whether they are to be universal or to
 be tenanted. So make sure the following is added to each migration
 
@@ -78,6 +80,7 @@ Also create a tenants_users join table:
     end
   end
 
+==== application controller
 add the following line AFTER the devise-required filter for authentications:
 
 <i>app/controllers/application_controller.rb</i>
@@ -90,6 +93,7 @@ catch any exceptions with the following (be sure to also add the designated meth
   rescue_from ::Milia::Control::MaxTenantExceeded, :with => :max_tenants
   rescue_from ::Milia::Control::InvalidTenantAccess, :with => :invalid_tenant
 
+==== routes
 Add the following line into the devise_for :users block
 
 <i>config/routes.rb</i>
@@ -126,7 +130,12 @@ Only designate one model in this manner.
   end  # class Tenant
 
 === Designate universal models
-Add the following acts_as_universal to *ALL* models which are to be universal:
+Add the following acts_as_universal to *ALL* models which are to be universal and
+remove any superfluous
+  
+  belongs_to  :tenant
+  
+which the generator might have generated ( acts_as_tenant will specify that ).
 
 <i>app/models/eula.rb</i>
 
@@ -136,10 +145,13 @@ Add the following acts_as_universal to *ALL* models which are to be universal:
   
   end  # class Eula
 
-Note that the tenant_id of a universal model will always be forced to nil.
-
 === Designate tenanted models
-Add the following acts_as_tenant to *ALL* models which are to be tenanted:
+Add the following acts_as_tenant to *ALL* models which are to be tenanted and
+remove any superfluous
+  
+  belongs_to  :tenant
+  
+which the generator might have generated ( acts_as_tenant will specify that ).
 
 <i>app/models/post.rb</i>
 
@@ -149,8 +161,6 @@ Add the following acts_as_tenant to *ALL* models which are to be tenanted:
   
   end  # class Post
 
-Note that the tenant_id of a tenanted model must always match the current 
-valid tenant.
 
 === Exceptions raised
 
@@ -199,7 +209,8 @@ to put:
 * 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.
 * Milia uses Thread.current[:tenant_id] to hold the current tenant for the existing Action request in the application.
 * SQL statements executed outside the context of ActiveRecord pose a potential danger; the current milia implementation does not extend to the DB connection level and so cannot enforce tenanting at this point.
-
+* The tenant_id of a universal model will always be forced to nil.
+* The tenant_id of a tenanted model will be set to the current_tenant of the current_user upon creation.
 
 
 == Contributing to milia

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.7

data/lib/milia/base.rb

@@ -15,6 +15,9 @@ module Milia
 # ------------------------------------------------------------------------
       def acts_as_tenant()
         attr_protected :tenant_id
+        belongs_to  :tenant
+        validates_presence_of :tenant_id
+
         default_scope lambda { where( "#{table_name}.tenant_id = ?", Thread.current[:tenant_id] ) }
 
       # ..........................callback enforcers............................
@@ -43,6 +46,8 @@ module Milia
 # ------------------------------------------------------------------------
       def acts_as_universal()
         attr_protected :tenant_id
+        belongs_to  :tenant
+
         default_scope where( "#{table_name}.tenant_id IS NULL" )
 
       # ..........................callback enforcers............................
@@ -105,6 +110,25 @@ module Milia
         end # before_destroy do
         
   end
+
+# ------------------------------------------------------------------------
+# where_restrict_tenant -- gens tenant restrictive where clause for each klass
+# NOTE: subordinate join tables will not get the default scope by Rails
+# theoretically, the default scope on the master table alone should be sufficient
+# in restricting answers to the current_tenant alone .. HOWEVER, it doesn't feel
+# right. adding an additional .where( where_restrict_tenants(klass1, klass2,...))
+# for each of the subordinate models in the join seems like a nice safety issue.
+# ------------------------------------------------------------------------
+  def where_restrict_tenant(*args)
+    args.map{|klass| "#{klass.table_name}.tenant_id = #{Thread.current[:tenant_id]}"}.join(" AND ")
+  end
+  
+# ------------------------------------------------------------------------
+# ------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------
+# ------------------------------------------------------------------------
+
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
 

data/lib/milia/control.rb

@@ -28,13 +28,19 @@ module Milia
 # ------------------------------------------------------------------------------
     def set_current_tenant( tenant_id = nil )
       if user_signed_in?
+        
         @_my_tenants ||= current_user.tenants  # gets all possible tenants for user
         
-        if tenant_id.nil?  # no arg; find automatically from user
-          tenant_id = @_my_tenants.first.id
-        else   # passed an arg; validate tenant_id before setup
+        tenant_id ||= session[:tenant_id]   # use session tenant_id ?
+        
+        if tenant_id.nil?  # no arg; find automatically based on user
+          tenant_id = @_my_tenants.first.id  # just pick the first one
+        else   # validate the specified tenant_id before setup
           raise InvalidTenantAccess unless @_my_tenants.any?{|tu| tu.id == tenant_id}
         end
+        
+        session[:tenant_id] = tenant_id  # remember it going forward
+
       else   # user not signed in yet...
         tenant_id = 0  if tenant_id.nil?   # an impossible tenant_id
       end
@@ -46,6 +52,7 @@ module Milia
     
 # ------------------------------------------------------------------------------
 # initiate_tenant -- initiates first-time tenant; establishes thread
+# assumes not in a session yet (since here only upon new account sign-up)
 # ONLY for brand-new tenants upon User account sign up
 # arg
 #   tenant -- tenant obj of the new tenant

data/milia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.3.2"
+  s.version = "0.3.7"
 
   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.date = "2011-11-05"
   s.description = "Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications"
   s.email = "dsaronin@gmail.com"
   s.extra_rdoc_files = [
@@ -52,8 +52,14 @@ Gem::Specification.new do |s|
     "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/author.rb",
+    "test/rails_app/app/models/calendar.rb",
+    "test/rails_app/app/models/post.rb",
+    "test/rails_app/app/models/team.rb",
+    "test/rails_app/app/models/team_asset.rb",
     "test/rails_app/app/models/tenant.rb",
     "test/rails_app/app/models/user.rb",
+    "test/rails_app/app/models/zine.rb",
     "test/rails_app/app/views/home/index.html.erb",
     "test/rails_app/app/views/layouts/application.html.erb",
     "test/rails_app/config.ru",
@@ -78,6 +84,12 @@ Gem::Specification.new do |s|
     "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/migrate/20111012231923_create_posts.rb",
+    "test/rails_app/db/migrate/20111013050558_create_calendars.rb",
+    "test/rails_app/db/migrate/20111013050657_create_zines.rb",
+    "test/rails_app/db/migrate/20111013050753_create_teams.rb",
+    "test/rails_app/db/migrate/20111013050837_create_team_assets.rb",
+    "test/rails_app/db/migrate/20111013053403_create_authors.rb",
     "test/rails_app/db/schema.rb",
     "test/rails_app/db/seeds.rb",
     "test/rails_app/lib/assets/.gitkeep",
@@ -88,20 +100,26 @@ Gem::Specification.new do |s|
     "test/rails_app/public/500.html",
     "test/rails_app/public/favicon.ico",
     "test/rails_app/script/rails",
+    "test/rails_app/test/ctlr_test_helper.rb",
+    "test/rails_app/test/factories/units_factory.rb",
     "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/author_test.rb",
+    "test/rails_app/test/unit/calendar_test.rb",
     "test/rails_app/test/unit/helpers/home_helper_test.rb",
+    "test/rails_app/test/unit/post_test.rb",
+    "test/rails_app/test/unit/team_test.rb",
     "test/rails_app/test/unit/tenant_test.rb",
     "test/rails_app/test/unit/user_test.rb",
+    "test/rails_app/test/unit/zine_test.rb",
     "test/rails_app/vendor/assets/stylesheets/.gitkeep",
     "test/rails_app/vendor/plugins/.gitkeep",
+    "test/rails_app/vendor/plugins/rails_log_stdout/init.rb",
     "test/test_milia.rb"
   ]
   s.homepage = "http://github.com/dsaronin/milia"
@@ -122,7 +140,6 @@ Gem::Specification.new do |s|
       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<rails>, [">= 3.1"])
@@ -133,7 +150,6 @@ Gem::Specification.new do |s|
       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
@@ -145,7 +161,6 @@ Gem::Specification.new do |s|
     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/Gemfile

@@ -18,6 +18,8 @@ group :assets do
   gem 'sass-rails',   '~> 3.1.4'
   gem 'coffee-rails', '~> 3.1.1'
   gem 'uglifier', '>= 1.0.3'
+  gem 'execjs'
+  gem 'therubyracer'
 end
 
 gem 'jquery-rails'
@@ -35,6 +37,8 @@ gem 'jquery-rails'
 # gem 'ruby-debug19', :require => 'ruby-debug'
 
 group :test do
+  gem "factory_girl_rails", "~> 1.2"
+  gem "shoulda", ">= 0"
   # Pretty printed test output
   gem 'turn', :require => false
 end

data/test/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../milia
   specs:
-    milia (0.3.2)
+    milia (0.3.6)
       devise (>= 1.4.8)
       rails (>= 3.1)
 
@@ -48,7 +48,7 @@ GEM
       execjs
     coffee-script-source (1.1.2)
     daemons (1.1.4)
-    devise (1.4.8)
+    devise (1.4.9)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
@@ -56,25 +56,31 @@ GEM
     eventmachine (0.12.10)
     execjs (1.2.9)
       multi_json (~> 1.0)
-    foreman (0.24.0)
+    factory_girl (2.2.0)
+      activesupport
+    factory_girl_rails (1.3.0)
+      factory_girl (~> 2.2.0)
+      railties (>= 3.0.0)
+    foreman (0.25.0)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.14)
+    jquery-rails (1.0.16)
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.6.1)
+    libv8 (3.3.10.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     orm_adapter (0.0.5)
     pg (0.11.0)
-    polyglot (0.3.2)
-    rack (1.3.4)
+    polyglot (0.3.3)
+    rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -98,8 +104,8 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.10)
+    rake (0.9.2.2)
+    rdoc (3.11)
       json (~> 1.4)
     sass (3.1.10)
     sass-rails (3.1.4)
@@ -108,11 +114,14 @@ GEM
       sass (>= 3.1.4)
       sprockets (~> 2.0.0)
       tilt (~> 1.3.2)
-    sprockets (2.0.2)
+    shoulda (2.11.3)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.6)
+    term-ansicolor (1.0.7)
+    therubyracer (0.9.8)
+      libv8 (~> 3.3.10)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -125,7 +134,7 @@ GEM
     turn (0.8.3)
       ansi
     tzinfo (0.3.30)
-    uglifier (1.0.3)
+    uglifier (1.0.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     warden (1.0.6)
@@ -137,6 +146,8 @@ PLATFORMS
 DEPENDENCIES
   coffee-rails (~> 3.1.1)
   devise (>= 1.4.8)
+  execjs
+  factory_girl_rails (~> 1.2)
   foreman
   jquery-rails
   milia!
@@ -144,6 +155,8 @@ DEPENDENCIES
   rails (= 3.1.1)
   rdoc
   sass-rails (~> 3.1.4)
+  shoulda
+  therubyracer
   thin
   turn
   uglifier (>= 1.0.3)

data/test/rails_app/app/controllers/application_controller.rb

@@ -1,5 +1,20 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  before_filter :configure_mailer
   before_filter :authenticate_user!
   before_filter :set_current_tenant   # forces milia to set up current tenant
+
+protected
+
+# ------------------------------------------------------------------------------
+# ------------------------------------------------------------------------------
+  def configure_mailer
+    ActionMailer::Base.default_url_options[:host] = request.host
+    ActionMailer::Base.default_url_options[:port] = request.port unless request.port == 80
+  end
+
+
+
+
 end