milia 0.3.34 → 0.3.38

data/Gemfile

@@ -3,14 +3,14 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-  gem 'rails', '>= 3.2.9'
+  gem 'rails', '3.2.13'
   gem 'devise', "2.1.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
   gem 'pg'
-  gem "shoulda", ">= 0"
+  gem "shoulda", "3.5.0"
   gem "jeweler", "~> 1.6.4"
   gem 'rdoc'
   gem 'turn', :require => false

data/Gemfile.lock

@@ -1,32 +1,32 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     ansi (1.4.3)
     arel (3.0.2)
@@ -39,67 +39,66 @@ GEM
       warden (~> 1.2.1)
     erubis (2.7.0)
     git (1.2.5)
-    hike (1.2.1)
+    hike (1.2.3)
     i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     journey (1.0.4)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.7)
+    mime-types (1.23)
+    multi_json (1.7.6)
     orm_adapter (0.4.0)
-    pg (0.14.1)
+    pg (0.15.1)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.1)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
     warden (1.2.1)
       rack (>= 1.0)
 
@@ -110,7 +109,7 @@ DEPENDENCIES
   devise (= 2.1.2)
   jeweler (~> 1.6.4)
   pg
-  rails (>= 3.2.9)
+  rails (= 3.2.13)
   rdoc
-  shoulda
+  shoulda (= 3.5.0)
   turn

data/README.md

@@ -1,7 +1,7 @@
 # milia
 
-Milia is a multi-tenanting gem for hosted Rails 3.1 applications which use
-devise for user authentication.
+Milia is a multi-tenanting gem for hosted Rails 3.1 applications which uses
+the devise gem for user authentication.
 
 ## Basic concepts
 
@@ -21,6 +21,14 @@ performance hit, was seriously time-consuming to backup and restore, was invasiv
 into the Rails code structure (monkey patching), was complex to implement, and
 couldn't use Rails migration tools as-is.
 
+A tenant == an organization; users == members of the organization. 
+Only organizations sign up for new tenants, not members (users).  
+The very first user of an organization, let's call him the Organizer, 
+is the one responsible for initiating the organizational signup.
+The Organizer becomes the first member (user) of the organization (tenant). 
+Thereafter, other members only obtain entry to the organization (tenant) 
+by invitation. New tenants are not created for every new user.
+
 ## Structure
 
 * necessary models: user, tenant
@@ -143,6 +151,42 @@ catch any exceptions with the following (be sure to also add the designated meth
   rescue_from ::Milia::Control::InvalidTenantAccess, :with => :invalid_tenant
 ```
 
+You'll need to place prep_signup_view method in application_controller.rb; it sets up any attributes required by your signup form. below is the example from my application.
+
+```ruby
+# ------------------------------------------------------------------------------
+  # klass_option_obj -- returns a (new?) object of a given klass
+  # purpose is to handle the variety of ways to prepare for a view
+  # args:
+  #   klass -- class of object to be returned
+  #   option_obj -- any one of the following
+  #       -- nil -- will return klass.new
+  #       -- object -- will return the object itself
+  #       -- hash   -- will return klass.new( hash ) for parameters
+# ------------------------------------------------------------------------------
+  def klass_option_obj(klass, option_obj)
+    return option_obj if option_obj.instance_of?(klass)
+    option_obj ||= {}  # if nil, makes it empty hash
+    return klass.send( :new, option_obj )
+  end  
+
+# ------------------------------------------------------------------------------
+  # prep_signup_view -- prepares for the signup view
+  # args:
+  #   tenant: either existing tenant obj or params for tenant
+  #   user:   either existing user obj or params for user
+# ------------------------------------------------------------------------------
+  def prep_signup_view(tenant=nil, user=nil, coupon='')
+    @user   = klass_option_obj( User, user )
+    @tenant = klass_option_obj( Tenant, tenant )
+    @coupon = coupon
+    @eula   = Eula.get_latest.first
+ end
+```
+
+My signup form has fields for user's email, organization's name (tenant model), coupon code, and current EULA version.
+
+
 #### routes
 
 Add the following line into the devise_for :users block
@@ -150,9 +194,7 @@ Add the following line into the devise_for :users block
 <i>config/routes.rb</i>
 
 ```ruby
-  devise_for :users do
-    post  "users" => "milia/registrations#create"
-  end
+  devise_for :users, :controllers => { :registrations => "milia/registrations" }
 ```
   
 ### Designate which model determines account
@@ -354,8 +396,6 @@ load when I start the console. This does the following:
 change_tenant(1,1)   # or whatever is an appropriate starting user, tenant
 ```
 
-
-
 ## 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 and will invalidate multi-tenanting; so *DO NOT USE default_scope*
@@ -364,6 +404,11 @@ change_tenant(1,1)   # or whatever is an appropriate starting user, tenant
 * 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.
 
+## Further documentation
+* Check out the three-part blog discussion of _Multi-tenanting Ruby on Rails Applications on Heroku_
+at: http://myrailscraft.blogspot.com/2013/05/multi-tenanting-ruby-on-rails.html
+* See the Milia tutorial at: http://myrailscraft.blogspot.com/2013/05/multi-tenanting-ruby-on-rails_3982.html
+
 
 ## Contributing to milia
  

data/VERSION

@@ -1 +1 @@
-0.3.34
+0.3.38

data/lib/milia/base.rb

@@ -28,19 +28,22 @@ module Milia
 
       # ..........................callback enforcers............................
         before_save do |obj|   # force tenant_id to be correct for current_user
-          obj.tenant_id = Thread.current[:tenant_id]
+          # raise exception if updates attempted on wrong data
+          raise ::Milia::Control::InvalidTenantAccess unless obj.tenant_id == Thread.current[:tenant_id]
           true  #  ok to proceed
         end
 
       # ..........................callback enforcers............................
-        before_update do |obj|   # force tenant_id to be correct for current_user
-          raise ::Control::InvalidTenantAccess unless obj.tenant_id == Thread.current[:tenant_id]
-          true  #  ok to proceed
-        end
+        # no longer needed because before_save invoked prior to before_update
+        #
+#         before_update do |obj|   # force tenant_id to be correct for current_user
+#           raise ::Milia::Control::InvalidTenantAccess unless obj.tenant_id == Thread.current[:tenant_id]
+#           true  #  ok to proceed
+#         end
 
       # ..........................callback enforcers............................
         before_destroy do |obj|   # force tenant_id to be correct for current_user
-          raise ::Control::InvalidTenantAccess unless obj.tenant_id == Thread.current[:tenant_id]
+          raise ::Milia::Control::InvalidTenantAccess unless obj.tenant_id == Thread.current[:tenant_id]
           true  #  ok to proceed
         end
 
@@ -58,19 +61,21 @@ module Milia
 
       # ..........................callback enforcers............................
         before_save do |obj|   # force tenant_id to be universal
-          raise ::Control::InvalidTenantAccess unless obj.tenant_id.nil?
+          raise ::Milia::Control::InvalidTenantAccess unless obj.tenant_id.nil?
           true  #  ok to proceed
         end
 
       # ..........................callback enforcers............................
-        before_update do |obj|   # force tenant_id to be universal
-          raise ::Control::InvalidTenantAccess unless obj.tenant_id.nil?
-          true  #  ok to proceed
-        end
+#         before_update do |obj|   # force tenant_id to be universal
+        # no longer needed because before_save invoked prior to before_update
+        #
+#           raise ::Milia::Control::InvalidTenantAccess unless obj.tenant_id.nil?
+#           true  #  ok to proceed
+#         end
 
       # ..........................callback enforcers............................
         before_destroy do |obj|   # force tenant_id to be universal
-          raise ::Control::InvalidTenantAccess unless obj.tenant_id.nil?
+          raise ::Milia::Control::InvalidTenantAccess unless obj.tenant_id.nil?
           true  #  ok to proceed
         end
 

data/milia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.3.34"
+  s.version = "0.3.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Anderson"]
-  s.date = "2013-01-19"
+  s.date = "2013-06-11"
   s.description = "Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications"
   s.email = "dsaronin@gmail.com"
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "test/rails_app/.gitignore",
     "test/rails_app/Gemfile",
     "test/rails_app/Gemfile.lock",
+    "test/rails_app/Gemfile.lock.backup",
     "test/rails_app/Procfile",
     "test/rails_app/README",
     "test/rails_app/Rakefile",
