milia 0.3.16 → 0.3.17

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/app/controllers/registrations_controller.rb

@@ -21,23 +21,27 @@ module Milia
 
       # if verify_recaptcha  # ?? does this need: :model => resource ??
 
-        @tenant = Tenant.create_new_tenant(params)
-        if @tenant.errors.empty?   # tenant created
-          
-          initiate_tenant( @tenant )    # first time stuff for new tenant
-          super   # devise resource(user) creation; sets resource
+        Tenant.transaction  do 
+          @tenant = Tenant.create_new_tenant(params)
+          if @tenant.errors.empty?   # tenant created
+            
+            initiate_tenant( @tenant )    # first time stuff for new tenant
+
+            super   # devise resource(user) creation; sets resource
+
+            if resource.errors.empty?
+              StartupJob.queue_startup(@tenant, resource, params[:coupon])
+              # w/o background task:  Tenant.tenant_signup(resource, @tenant,params[:coupon])
+            else  # user creation failed; force tenant rollback
+              raise ActiveRecord::Rollback   # force the tenant transaction to be rolled back  
+            end
 
-          if resource.errors.empty?
-            # w/o background task:  Tenant.tenant_signup(resource, @tenant,params[:coupon])
-            StartupJob.queue_startup(@tenant, resource, params[:coupon])
           else
-            @tenant.destroy   # remove the newly created tenant item before retrying
-          end
+            @user = User.new(params[:user])
+            render 'home/new'
+          end # if .. then .. else no tenant errors
 
-        else
-          @user = User.new(params[:user])
-          render 'home/new'
-        end
+        end  #  wrap tenant/user creation in a transaction
             
       # else
         # flash[:error] = "Recaptcha code error; please re-enter the code and click submit again"

data/milia.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Anderson"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &81202850 !ruby/object:Gem::Requirement
+  requirement: &71751250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *81202850
+  version_requirements: *71751250
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &81202130 !ruby/object:Gem::Requirement
+  requirement: &71750560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *81202130
+  version_requirements: *71750560
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &81201480 !ruby/object:Gem::Requirement
+  requirement: &71749870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81201480
+  version_requirements: *71749870
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &81201070 !ruby/object:Gem::Requirement
+  requirement: &71749430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81201070
+  version_requirements: *71749430
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80043210 !ruby/object:Gem::Requirement
+  requirement: &70804820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *80043210
+  version_requirements: *70804820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &80040820 !ruby/object:Gem::Requirement
+  requirement: &70803630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *80040820
+  version_requirements: *70803630
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &80040180 !ruby/object:Gem::Requirement
+  requirement: &70802920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80040180
+  version_requirements: *70802920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &80039330 !ruby/object:Gem::Requirement
+  requirement: &70801970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80039330
+  version_requirements: *70801970
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &80038590 !ruby/object:Gem::Requirement
+  requirement: &70801450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80038590
+  version_requirements: *70801450
 description: Transparent Multi-tenanting for hosted Rails 3.1+/Ruby 1.9.2 applications
 email: dsaronin@gmail.com
 executables: []
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 551322333
+      hash: 463425869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: