milia 0.3.22 → 0.3.23

data/VERSION

@@ -1 +1 @@
-0.3.22
+0.3.23

data/app/controllers/registrations_controller.rb

@@ -14,40 +14,40 @@ module Milia
 # CALLBACK: Tenant.create_new_tenant  -- prior to completing user account
 # CALLBACK: Tenant.tenant_signup      -- after completing user account
 # ------------------------------------------------------------------------------
-    def create
-      
-      sign_out_session!
-
-      # if verify_recaptcha  # ?? does this need: :model => resource ??
+def create
+  
+  sign_out_session!
 
-      Tenant.transaction  do 
-        @tenant = Tenant.create_new_tenant(params)
-        if @tenant.errors.empty?   # tenant created
-          
-          initiate_tenant( @tenant )    # first time stuff for new tenant
+  if verify_recaptcha  # ?? does this need: :model => resource ??
 
-          devise_create   # 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
 
-          if resource.errors.empty?
-            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..then..else for valid user creation
+        devise_create   # devise resource(user) creation; sets resource
 
-        else
-          prep_signup_view( @tenant, params[:user] )
-          render :new
-        end # if .. then .. else no tenant errors
+        if resource.errors.empty?
+          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..then..else for valid user creation
 
-      end  #  wrap tenant/user creation in a transaction
-          
-      # else
-        # flash[:error] = "Recaptcha code error; please re-enter the code and click submit again"
-        # prep_signup_view( params[:tenant], params[:user] )
-        # render :new
-      # end
+      else
+        prep_signup_view( @tenant, params[:user] , params[:coupon])
+        render :new
+      end # if .. then .. else no tenant errors
+
+    end  #  wrap tenant/user creation in a transaction
+        
+  else
+    flash[:error] = "Recaptcha code error; please re-enter the code and click submit again"
+    prep_signup_view( params[:tenant], params[:user], params[:coupon] )
+    render :new
+  end
 
-    end   # def create
+end   # def create
 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
@@ -87,7 +87,7 @@ module Milia
 # ------------------------------------------------------------------------------
   def prep_devise_new_view( tenant, resource )
     clean_up_passwords(resource)
-    prep_signup_view( tenant, resource )   # PUNDA special addition
+    prep_signup_view( tenant, resource, params[:coupon] )   # PUNDA special addition
     respond_with_navigational(resource) { render_with_scope :new }
   end
   

data/milia.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.3.22"
+  s.version = "0.3.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Anderson"]
-  s.date = "2011-12-10"
+  s.date = "2011-12-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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000 Z
+date: 2011-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &73680450 !ruby/object:Gem::Requirement
+  requirement: &70468040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *73680450
+  version_requirements: *70468040
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &73679810 !ruby/object:Gem::Requirement
+  requirement: &70467390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *73679810
+  version_requirements: *70467390
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &73679170 !ruby/object:Gem::Requirement
+  requirement: &70466650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73679170
+  version_requirements: *70466650
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &73678710 !ruby/object:Gem::Requirement
+  requirement: &70466260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73678710
+  version_requirements: *70466260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72733660 !ruby/object:Gem::Requirement
+  requirement: &69518730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *72733660
+  version_requirements: *69518730
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72731710 !ruby/object:Gem::Requirement
+  requirement: &69517570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *72731710
+  version_requirements: *69517570
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &72730370 !ruby/object:Gem::Requirement
+  requirement: &69516900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72730370
+  version_requirements: *69516900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72729560 !ruby/object:Gem::Requirement
+  requirement: &69515920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72729560
+  version_requirements: *69515920
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &72728570 !ruby/object:Gem::Requirement
+  requirement: &69515370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72728570
+  version_requirements: *69515370
 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: 838824051
+      hash: -849811027
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: