milia 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,42 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1)
-      actionpack (= 3.1.1)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
       mail (~> 2.3.0)
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
+      rack (~> 1.3.5)
       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)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-    activesupport (3.1.1)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
-    ansi (1.3.0)
+    ansi (1.4.1)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    devise (1.4.9)
+    devise (1.5.1)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
+      warden (~> 1.1)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.1)
@@ -64,17 +64,17 @@ GEM
       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)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.1.1)
-    railties (3.1.1)
-      actionpack (= 3.1.1)
-      activesupport (= 3.1.1)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -95,8 +95,8 @@ GEM
       polyglot (>= 0.3.1)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.30)
-    warden (1.0.6)
+    tzinfo (0.3.31)
+    warden (1.1.0)
       rack (>= 1.0)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/app/controllers/registrations_controller.rb

@@ -8,6 +8,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
+# CALLBACK: Tenant.create_new_tenant  -- prior to completing user account
+# CALLBACK: Tenant.tenant_signup      -- after completing user account
 # ------------------------------------------------------------------------------
     def create
       
@@ -18,6 +20,13 @@ module Milia
         
         initiate_tenant( @tenant )    # first time stuff for new tenant
         super   # do the rest of the user account creation
+        
+        if user_signed_in?
+          Tenant.tenant_signup(current_user,@tenant,params[:coupon])
+        else
+          puts ">>>>>>>>>>>>> [milia create] false assumption that user signed in upon new registrations <<<<<<<<<<<<"
+          raise RuntimeError, "Milia false assumption in reg_ctlr#create"
+        end
       
       else
         @user = User.new(params[:user])

data/lib/milia/base.rb

@@ -100,17 +100,50 @@ module Milia
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
   def acts_as_universal_and_determines_tenant()
-        has_and_belongs_to_many :users
+    has_and_belongs_to_many :users
 
-        acts_as_universal()
-        
-        before_destroy do |old_tenant|
-          old_tenant.users.clear  # remove all users from this tenant
-          true
-        end # before_destroy do
-        
+    acts_as_universal()
+    
+    before_destroy do |old_tenant|
+      old_tenant.users.clear  # remove all users from this tenant
+      true
+    end # before_destroy do
   end
 
+# ------------------------------------------------------------------------
+# current_tenant -- returns tenant obj for current tenant
+# ------------------------------------------------------------------------
+  def current_tenant()
+    return Tenant.find( Thread.current[:tenant_id] )
+  end
+    
+# ------------------------------------------------------------------------
+# current_tenant_id -- returns tenant_id for current tenant
+# ------------------------------------------------------------------------
+  def current_tenant_id()
+    return Thread.current[:tenant_id]
+  end
+  
+# ------------------------------------------------------------------------
+# set_current_tenant -- model-level ability to set the current tenant
+# NOTE: *USE WITH CAUTION* normally this should *NEVER* be done from
+# the models ... it's only useful and safe WHEN performed at the start
+# of a background job (DelayedJob#perform)
+# ------------------------------------------------------------------------
+  def set_current_tenant( tenant )
+      # able to handle tenant obj or tenant_id
+    case tenant
+      when Tenant then tenant_id = tenant.id
+      when Integer then tenant_id = tenant
+      else
+        raise ArgumentError, "invalid tenant object or id"
+    end  # case
+    
+    Thread.current[:tenant_id] = tenant_id
+  end
+# ------------------------------------------------------------------------
+# ------------------------------------------------------------------------
+ 
 # ------------------------------------------------------------------------
 # where_restrict_tenant -- gens tenant restrictive where clause for each klass
 # NOTE: subordinate join tables will not get the default scope by Rails
@@ -137,4 +170,4 @@ module Milia
 # #############################################################################
     
   end  # module Base
-end  # module Milia
+end  # module Milia

data/milia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Anderson"]
-  s.date = "2011-11-05"
+  s.date = "2011-11-24"
   s.description = "Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications"
   s.email = "dsaronin@gmail.com"
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/milia/railtie.rb",
     "lib/milia/tasks.rb",
     "milia.gemspec",
+    "pkg/milia-0.3.8.gem",
     "test/helper.rb",
     "test/rails_app/.gitignore",
     "test/rails_app/Gemfile",

data/test/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../milia
   specs:
-    milia (0.3.6)
+    milia (0.3.7)
       devise (>= 1.4.8)
       rails (>= 3.1)
 

data/test/rails_app/config/environments/test.rb

@@ -27,7 +27,7 @@ RailsApp::Application.configure do
 #  config.logger = Logger.new(STDOUT)
   config.log_level = :debug
   config.assets.logger = nil