@@ -134,27 +135,27 @@ 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<rails>, [">= 3.2.9"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.2.13"])
       s.add_runtime_dependency(%q<devise>, ["= 2.1.2"])
       s.add_development_dependency(%q<pg>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, ["= 3.5.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<turn>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.2.9"])
+      s.add_dependency(%q<rails>, ["= 3.2.13"])
       s.add_dependency(%q<devise>, ["= 2.1.2"])
       s.add_dependency(%q<pg>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, ["= 3.5.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<turn>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.2.9"])
+    s.add_dependency(%q<rails>, ["= 3.2.13"])
     s.add_dependency(%q<devise>, ["= 2.1.2"])
     s.add_dependency(%q<pg>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, ["= 3.5.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<turn>, [">= 0"])

data/test/rails_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.1'
+gem 'rails', '3.2.13'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
@@ -8,15 +8,15 @@ gem 'rails', '3.1.1'
 gem  'thin'
 gem  'pg'
 gem   'rdoc'
-gem 'devise', ">= 1.4.8"
+gem 'devise', ">= 2.1.2"
 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 'sass-rails',   '> 3.2'
+  gem 'coffee-rails', '> 3.2'
   gem 'uglifier', '>= 1.0.3'
   gem 'execjs'
   gem 'therubyracer'
@@ -38,9 +38,11 @@ gem 'jquery-rails'
 
 group :test do
   gem "factory_girl_rails", "~> 1.2"
-  gem "shoulda", ">= 0"
+  gem "shoulda", "3.5.0"
+  gem "shoulda-matchers", "~>2.1.0"
+  gem "shoulda-context", "~>1.1.2"
   # Pretty printed test output
   gem 'turn', :require => false
 end
 
-gem 'milia', :path => "../../../milia"
+gem 'milia', :path => "../../../milia"

data/test/rails_app/Gemfile.lock

@@ -1,161 +1,167 @@
 PATH
   remote: ../../../milia
   specs:
-    milia (0.3.7)
-      devise (>= 1.4.8)
-      rails (>= 3.1)
+    milia (0.3.37)
+      devise (= 2.1.2)
+      rails (= 3.2.13)
 
 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)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    ansi (1.3.0)
-    arel (2.2.1)
+    ansi (1.4.3)
+    arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    builder (3.0.0)
-    coffee-rails (3.1.1)
+    builder (3.0.4)
+    coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.2)
-    daemons (1.1.4)
-    devise (1.4.9)
+    coffee-script-source (1.6.2)
+    daemons (1.1.9)
+    devise (2.1.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    dotenv (0.7.0)
     erubis (2.7.0)
-    eventmachine (0.12.10)
-    execjs (1.2.9)
+    eventmachine (1.0.3)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (2.2.0)
-      activesupport
-    factory_girl_rails (1.3.0)
-      factory_girl (~> 2.2.0)
+    factory_girl (2.6.4)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    foreman (0.25.0)
-      term-ansicolor (~> 1.0.5)
+    foreman (0.63.0)
+      dotenv (>= 0.7)
       thor (>= 0.13.6)
-    hike (1.2.1)
-    i18n (0.6.0)
-    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)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (3.0.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    libv8 (3.11.8.17)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.3)
-    orm_adapter (0.0.5)
-    pg (0.11.0)
+    mime-types (1.23)
+    multi_json (1.7.6)
+    orm_adapter (0.4.0)
+    pg (0.15.1)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.5)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       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)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.11)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
       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)
-    shoulda (2.11.3)
-    sprockets (2.0.3)
+    ref (1.0.5)
+    sass (3.2.9)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.1.0)
+      activesupport (>= 3.0.0)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
-    therubyracer (0.9.8)
-      libv8 (~> 3.3.10)
-    thin (1.2.11)
+    therubyracer (0.11.4)
+      libv8 (~> 3.11.8.12)
+      ref
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.8.3)
+    turn (0.9.6)
       ansi
-    tzinfo (0.3.30)
-    uglifier (1.0.4)
+    tzinfo (0.3.37)
+    uglifier (2.1.1)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    warden (1.0.6)
+      multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.1)
       rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coffee-rails (~> 3.1.1)
-  devise (>= 1.4.8)
+  coffee-rails (> 3.2)
+  devise (>= 2.1.2)
   execjs
   factory_girl_rails (~> 1.2)
   foreman
   jquery-rails
   milia!
   pg
-  rails (= 3.1.1)
+  rails (= 3.2.13)
   rdoc
-  sass-rails (~> 3.1.4)
-  shoulda
+  sass-rails (> 3.2)
+  shoulda (= 3.5.0)
+  shoulda-context (~> 1.1.2)
+  shoulda-matchers (~> 2.1.0)
   therubyracer
   thin
   turn

data/test/rails_app/Gemfile.lock.backup

@@ -0,0 +1,167 @@
+PATH
+  remote: ../../../milia
+  specs:
+    milia (0.3.34)
+      devise (= 2.1.2)
+      rails (>= 3.2.9)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
+      mail (~> 2.4.4)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
+      builder (~> 3.0.0)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    ansi (1.3.0)
+    arel (3.0.2)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.4)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.2)
+    daemons (1.1.4)
+    devise (2.1.2)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    erubis (2.7.0)
+    eventmachine (0.12.10)
+    execjs (1.4.0)
+      multi_json (~> 1.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.3)
+    i18n (0.6.4)
+    journey (1.0.4)
+    jquery-rails (1.0.16)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.8.0)
+    libv8 (3.3.10.2)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.7.6)
+    orm_adapter (0.4.0)
+    pg (0.15.1)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
+      bundler (~> 1.0)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sass (3.2.9)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.1.2)
+    shoulda-matchers (2.1.0)
+      activesupport (>= 3.0.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    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)
+      rack (>= 1.0.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    turn (0.8.3)
+      ansi
+    tzinfo (0.3.37)
+    uglifier (1.0.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    warden (1.2.1)
+      rack (>= 1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-rails (> 3.2)
+  devise (>= 2.1.2)
+  execjs
+  factory_girl_rails (~> 1.2)
+  foreman
+  jquery-rails
+  milia!
+  pg
+  rails (= 3.2.11)
+  rdoc
+  sass-rails (> 3.2)
+  shoulda (= 3.5.0)
+  shoulda-context (~> 1.1.2)
+  shoulda-matchers (~> 2.1.0)
+  therubyracer
+  thin
+  turn
+  uglifier (>= 1.0.3)

data/test/rails_app/config/initializers/devise.rb

@@ -92,10 +92,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/test/rails_app/config/routes.rb

@@ -2,9 +2,7 @@ RailsApp::Application.routes.draw do
   root :to => "home#index"
   get "home/index"
 
-  devise_for :users do
-    post  "users" => "milia/registrations#create"
-  end
+  devise_for :users , :controllers => { :registrations => "milia/registrations" }
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

data/test/rails_app/db/migrate/20111012050340_devise_create_users.rb

@@ -1,15 +1,26 @@
 class DeviseCreateUsers < ActiveRecord::Migration
   def self.up
     create_table(:users) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
-
-      # t.encryptable
-      t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      t.token_authenticatable
+        t.string :email,              :null => false, :default => ""
+        t.string :encrypted_password, :null => false, :default => ""      
+        t.string   :reset_password_token
+        t.datetime :reset_password_sent_at
+        t.datetime :remember_created_at
+        t.integer  :sign_in_count, :default => 0
+        t.datetime :current_sign_in_at
+        t.datetime :last_sign_in_at
+        t.string   :current_sign_in_ip
+        t.string   :last_sign_in_ip
+        # t.string :password_salt  # t.encryptable
+         t.string   :confirmation_token
+         t.datetime :confirmed_at
+         t.datetime :confirmation_sent_at
+         t.string   :unconfirmed_email # Only if using reconfirmable
+        ## Lockable
+        # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+        # t.string   :unlock_token # Only if unlock strategy is :email or :both
+        # t.datetime :locked_at
+        t.string :authentication_token
 
       t.references  :tenant
       t.timestamps

data/test/rails_app/db/schema.rb

@@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
     t.integer  "tenant_id"
     t.integer  "user_id"
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "authors", ["tenant_id"], :name => "index_authors_on_tenant_id"
@@ -29,8 +29,8 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
     t.integer  "team_id"
     t.datetime "cal_start"
     t.datetime "cal_end"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "calendars", ["team_id"], :name => "index_calendars_on_team_id"
@@ -41,8 +41,8 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
     t.integer  "author_id"
     t.integer  "zine_id"
     t.string   "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "posts", ["author_id"], :name => "index_posts_on_author_id"
@@ -52,8 +52,8 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
   create_table "sessions", :force => true do |t|
     t.string   "session_id", :null => false
     t.text     "data"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
@@ -63,8 +63,8 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
     t.integer  "tenant_id"
     t.integer  "author_id"
     t.integer  "team_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "team_assets", ["author_id"], :name => "index_team_assets_on_author_id"
@@ -74,16 +74,16 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
   create_table "teams", :force => true do |t|
     t.integer  "tenant_id"
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "teams", ["tenant_id"], :name => "index_teams_on_tenant_id"
 
   create_table "tenants", :force => true do |t|
     t.integer  "tenant_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "tenants_users", :id => false, :force => true do |t|
@@ -95,12 +95,12 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
   add_index "tenants_users", ["user_id"], :name => "index_tenants_users_on_user_id"
 
   create_table "users", :force => true do |t|
-    t.string   "email",                                 :default => "", :null => false
-    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.string   "email",                  :default => "", :null => false
+    t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                         :default => 0
+    t.integer  "sign_in_count",          :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
@@ -108,10 +108,11 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
     t.string   "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
+    t.string   "unconfirmed_email"
     t.string   "authentication_token"
     t.integer  "tenant_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
   end
 
   add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true
@@ -122,8 +123,8 @@ ActiveRecord::Schema.define(:version => 20111013053403) do
   create_table "zines", :force => true do |t|
     t.integer  "tenant_id"
     t.integer  "calendar_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   add_index "zines", ["calendar_id"], :name => "index_zines_on_calendar_id"

data/test/rails_app/test/test_helper.rb

@@ -2,11 +2,6 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
-  # Shoulda looks for RAILS_ROOT before loading shoulda/rails, and Rails 3.1
-  # doesn't have that anymore.
-  
-require 'shoulda/rails'
-
 class ActiveSupport::TestCase
 
   class << self

data/test/rails_app/test/unit/post_test.rb

@@ -46,11 +46,13 @@ class PostTest < ActiveSupport::TestCase
     should "see jemell in two tenants with dif posts" do
        ActiveSupport::TestCase.set_tenant( @islesmile )
        assert_equal   1, @target.posts.size
-       assert_equal   'mellow_yellow', @target.posts.first.content.sub(/_\d+/,"")
+       assert         %w(wild_blue passion_pink mellow_yellow).include?( @target.posts.first.content.sub(/_\d+/,"") )
 
        ActiveSupport::TestCase.set_tenant( @mangoland )
        assert_equal   2, @target.posts.size
-       assert_equal   %w(mellow_yellow wild_blue), @target.posts.map{|p| p.content.sub(/_\d+/,"") }.sort
+       assert         @target.posts.all?{ |p| 
+          %w(wild_blue passion_pink mellow_yellow).include?( p.content.sub(/_\d+/,"") )
+       }
     end
 
     should "zoom get all team posts" do

data/test/rails_app/test/unit/tenant_test.rb

@@ -1,7 +1,28 @@
 require 'test_helper'
 
 class TenantTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
+
+
+  context "a user" do
+    
+    setup do
+      setup_world()
+      @user = Factory( :user )
+      @post = Factory( :post )
+      ActiveSupport::TestCase.reset_tenant()    # clear the tenant for testing
+    end
+
+        
+    should "exception if tenant is different" do
+      ActiveSupport::TestCase.reset_tenant
+      
+      assert_raise(::Milia::Control::InvalidTenantAccess,
+         "InvalidTenantAccess if tenants dont match"){
+         @post.update_attributes( :content => "duck walk" )
+      }
+    end    
+ 
+
+  end  # context
+
+end  # class test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 0.3.34
+  version: 0.3.38
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,7 @@ files:
 - test/rails_app/.gitignore
 - test/rails_app/Gemfile
 - test/rails_app/Gemfile.lock
+- test/rails_app/Gemfile.lock.backup
 - test/rails_app/Procfile
 - test/rails_app/README
 - test/rails_app/Rakefile
@@ -252,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 461924509
+      hash: 245221263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: