thredded_create_app 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18869fd3be69b970328dea05718efa3e89da02c61692b8b76fe8cb3f65ef9b4
-  data.tar.gz: 6a36d2746531f37b7e4f33fc99118cd6661b429e218a7cdd1218cc44461c43c6
+  metadata.gz: 430f66d017397f54efe538a5e76d36c41d29652638f1d26e12d6a3a38d2dadf0
+  data.tar.gz: 700e31ea5dc7eea339eab91a27a9b4e325c68f42a3177c394a3451ab1272ce24
 SHA512:
-  metadata.gz: 836abf0e71ec67aab2ab51b9859f3670bb1a8f51145e78743e8c15c734a5e53f0fc9c7abaef2872c36b716a370d1a580c4c2139146e0e5284818a38b918acb12
-  data.tar.gz: 1962f34cd78eef86a40cf7cc044808150675ba849068208ca08c8e106f4eeec0ca1a2015c1ba01ddf16d1a950235f743d64626aea12241559c9331896ab92874
+  metadata.gz: 13e718573d7b06d1e2fea2187d6e0ce2a1ac60bfc9ae19d5fd48f7d4d0c81ec2029957b4bf4c21dc2efbc7aaea7bceb8105166d0c8425fb5de469bc3eb6c0410
+  data.tar.gz: ae9bc03d56d750a1e50b1e86c45950cf7a89241126a6dad6cbe9d41ddaf991d705e8867b8c73e4bd264471efeec093d37d255c7d0841dd1f9783754bcdcfb17a

data/lib/thredded_create_app/generator.rb

@@ -11,6 +11,7 @@ require 'thredded_create_app/tasks/add_roadie'
 require 'thredded_create_app/tasks/add_rails_email_preview'
 require 'thredded_create_app/tasks/add_thredded'
 require 'thredded_create_app/tasks/add_display_name_to_users'
+require 'thredded_create_app/tasks/add_invisible_captcha'
 require 'thredded_create_app/tasks/setup_database'
 require 'thredded_create_app/tasks/setup_app_skeleton'
 require 'thredded_create_app/tasks/production_configs'
@@ -71,6 +72,7 @@ module ThreddedCreateApp
         Tasks::AddRoadie,
         Tasks::AddThredded,
         Tasks::AddDisplayNameToUsers,
+        Tasks::AddInvisibleCaptcha,
         Tasks::SetupAppSkeleton,
         Tasks::ProductionConfigs,
         Tasks::AddMemcachedSupport,

data/lib/thredded_create_app/tasks/add_devise.rb

@@ -4,6 +4,11 @@ require 'thredded_create_app/tasks/base'
 module ThreddedCreateApp
   module Tasks
     class AddDevise < Base
+      def initialize(simple_form: true, **args)
+        super
+        @simple_form = simple_form
+      end
+
       def summary
         'Add devise with I18n and configure a User model'
       end
@@ -65,6 +70,8 @@ module ThreddedCreateApp
       end
 
       def setup_controllers
+        copy 'add_devise/registrations_controller.rb',
+             'app/controllers/users/registrations_controller.rb'
         copy 'add_devise/sessions_controller.rb',
              'app/controllers/users/sessions_controller.rb'
         replace 'config/routes.rb',
@@ -73,6 +80,7 @@ module ThreddedCreateApp
                   devise_for :users,
                              skip: %i[sessions],
                              controllers: {
+                               registrations: 'users/registrations',
                                sessions: 'users/sessions',
                              },
                              path_names: { sign_up: 'register' }
@@ -95,9 +103,20 @@ module ThreddedCreateApp
                 ', :back %>', ', back_url %>'
         # Remove "Password confirmation" from sign up.
         # See https://github.com/plataformatec/devise/wiki/Disable-password-confirmation-during-registration
+        password_field =
+          if @simple_form
+            "    <%= f.input :password_confirmation, required: true %>\n"
+          else
+            <<-ERB
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "off" %>
+  </div>
+
+            ERB
+          end
         replace 'app/views/devise/registrations/new.html.erb',
-                "    <%= f.input :password_confirmation, required: true %>\n",
-                ''
+                password_field, ''
       end
 
       def setup_emails

data/lib/thredded_create_app/tasks/add_devise/registrations_controller.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Users
+  class RegistrationsController < ::Devise::RegistrationsController
+  end
+end

data/lib/thredded_create_app/tasks/add_display_name_to_users.rb

@@ -109,7 +109,7 @@ module ThreddedCreateApp
 
       def simple_form_input_html(autofocus)
         <<-HTML
-  <%= f.input :display_name, required: true#{', autofocus: true' if autofocus} %>
+    <%= f.input :display_name, required: true#{', autofocus: true' if autofocus} %>
         HTML
       end
 

data/lib/thredded_create_app/tasks/add_invisible_captcha.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'thredded_create_app/tasks/base'
+module ThreddedCreateApp
+  module Tasks
+    class AddInvisibleCaptcha < Base
+      def initialize(simple_form: true, **_args)
+        super
+        @simple_form = simple_form
+      end
+
+      def summary
+        'Add an invisible captcha to the sign up form'
+      end
+
+      def before_bundle
+        add_gem 'invisible_captcha'
+      end
+
+      def after_bundle
+        inject_into_file 'app/controllers/users/registrations_controller.rb',
+                         after: "::Devise::RegistrationsController\n",
+                         content: <<-RUBY
+    invisible_captcha only: %i[create], honeypot: :name
+        RUBY
+
+        form_view_path = 'app/views/devise/registrations/new.html.erb'
+        form_view_captcha = '<%= invisible_captcha :name %>'
+        if @simple_form
+          inject_into_file form_view_path,
+                           after: %(<div class="form-inputs">\n),
+                           content: "    #{form_view_captcha}\n"
+        else
+          inject_into_file form_view_path,
+                           after: %(error_messages! %>\n\n),
+                           content: "  #{form_view_captcha}\n\n"
+        end
+        inject_into_file form_view_path,
+                         before: ') do |f|',
+                         content: ", html: {autocomplete: 'off'}"
+
+        git_commit 'Add invisible_captcha to the sign up form'
+      end
+    end
+  end
+end

data/lib/thredded_create_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThreddedCreateApp
-  VERSION = '0.1.24'
+  VERSION = '0.1.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -131,10 +131,12 @@ files:
 - lib/thredded_create_app/generator.rb
 - lib/thredded_create_app/logging.rb
 - lib/thredded_create_app/tasks/add_devise.rb
+- lib/thredded_create_app/tasks/add_devise/registrations_controller.rb
 - lib/thredded_create_app/tasks/add_devise/sessions_controller.rb
 - lib/thredded_create_app/tasks/add_devise/spec/features/devise_spec.rb
 - lib/thredded_create_app/tasks/add_display_name_to_users.rb
 - lib/thredded_create_app/tasks/add_display_name_to_users/add_display_name_to_users.rb.erb
+- lib/thredded_create_app/tasks/add_invisible_captcha.rb
 - lib/thredded_create_app/tasks/add_jquery.rb
 - lib/thredded_create_app/tasks/add_memcached_support.rb
 - lib/thredded_create_app/tasks/add_rails_config.rb