-  config.active_record.logger = Logger.new(STDOUT)
+#  config.active_record.logger = Logger.new(STDOUT)
 
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false

data/test/rails_app/test/factories/units_factory.rb

@@ -76,7 +76,7 @@ FactoryGirl.define do |binding|
   
   factory :post do |f|
     f.tenant_id   binding.current_tenant
-    f.sequence( :content ) {|n| CONTENT[n % 3] + n.to_s }
+    f.sequence( :content ) {|n| CONTENT[n % 3] + "_#{n}" }
     f.association :author
     f.association :zine
   end

data/test/rails_app/test/test_helper.rb

@@ -85,8 +85,8 @@ class ActiveSupport::TestCase
         user = Factory(:user)
         
         if (w.zero? && i == 2) # special case for multiple tenants
-          @jemell = user    # jemell will be in two different tenants
-          setup_author_posts(@jemell,1,1)
+          @target = user    # jemell will be in two different tenants
+          setup_author_posts(@target,1,1)
         end
         
           # create extra authors w/o associated user
@@ -98,9 +98,9 @@ class ActiveSupport::TestCase
       end   # users, authors, posts
       
 # pick a user and put in multiple tenants
-      if (!@jemell.nil? && w == 2)   # last world
-        world.users << @jemell    # add to current tenant users
-        setup_author_posts(@jemell,0,0)
+      if (!@target.nil? && w == 2)   # last world
+        world.users << @target    # add to current tenant users
+        setup_author_posts(@target,0,0)
       end
       
     end  # setup each world

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

@@ -32,7 +32,8 @@ class PostTest < ActiveSupport::TestCase
   
    should "get only author posts in mangoland" do
      ActiveSupport::TestCase.set_tenant( @mangoland )
-     x = Author.all[1]  # pick an author
+     x = Author.all.detect{|a| !a.user.nil? }  # pick an author
+     assert x
      assert_equal 1, x.posts.size
    end
 
@@ -43,10 +44,13 @@ class PostTest < ActiveSupport::TestCase
     end
   
     should "see jemell in two tenants with dif posts" do
-       ActiveSupport::TestCase.set_tenant( @mangoland )
-       assert_equal   2, @jemell.posts.size
        ActiveSupport::TestCase.set_tenant( @islesmile )
-       assert_equal   1, @jemell.posts.size
+       assert_equal   1, @target.posts.size
+       assert_equal   'mellow_yellow', @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
     end
 
     should "zoom get all team posts" do
@@ -55,6 +59,19 @@ class PostTest < ActiveSupport::TestCase
       assert_equal  3,list.size
     end
     
+    should "exception if tenant not set up yet" do
+      ActiveSupport::TestCase.void_tenant
+      assert_raise(ActiveRecord::RecordNotFound,"should RecordNotFound if world incorrect"){Post.find( @post.id )}
+    end    
+    
+    should "exception if tenant different" do
+      ActiveSupport::TestCase.set_tenant( @mangoland )
+      assert_raise(ActiveRecord::RecordNotFound,"should RecordNotFound if world incorrect"){Post.find( @post.id )}
+    end    
+    
+    
+    
+    
   end   # context post
 
 # _____________________________________________________________________________    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &73897630 !ruby/object:Gem::Requirement
+  requirement: &75971770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *73897630
+  version_requirements: *75971770
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &73896940 !ruby/object:Gem::Requirement
+  requirement: &75971150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *73896940
+  version_requirements: *75971150
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &73896110 !ruby/object:Gem::Requirement
+  requirement: &75970060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73896110
+  version_requirements: *75970060
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &73894450 !ruby/object:Gem::Requirement
+  requirement: &75967630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73894450
+  version_requirements: *75967630
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &73910280 !ruby/object:Gem::Requirement
+  requirement: &75966580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *73910280
+  version_requirements: *75966580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &73909880 !ruby/object:Gem::Requirement
+  requirement: &75965900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *73909880
+  version_requirements: *75965900
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &73909540 !ruby/object:Gem::Requirement
+  requirement: &75965430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73909540
+  version_requirements: *75965430
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73909030 !ruby/object:Gem::Requirement
+  requirement: &75964970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73909030
+  version_requirements: *75964970
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &73908220 !ruby/object:Gem::Requirement
+  requirement: &75996480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73908220
+  version_requirements: *75996480
 description: Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications
 email: dsaronin@gmail.com
 executables: []
@@ -135,6 +135,7 @@ files:
 - lib/milia/railtie.rb
 - lib/milia/tasks.rb
 - milia.gemspec
+- pkg/milia-0.3.8.gem
 - test/helper.rb
 - test/rails_app/.gitignore
 - test/rails_app/Gemfile
@@ -237,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -201367885
+      hash: -965767377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: