thredded_create_app 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c12dd584a928b7cc88c5bbbf4c043dcef538409afbb9436c24d5eb5b02763cf1
-  data.tar.gz: 8d3247f7baffe0d92c9f1647fe3547195b207954bafaf493d55c9fbf7f4c0ae7
+  metadata.gz: f18869fd3be69b970328dea05718efa3e89da02c61692b8b76fe8cb3f65ef9b4
+  data.tar.gz: 6a36d2746531f37b7e4f33fc99118cd6661b429e218a7cdd1218cc44461c43c6
 SHA512:
-  metadata.gz: e87c69ec96e1786b6d3245812770d4a21e2f4f5e01cd6ca2993aeb38d8e3c9907d9889a442dda49f6c593eb16816e2baa7572c48442a861e2982ca43dd3d0cd9
-  data.tar.gz: eb04d5227750e269ee78047189e6eef3907b2fe4c14b63836f28e5f8a3762e84081f028016f823262e171d4ba81d56a53fb95450ca5850f36b673331df7e38a6
+  metadata.gz: 836abf0e71ec67aab2ab51b9859f3670bb1a8f51145e78743e8c15c734a5e53f0fc9c7abaef2872c36b716a370d1a580c4c2139146e0e5284818a38b918acb12
+  data.tar.gz: 1962f34cd78eef86a40cf7cc044808150675ba849068208ca08c8e106f4eeec0ca1a2015c1ba01ddf16d1a950235f743d64626aea12241559c9331896ab92874

data/lib/thredded_create_app/cli.rb

@@ -60,7 +60,7 @@ module ThreddedCreateApp
       log_stderr Rainbow(<<~TEXT).green.bright
         All done! 🌟
       TEXT
-      generator.run_tests!
+      generator.run_tests! unless ENV['SKIP_TESTS']
       start_app_server!(options[:app_path]) if options[:start_server]
     end
 

data/lib/thredded_create_app/generator.rb

@@ -84,24 +84,39 @@ module ThreddedCreateApp
     end
 
     # @final
-    def bundle # rubocop:disable Metrics/AbcSize
+    def bundle
       gemfile_contents = File.read('Gemfile')
       gems_to_add = gems.reject do |gem|
         gemfile_contents =~ /^gem\s*['"]#{Regexp.escape(gem[0])}['"]/
       end
+      log_info 'Writing gems to Gemfile'
+      add_gems_to_gemfile gems_to_add
+      log_info 'Installing gems'
+      install_gems
+      git_commit "Add gems: #{gems_to_add.map { |(name, *)| name } * ', '}"
+    end
+
+    def add_gems_to_gemfile(gems)
       File.open('Gemfile', 'a') do |f|
-        log_info 'Writing gems to Gemfile'
-        gems_to_add.each do |(name, version, groups, path)|
+        gems.each do |(name, version, groups, path)|
           f.puts ["gem '#{name}'",
                   (version if version),
                   ("groups: %i(#{groups * ' '})" if groups),
                   ("path: '#{path}'" if path)].compact.join(', ')
         end
       end
-      log_info 'Installing gems'
-      run "bundle install#{' --quiet' unless verbose?}" \
-          "#{' --path .bundle' unless File.writable?(Gem.dir)}"
-      git_commit "Add gems: #{gems_to_add.map { |(name, *)| name } * ', '}"
+    end
+
+    def install_gems
+      cache_path = ENV['THREDDED_CREATE_APP_BUNDLE_CACHE']
+      if cache_path
+        FileUtils.mkdir_p cache_path
+        run 'ln', '-s', cache_path, 'vendor/cache'
+      end
+      run 'bundle', 'install',
+          *('--quiet' unless verbose?),
+          *(%w[--path .bundle] unless File.writable?(Gem.dir))
+      run 'bundle', 'package', *('--quiet' unless verbose?) if cache_path
     end
   end
 end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Users
+  class SessionsController < ::Devise::SessionsController
+    attr_accessor :response_options
+
+    protected
+
+    def sign_in_params
+      super.reverse_merge(remember_me: true)
+    end
+
+    def serialize_options(resource)
+      super.merge!(response_options || {})
+    end
+  end
+end

data/lib/thredded_create_app/tasks/add_devise.rb

@@ -19,6 +19,8 @@ module ThreddedCreateApp
                 ':password, :password_confirmation'
         run_generator 'devise:install'
         run_generator 'devise User'
+        fix_migration_indices_limit_on_mysql
+        setup_controllers
         setup_views
         setup_emails
         setup_after_sign_in_behaviour
@@ -53,20 +55,49 @@ module ThreddedCreateApp
         RUBY
       end
 
+      def fix_migration_indices_limit_on_mysql
+        return unless database_adapter_name =~ /mysql|maria/i
+        migration_file = Dir['db/migrate/*_devise_create_users.rb'][0]
+        replace migration_file,
+                /add_index :users, :(?:email|\w+_token), +unique: true/,
+                '\0, length: 191',
+                global: true
+      end
+
+      def setup_controllers
+        copy 'add_devise/sessions_controller.rb',
+             'app/controllers/users/sessions_controller.rb'
+        replace 'config/routes.rb',
+                'devise_for :users',
+                <<~'RUBY'.chomp
+                  devise_for :users,
+                             skip: %i[sessions],
+                             controllers: {
+                               sessions: 'users/sessions',
+                             },
+                             path_names: { sign_up: 'register' }
+                  devise_scope :user do
+                    get 'sign-in', to: 'users/sessions#new', as: :new_user_session
+                    post 'sign-in', to: 'users/sessions#create', as: :user_session
+                    match 'sign-out', to: 'users/sessions#destroy', as: :destroy_user_session,
+                                      via: Devise.mappings[:user].sign_out_via
+                  end
+                RUBY
+      end
+
       def setup_views
-        run_generator 'devise:i18n:views -v sessions registrations'
+        # Generate all devise views that have forms, so that they use the
+        # app form template (e.g. simple_form).
+        run_generator 'devise:i18n:views -v confirmations passwords' \
+                      ' registrations sessions unlocks'
         # Replace the back link with the correct URL
         replace 'app/views/devise/registrations/edit.html.erb',
                 ', :back %>', ', back_url %>'
-        # Make the views render-able outside Devise controllers
-        %w[app/views/devise/sessions/new.html.erb
-           app/views/devise/shared/_links.html.erb].each do |path|
-          replace path, 'resource_class', 'User', optional: true, global: true
-          replace path, /resource_name(?!:)/, ':user', global: true
-          replace path, /resource(?!:)/, ':user', optional: true, global: true
-          replace path, 'devise_mapping', 'Devise.mappings[:user]',
-                  optional: true, global: true
-        end
+        # Remove "Password confirmation" from sign up.
+        # See https://github.com/plataformatec/devise/wiki/Disable-password-confirmation-during-registration
+        replace 'app/views/devise/registrations/new.html.erb',
+                "    <%= f.input :password_confirmation, required: true %>\n",
+                ''
       end
 
       def setup_emails

data/lib/thredded_create_app/tasks/add_thredded/thredded_initializer_controller.rb

@@ -4,7 +4,12 @@ Rails.application.config.to_prepare do
   Thredded::ApplicationController.module_eval do
     rescue_from Thredded::Errors::LoginRequired do |exception|
       flash.now[:notice] = exception.message
-      render template: 'devise/sessions/new', status: :forbidden
+      controller = Users::SessionsController.new
+      controller.request = request
+      controller.request.env['devise.mapping'] = Devise.mappings[:user]
+      controller.response = response
+      controller.response_options = { status: :forbidden }
+      controller.process(:new)
     end
   end
 end

data/lib/thredded_create_app/tasks/add_thredded.rb

@@ -9,7 +9,8 @@ module ThreddedCreateApp
       end
 
       def before_bundle
-        add_gem 'thredded'
+        add_gem 'thredded',
+                **(ENV['LOCAL_THREDDED'] ? { path: ENV['LOCAL_THREDDED'] } : {})
       end
 
       def after_bundle # rubocop:disable Metrics/AbcSize

data/lib/thredded_create_app/tasks/setup_app_skeleton/spec/controllers/users_controller_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe UsersController, type: :controller do
     it 'returns http success' do
       user = User.create(valid_attributes)
       get :show, params: { id: user.id }
-      expect(response).to have_http_status(:success)
+      expect(response).to be_successful
     end
   end
 end

data/lib/thredded_create_app/tasks/setup_app_skeleton/users_show.html.erb

@@ -20,6 +20,12 @@
       <li><%= t 'thredded.users.posts_count', count: user_detail.posts_count %></li>
   <% end %>
 </ul>
+<% if current_user && current_user != user %>
+  <a class="thredded--link"
+     href="<%= Thredded::UrlsHelper.send_private_message_path(current_user: current_user, to: user) %>">
+    <%= t 'thredded.users.send_private_message' %>
+  </a>
+<% end %>
 <% posts_page = Thredded.posts_page_view(
     scope: user.thredded_posts.order_newest_first.limit(5),
     current_user: current_user) %>

data/lib/thredded_create_app/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -131,6 +131,7 @@ 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/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
@@ -212,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails app generator for Thredded.