milia 1.2.1 → 1.3.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17d04a8171ccbdc169aa06e5f1d28c5e850c3e2
-  data.tar.gz: c5d93e06cbd053b83c4704ba0fabcd6b1c809c7e
+  metadata.gz: 9ed96e5afeb4152e44970a6664278b86cd09502a
+  data.tar.gz: 63c802985d9d2de9c28414ff75c953bac2367762
 SHA512:
-  metadata.gz: 76db8065475838404861cada72daaad22cd582c3233ff455ce411a3daf512de8bad59c71788684db5e6cb524758af7620d15013c7efe4df502b62811bc00b81a
-  data.tar.gz: 1fa75ebac26ede1a0f394e3fac189e20753af27bcd44d6247377856d1ab1838c4a6f10be693d091ac7a3698fb95cd80cad791a544fc13f0652e434313e424889
+  metadata.gz: d11276fda2e906bd83a3a0753c13191929e137e1cd8fee143561ec05ac7b2069d91314b341dea79e75758c482683648c6718af33e68cb94a1049f187d11eb922
+  data.tar.gz: 0f496a172b226040e8f8be3f04b371122219d175b67563328abd4d374899637ca0ded64bc0ee05b5314f40ff07f32cfd46534f7b38aef3ba6315aac9f531a5e9

data/app/controllers/confirmations_controller.rb

@@ -5,7 +5,7 @@ module Milia
 
   class ConfirmationsController < Devise::ConfirmationsController
 
-    skip_before_action :authenticate_tenant! 
+    skip_before_action :authenticate_tenant!
     before_action      :set_confirmable, :only => [ :update, :show ]
 
 
@@ -24,7 +24,7 @@ module Milia
         set_flash_message(:notice, :confirmed) if is_flashing_format?
           # sign in automatically
         sign_in_tenanted_and_redirect(resource)
-        
+
       else
         log_action( "invitee confirmation failed" )
         respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
@@ -41,11 +41,11 @@ module Milia
   # entered on new sign-ups and invite-members
   def show
     if @confirmable.new_record?  ||
-       !::Milia.use_invite_member || 
+       !::Milia.use_invite_member ||
        @confirmable.skip_confirm_change_password
 
       log_action( "devise pass-thru" )
-      super  # this will redirect 
+      super  # this will redirect
       if @confirmable.skip_confirm_change_password
         sign_in_tenanted(resource)
       end
@@ -56,7 +56,7 @@ module Milia
     # else fall thru to show template which is form to set a password
     # upon SUBMIT, processing will continue from update
   end
-  
+
   protected
 
   def set_confirmable()
@@ -80,7 +80,7 @@ module Milia
       "MILIA >>>>> [confirm user] #{action} - #{@confirmable.email}"
     ) unless logger.nil?
   end
-  
+
   # MILIA: adaptation of Devise method for multitenanting
       # Sign in a user
       def sign_in_tenanted(resource)
@@ -89,7 +89,7 @@ module Milia
         set_current_tenant
       end
 
-      # Sign in a user and tries to redirect 
+      # Sign in a user and tries to redirect
       def sign_in_tenanted_and_redirect(resource)
         sign_in_tenanted(resource)
         redirect_to after_sign_in_path_for(resource)

data/app/controllers/registrations_controller.rb

@@ -1,6 +1,6 @@
 module Milia
 
-  class RegistrationsController < Devise::RegistrationsController
+  class RegistrationsController < ::Devise::RegistrationsController
 
   skip_before_action :authenticate_tenant!, :only => [:new, :create, :cancel]
 
@@ -19,7 +19,7 @@ def create
   tenant_params = sign_up_params_tenant
   user_params   = sign_up_params_user
   coupon_params = sign_up_params_coupon
-  
+
   sign_out_session!
      # next two lines prep signup view parameters
   prep_signup_view( tenant_params, user_params, coupon_params )
@@ -27,10 +27,10 @@ def create
      # validate recaptcha first unless not enabled
   if !::Milia.use_recaptcha  ||  verify_recaptcha
 
-    Tenant.transaction  do 
+    Tenant.transaction  do
       @tenant = Tenant.create_new_tenant( tenant_params, user_params, coupon_params)
       if @tenant.errors.empty?   # tenant created
-        
+
         initiate_tenant( @tenant )    # first time stuff for new tenant
 
         devise_create( user_params )   # devise resource(user) creation; sets resource
@@ -43,7 +43,7 @@ def create
 
         else  # user creation failed; force tenant rollback
           log_action( "signup user create failed", resource )
-          raise ActiveRecord::Rollback   # force the tenant transaction to be rolled back  
+          raise ActiveRecord::Rollback   # force the tenant transaction to be rolled back
         end  # if..then..else for valid user creation
 
       else
@@ -53,7 +53,7 @@ def create
       end # if .. then .. else no tenant errors
 
     end  #  wrap tenant/user creation in a transaction
-        
+
   else
     flash[:error] = "Recaptcha codes didn't match; please try again"
        # all validation errors are passed when the sign_up form is re-rendered
@@ -70,12 +70,6 @@ end   # def create
 
   protected
 
-# ------------------------------------------------------------------------------
-# ------------------------------------------------------------------------------
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_up) + ::Milia.whitelist_user_params
-  end
- 
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
   def sign_up_params_tenant()
@@ -85,14 +79,14 @@ end   # def create
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
   def sign_up_params_user()
-    params.require(:user).permit( ::Milia.whitelist_user_params )
+    devise_parameter_sanitizer.sanitize(:sign_up)
   end
 
 # ------------------------------------------------------------------------------
 # sign_up_params_coupon -- permit coupon parameter if used; else params
 # ------------------------------------------------------------------------------
   def sign_up_params_coupon()
-    ( ::Milia.use_coupon ? 
+    ( ::Milia.use_coupon ?
       params.require(:coupon).permit( ::Milia.whitelist_coupon_params )  :
       params
     )
@@ -112,13 +106,13 @@ end   # def create
   def devise_create( user_params )
 
     build_resource(user_params)
-   
+
       # if we're using milia's invite_member helpers
     if ::Milia.use_invite_member
         # then flag for our confirmable that we won't need to set up a password
       resource.skip_confirm_change_password  = true
     end
- 
+
     if resource.save
       yield resource if block_given?
       log_action( "devise: signup user success", resource )
@@ -134,7 +128,7 @@ end   # def create
     else
       clean_up_passwords resource
       log_action( "devise: signup user failure", resource )
-      prep_signup_view(  @tenant, resource, params[:coupon] )   
+      prep_signup_view(  @tenant, resource, params[:coupon] )
       respond_with resource
     end
   end
@@ -161,10 +155,10 @@ end   # def create
       "MILIA >>>>> [register user/org] #{action} - #{err_msg}"
     ) unless logger.nil?
   end
- 
+
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
- 
+
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 

data/app/views/devise/registrations/new.html.haml

@@ -0,0 +1,53 @@
+%div.authform
+  %h1 Simple Milia App
+  .block#block-signup
+    %h2 New Organizational Sign up
+    .content
+      %span.description
+        %i
+          If you're a member of an existing group in our system,
+          click the activate link in the invitation email from your organization's admin.
+          You should not sign up for a new organizational account.
+          %br
+      .flash
+        - flash.each do |type, message|
+          %div{ :class => "message #{type}" }
+            %p= message
+      - flash.clear  # clear contents so we won't see it again
+
+      = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form" }) do |f|
+        = devise_error_messages!
+        .group
+          = f.label :email, :class => "label"
+          = f.text_field :email, :class => "text_field"
+          %span.description Ex. test@example.com
+        .group
+          = f.label :password, :class => "label"
+          = f.password_field :password, :class => "text_field"
+          %span.description must be at least 8 characters
+        .group
+          = f.label :password_confirmation, "Re-enter Password", :class => "label"
+          = f.password_field :password_confirmation, :class => "text_field"
+          %span.description to confirm your password
+
+        .group
+          = fields_for( :tenant ) do |w|
+            = w.label( :name, 'Organization', :class => "label" )
+            = w.text_field( :name, :class => "text_field")
+            %span.description unique name for your group or organization for the new account
+
+          - if ::Milia.use_coupon
+            - @coupon ||= {}
+            .group
+              = label_tag( 'coupon', 'Coupon code', :class => "label" )
+              = text_field_tag( "coupon[coupon]", @coupon['coupon'].to_s, :size => 8, :class => "text_field" )
+              %span.description optional promotional code, if any
+
+          - if ::Milia.use_recaptcha
+            = recaptcha_tags( :display => { :theme => 'clean', :tabindex => 0 } )
+
+        .group.navform.wat-cf
+          %button.button{ :type => "submit" }
+            Sign up
+      = render :partial => "devise/shared/links"
+

data/lib/generators/milia/install_generator.rb

@@ -3,18 +3,19 @@ require 'rails/generators/base'
 module Milia
   module Generators
 # *************************************************************
-    
+
     class InstallGenerator < Rails::Generators::Base
       desc "Full installation of milia with devise"
 
       source_root File.expand_path("../templates", __FILE__)
-  
+
       class_option :use_airbrake, :type => :boolean, :default => false, :desc => 'Use this option to add airbrake exception handling capabilities'
-      class_option :skip_recaptcha, :type => :boolean, :default => false, :desc => 'Use this option to skip adding recaptcha for sign ups'
+      class_option :skip_recaptcha, :type => :boolean, :default => true, :desc => 'Use this option to skip adding recaptcha for sign ups'
       class_option :skip_invite_member, :type => :boolean, :default => false, :desc => 'Use this option to skip adding invite_member capabilities'
       class_option :skip_env_email_setup, :type => :boolean, :default => false, :desc => 'Use this option to skip adding smtp email info to config/environments/*'
       class_option :org_email, :type => :string, :default => "my-email@my-domain.com", :desc => 'define the organizational email from address'
-       
+      class_option :skip_devise_generators, :type => :boolean, :default => false, :desc => 'skip execution of devise generators (if this has already been done previously)'
+
 # -------------------------------------------------------------
 # -------------------------------------------------------------
   def check_requirements()
@@ -34,7 +35,7 @@ module Milia
   # replaced it with the "run_bundle" method below
 # -------------------------------------------------------------
       def setup_initial_stuff
-
+        copy_file 'devise_permitted_parameters.rb', 'config/initializers/devise_permitted_parameters.rb'
         template 'initializer.rb', 'config/initializers/milia.rb'
 
          unless options.skip_recaptcha
@@ -45,15 +46,17 @@ module Milia
          end
 
          gem 'activerecord-session_store', github: 'rails/activerecord-session_store'
-         
+
          run_bundle
       end
 
 # -------------------------------------------------------------
 # -------------------------------------------------------------
       def setup_devise
-        generate "devise:install"
-        generate "devise", "user"
+        unless options.skip_devise_generators
+          generate "devise:install"
+          generate "devise", "user"
+        end
         gsub_file "app/models/user.rb", /,\s*$/, ", :confirmable,"
 
         migrate_user_file = find_or_fail("db/migrate/[0-9]*_devise_create_users.rb")
@@ -71,7 +74,11 @@ module Milia
 # -------------------------------------------------------------
      def setup_milia
 
-       unless false    # future skip block?? 
+       unless false    # future skip block??
+         inject_into_file "app/controllers/application_controller.rb",
+                          after: "protect_from_forgery with: :exception\n" do
+           snippet_app_ctlr_header
+         end
 
          route  snippet_routes_root_path
 
@@ -80,30 +87,25 @@ module Milia
          generate "model", "tenant tenant:references name:string:index"
          generate "migration", "CreateTenantsUsersJoinTable tenants users"
 
-         inject_into_file "app/controllers/application_controller.rb",
-           after: "protect_from_forgery with: :exception\n" do 
-           snippet_app_ctlr_header
-         end
-
-         inject_into_class "app/controllers/home_controller.rb", HomeController do 
+         inject_into_class "app/controllers/home_controller.rb", HomeController do
             snippet_home_ctlr_header
          end
 
          join_file = find_or_fail("db/migrate/[0-9]*_create_tenants_users_join_table.rb")
-         uncomment_lines join_file, ":tenant_id, :user_id" 
+         uncomment_lines join_file, ":tenant_id, :user_id"
 
-         gsub_file "config/routes.rb", "devise_for :users"  do 
+         gsub_file "config/routes.rb", "devise_for :users"  do
            snippet_routes_devise
          end
 
          inject_into_file "app/models/user.rb",
-           after: ":recoverable, :rememberable, :trackable, :validatable\n" do 
+           after: ":recoverable, :rememberable, :trackable, :validatable\n" do
            snippet_model_user_determines_account
          end
 
          gsub_file "app/models/tenant.rb", /belongs_to \:tenant/, ' '
 
-         inject_into_class "app/models/tenant.rb", Tenant do 
+         inject_into_class "app/models/tenant.rb", Tenant do
             snippet_model_tenant_determines_tenant
          end
 
@@ -117,29 +119,30 @@ module Milia
          generate "resource", "member tenant:references user:references first_name:string last_name:string"
 
          inject_into_file "app/models/tenant.rb",
-           after: "acts_as_universal_and_determines_tenant\n" do 
+           after: "acts_as_universal_and_determines_tenant\n" do
               snippet_add_assoc_to_tenant
          end
 
          uncomment_lines "app/models/tenant.rb", "create_org_admin"
 
          inject_into_file "app/models/user.rb",
-           after: "acts_as_universal_and_determines_account\n" do 
+           after: "acts_as_universal_and_determines_account\n" do
              snippet_add_member_assoc_to_user
          end
 
          gsub_file "app/models/member.rb", /belongs_to \:tenant/, ' '
 
          inject_into_file "app/models/member.rb",
-           after: "belongs_to :user\n" do 
+           after: "belongs_to :user\n" do
             snippet_fill_out_member
          end
 
-         inject_into_class "app/controllers/members_controller.rb", MembersController do 
+         inject_into_class "app/controllers/members_controller.rb", MembersController do
             snippet_fill_member_ctlr
          end
 
          directory File.expand_path('../../../../app/views/members', __FILE__), "app/views/members"
+         directory File.expand_path('../../../../app/views/devise/registrations', __FILE__), "app/views/devise/registrations"
 
 
        end  # skip any member expansion
@@ -150,20 +153,20 @@ module Milia
   def setup_environments
 
     unless options.skip_env_email_setup
-      
-      environment nil, env: :development do 
+
+      environment nil, env: :development do
         snippet_env_dev
       end  # do dev environment
 
-      environment nil, env: :production do 
+      environment nil, env: :production do
         snippet_env_prod
       end  # do production environment
 
-      environment nil, env: :test do 
+      environment nil, env: :test do
         snippet_env_test
       end  # do test environment
 
-      environment  do 
+      environment  do
         snippet_config_application
       end  # do config_application
 
@@ -191,16 +194,16 @@ private
 # -------------------------------------------------------------
   def find_or_fail( filename )
     user_file = Dir.glob(filename).first
-    if user_file.blank? 
+    if user_file.blank?
       say_status("error", "file: '#{filename}' not found", :red)
-      raise Thor::Error, "************  terminating generator due to file error!  *************" 
+      raise Thor::Error, "************  terminating generator due to file error!  *************"
     end
     return user_file
   end
-  
+
 # -------------------------------------------------------------
 # -------------------------------------------------------------
-  
+
 # *************************************************************
 # ******  SNIPPET SECTION  ************************************
 # *************************************************************
@@ -501,8 +504,8 @@ protected
       gem_msg = `bundle list #{gem_name}`
       if /Could not find gem/i =~ gem_msg
         say_status(
-            "error", 
-            "gemfile not found: #{gem_name} is required", 
+            "error",
+            "gemfile not found: #{gem_name} is required",
             alert_color
         )
         need_fail = true
@@ -514,28 +517,28 @@ protected
       say("-   add required gems to Gemfile; then run bundle install", alert_color)
       say("-   then retry rails g milia:install", alert_color)
       say("-------------------------------------------------------------------------", alert_color)
-      raise Thor::Error, "************  terminating generator due to missing requirements!  *************" 
+      raise Thor::Error, "************  terminating generator due to missing requirements!  *************"
     end  # need to fail
-    
+
   end
- 
+
 # -------------------------------------------------------------
 # -------------------------------------------------------------
   def file_find_or_fail( filename )
     user_file = Dir.glob(filename).first
-    if user_file.blank? 
+    if user_file.blank?
       alert_color = :red
       say("-------------------------------------------------------------------------", alert_color)
       say_status("error", "file: '#{filename}' not found", alert_color)
       say("-   first run  $ rails g milia:install", alert_color)
       say("-   then retry $ rails g web_app_theme:milia", alert_color)
       say("-------------------------------------------------------------------------", alert_color)
- 
-      raise Thor::Error, "************  terminating generator due to file error!  *************" 
+
+      raise Thor::Error, "************  terminating generator due to file error!  *************"
     end
     return user_file
   end
-   
+
 # -------------------------------------------------------------
 # -------------------------------------------------------------