milia 0.3.17 → 0.3.18

data/VERSION

@@ -1 +1 @@
-0.3.17
+0.3.18

data/app/controllers/registrations_controller.rb

@@ -6,9 +6,6 @@ module Milia
 # ------------------------------------------------------------------------------
 # TODO: options if using recaptcha
 # TODO: options if non-standard path for new signups view
-# TODO: options if background task for tenant creation
-# TODO: options if 
-# TODO: options if 
 # ------------------------------------------------------------------------------
 # create -- intercept the POST create action upon new sign-up
 # new tenant account is vetted, then created, then proceed with devise create user
@@ -30,23 +27,22 @@ module Milia
             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])
+              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
+            end  # if..then..else for valid user creation
 
           else
-            @user = User.new(params[:user])
-            render 'home/new'
+            prep_signup_view( @tenant, params[:user] )
+            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"
-        # @user = User.new(params[:user])
-        # render 'home/new'
+        # prep_signup_view( params[:tenant], params[:user] )
+        # render :new
       # end
 
     end   # def create

data/milia.gemspec

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

data/test/rails_app/app/controllers/application_controller.rb

@@ -15,6 +15,36 @@ protected
   end
 
 
+# ------------------------------------------------------------------------------
+  # 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)
+    @user   = klass_option_obj( User, user )
+    @tenant = klass_option_obj( Tenant, tenant )
+    @eula   = Eula.get_latest.first
+  end
+
+# ------------------------------------------------------------------------------
+#
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
   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: &71751250 !ruby/object:Gem::Requirement
+  requirement: &76437900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *71751250
+  version_requirements: *76437900
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &71750560 !ruby/object:Gem::Requirement
+  requirement: &76437260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *71750560
+  version_requirements: *76437260
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &71749870 !ruby/object:Gem::Requirement
+  requirement: &76436570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71749870
+  version_requirements: *76436570
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &71749430 !ruby/object:Gem::Requirement
+  requirement: &76436120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71749430
+  version_requirements: *76436120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70804820 !ruby/object:Gem::Requirement
+  requirement: &75487870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70804820
+  version_requirements: *75487870
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70803630 !ruby/object:Gem::Requirement
+  requirement: &75487160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70803630
+  version_requirements: *75487160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70802920 !ruby/object:Gem::Requirement
+  requirement: &75486470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70802920
+  version_requirements: *75486470
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70801970 !ruby/object:Gem::Requirement
+  requirement: &75485420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70801970
+  version_requirements: *75485420
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70801450 !ruby/object:Gem::Requirement
+  requirement: &75484950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70801450
+  version_requirements: *75484950
 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: 463425869
+      hash: 179498849
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: