milia 0.3.20 → 0.3.21

data/VERSION

@@ -1 +1 @@
-0.3.20
+0.3.21

data/app/controllers/registrations_controller.rb

@@ -24,13 +24,11 @@ module Milia
           
           initiate_tenant( @tenant )    # first time stuff for new tenant
 
-          super   # devise resource(user) creation; sets resource
+          devise_create   # devise resource(user) creation; sets resource
 
           if resource.errors.empty?
             Tenant.tenant_signup(resource, @tenant, params[:coupon])
           else  # user creation failed; force tenant rollback
-            prep_signup_view( @tenant, resource )
-            render :new
             raise ActiveRecord::Rollback   # force the tenant transaction to be rolled back  
           end  # if..then..else for valid user creation
 
@@ -60,6 +58,37 @@ module Milia
       Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name) if user_signed_in?
     end
 
+# ------------------------------------------------------------------------------
+# devise_create -- duplicate of Devise::RegistrationsController
+    # same as in devise gem EXCEPT need to prep signup form variables
+# ------------------------------------------------------------------------------
+  def devise_create
+    build_resource
+
+    if resource.save
+      if resource.active_for_authentication?
+        set_flash_message :notice, :signed_up if is_navigational_format?
+        sign_in(resource_name, resource)
+        respond_with resource, :location => after_sign_up_path_for(resource)
+      else
+        set_flash_message :notice, :inactive_signed_up, :reason => inactive_reason(resource) if is_navigational_format?
+        expire_session_data_after_sign_in!
+        respond_with resource, :location => after_inactive_sign_up_path_for(resource)
+      end
+    else  # resource had errors ...
+      prep_devise_new_view( @tenant, resource )
+    end
+  end
+
+# ------------------------------------------------------------------------------
+  # prep_devise_new_view -- common code to prep for another go at the signup form
+# ------------------------------------------------------------------------------
+  def prep_devise_new_view( tenant, resource )
+    clean_up_passwords(resource)
+    prep_signup_view( tenant, resource )   # PUNDA special addition
+    respond_with_navigational(resource) { render_with_scope :new }
+  end
+  
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 

data/milia.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "milia"
-  s.version = "0.3.20"
+  s.version = "0.3.21"
 
   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.20
+  version: 0.3.21
   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: &77498190 !ruby/object:Gem::Requirement
+  requirement: &71038820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *77498190
+  version_requirements: *71038820
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &77497520 !ruby/object:Gem::Requirement
+  requirement: &71038180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *77497520
+  version_requirements: *71038180
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &77496800 !ruby/object:Gem::Requirement
+  requirement: &71037560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77496800
+  version_requirements: *71037560
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77496450 !ruby/object:Gem::Requirement
+  requirement: &71037020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77496450
+  version_requirements: *71037020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76491750 !ruby/object:Gem::Requirement
+  requirement: &70088640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *76491750
+  version_requirements: *70088640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76489420 !ruby/object:Gem::Requirement
+  requirement: &70086990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *76489420
+  version_requirements: *70086990
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &76488800 !ruby/object:Gem::Requirement
+  requirement: &70086300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76488800
+  version_requirements: *70086300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &76487930 !ruby/object:Gem::Requirement
+  requirement: &70085360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76487930
+  version_requirements: *70085360
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &76487200 !ruby/object:Gem::Requirement
+  requirement: &70084750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76487200
+  version_requirements: *70084750
 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: 821158829
+      hash: -460538509
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: