thredded_create_app 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8321129255513f386fad12a0d97ee42921986331
-  data.tar.gz: 191f06d32b4a785fc7247f4727a680a813e6255f
+  metadata.gz: dfa3e7dfa51e502af97a906fb30679390fee8d2a
+  data.tar.gz: f12086e9db6afae849cb10bca6283088d61eccab
 SHA512:
-  metadata.gz: 03e931cd479e9d3c1ae73b51ebf6885a28c2046d21744d60262daad28a04f18647a693f0d8b546e10cc377e3c62e561308fc08d9ffc3ffcd1aaa7fe53bcbb3c4
-  data.tar.gz: 1275fc973cdfe0b1ab08510f3a1ffaeb3e478cf13d39dd46939c870dea6027e27b178ddc471a80bda6799f310cc0e624b6f13592bf7bc8bbe5de6ee50b5fac87
+  metadata.gz: ce92577653bd086b272dfb2ff406aaec2c88376bab0c8aa1bfb9828e4616f6b2b51a65c8cf831385f6783be58b54bd33bcc04df035027fc89f74e7602804352a
+  data.tar.gz: 9f1ae4bdcc9ca93e9bf7fbe9c9a438e14eaaa674320ce83e6bfa58d16cc8695fc82113aedf54ba03b31ec4aa867206162596128fc933c5841592441bea2e04c8

data/README.md

@@ -102,8 +102,8 @@ This is so that other engineers can spin up a development environment with
 a single command.
 
 A production configuration file for the [puma] Ruby web server is created.
-A `Procfile` process description file that can be used by that can be used by
-the [Heroku] hosting platform or the [foreman] app runner is also be created.
+A `Procfile` process description file is also created. This file can be used by
+the [Heroku] hosting platform or the [foreman] app runner.
 
 Lastly, the `$APP` database user is created and given rights to the app's
 development and test databases. Then, the database is created, the migrations

data/lib/thredded_create_app/generator.rb

@@ -78,10 +78,11 @@ module ThreddedCreateApp
     def bundle
       File.open('Gemfile', 'a') do |f|
         log_info 'Writing gems to Gemfile'
-        gems.each do |(name, version, groups)|
+        gems.each do |(name, version, groups, path)|
           f.puts ["gem '#{name}'",
                   (version if version),
-                  ("groups: %i(#{groups * ' '})" if groups)].compact.join(', ')
+                  ("groups: %i(#{groups * ' '})" if groups),
+                  ("path: '#{path}'" if path)].compact.join(', ')
         end
       end
       run "bundle install#{' --quiet' unless verbose?}"

data/lib/thredded_create_app/tasks/add_devise.rb

@@ -31,6 +31,7 @@ module ThreddedCreateApp
                          content: <<-'RUBY'
 
   before_action :store_current_location, unless: :devise_controller?
+  helper_method :back_url
 
   private
 
@@ -39,21 +40,26 @@ module ThreddedCreateApp
   end
 
   def after_sign_out_path_for(resource)
-    request.referrer || root_path
+    stored_location_for(:user) || root_path
+  end
+
+  def back_url
+    session[:user_return_to] || root_path
   end
         RUBY
       end
 
       def setup_views
         run_generator 'devise:i18n:views -v sessions registrations'
+        # 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/registrations/new.html.erb
-           app/views/devise/registrations/edit.html.erb
-           app/views/devise/sessions/new.html.erb
+        %w(app/views/devise/sessions/new.html.erb
            app/views/devise/shared/_links.html.erb).each do |path|
-          replace path, 'resource_name', ':user'
-          replace path, 'resource', ':user'
           replace path, 'resource_class', 'User', optional: true
+          replace path, /resource_name(?!:)/, ':user'
+          replace path, /resource(?!:)/, ':user', optional: true
           replace path, 'devise_mapping', 'Devise.mappings[:user]',
                   optional: true
         end

data/lib/thredded_create_app/tasks/add_display_name_to_users/add_display_name_to_users.rb

@@ -5,10 +5,10 @@ class AddDisplayNameToUsers < ActiveRecord::Migration[5.0]
     when /mysql/i
       add_column :users, :display_name, :string, limit: 191
     when /sqlite/i
-      add_column :users, :display_name, :text
+      add_column :users, :display_name, :string
       change_column_null :users, :display_name, false
     else
-      add_column :users, :display_name, :text, null: false
+      add_column :users, :display_name, :string, null: false
     end
 
     DbTextSearch::CaseInsensitive.add_index connection, :users, :display_name,

data/lib/thredded_create_app/tasks/add_thredded/_myapp-thredded.scss

@@ -2,6 +2,7 @@
 
 $thredded-brand: $brand-primary;
 $thredded-text-color: $text-color;
+$thredded-secondary-text-color: $secondary-text-color;
 $thredded-base-font-family: $base-font-family;
 $thredded-base-font-size: $base-font-size;
 $thredded-base-line-height: $base-line-height;

data/lib/thredded_create_app/tasks/base.rb

@@ -29,9 +29,9 @@ module ThreddedCreateApp
 
       protected
 
-      def add_gem(gem_name, version: nil, groups: nil)
+      def add_gem(gem_name, version: nil, groups: nil, path: nil)
         log_verbose "+ gem #{gem_name}"
-        @gems << [gem_name, version, groups]
+        @gems << [gem_name, version, groups, path]
       end
 
       def git_commit(message)

data/lib/thredded_create_app/tasks/setup_app_skeleton/_variables.scss.erb

@@ -1,5 +1,6 @@
 $brand-primary: <%= brand_primary %>;
 $text-color: #575d6b;
+$secondary-text-color: lighten($text-color, 30%);
 $base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
 $base-font-size: 1rem;
 $base-line-height: 1.5;

data/lib/thredded_create_app/tasks/setup_app_skeleton/application.body.html.erb

@@ -1,7 +1,18 @@
 <body class="app">
-<div class="app-container">
+<% is_thredded = content_for?(:thredded_page_id) %>
+<%= content_tag :div,
+                class: 'app-container',
+                id: ('app-page-container' unless is_thredded) do %>
   <%= render 'shared/header' %>
-  <%= render 'shared/flash_messages' unless content_for?(:thredded_page_id) %>
+  <%= render 'shared/flash_messages' unless is_thredded %>
   <div class="app-content-container"><%= yield %></div>
-</div>
+  <%# If thredded JS is loaded via an [async] script, the JS may
+  run before or after DOMContentLoaded. Expose a flag to Thredded
+  so it can initialize correctly. %>
+  <script data-turbolinks-eval="false">
+    document.addEventListener('DOMContentLoaded', function() {
+      (window.App = window.App || {}).DOMContentLoadedFired = true;
+    });
+  </script>
+<% end %>
 </body>

data/lib/thredded_create_app/tasks/setup_app_skeleton/application.scss

@@ -58,6 +58,19 @@
   margin: 1rem 0;
 }
 
+.form-inputs {
+  .hint {
+    color: $secondary-text-color;
+  }
+  .error {
+    @extend %thredded--alert;
+    @extend %thredded--alert--danger;
+    display: block;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+}
+
 a {
   @extend %thredded--link;
 }

data/lib/thredded_create_app/tasks/setup_app_skeleton/application_helper_methods.rb

@@ -8,10 +8,21 @@ end
 # @return [String] html_safe datetime presentation
 def time_ago(datetime, default: '-')
   timeago_tag datetime,
-              lang:    I18n.locale.to_s.downcase,
-              format:  (lambda do |t, _opts|
+              lang: I18n.locale.to_s.downcase,
+              format: (lambda do |t, _opts|
                 t.year == Time.current.year ? :short : :long
               end),
-              nojs:    true,
+              nojs: true,
+              date_only: false,
               default: default
 end
+
+# Override the default timeago_tag_content from rails-timeago
+def timeago_tag_content(time, time_options = {})
+  if time_options[:nojs] &&
+     (time_options[:limit].nil? || time_options[:limit] < time)
+    t 'common.time_ago', time: time_ago_in_words(time)
+  else
+    I18n.l time.to_date, format: time_options[:format]
+  end
+end

data/lib/thredded_create_app/tasks/setup_app_skeleton/en.yml.erb

@@ -1,7 +1,10 @@
 en:
   brand:
     name: <%= app_name.tr('_', ' ').capitalize %>
+  common:
+    time_ago: "%{time} ago"
   nav:
+    edit_my_account: Edit my account
     forums: :thredded.nav.all_messageboards
     sign_in: :devise.shared.links.sign_in
     sign_out: Sign out

data/lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app/time_ago.js

@@ -0,0 +1,13 @@
+//= require jquery.timeago
+(function () {
+  if (!this.App.isAppPage()) {
+    return;
+  }
+  var COMPONENT_SELECTOR = '[data-time-ago]';
+  this.App.onPageLoad(function () {
+    const allowFutureWas = jQuery.timeago.settings.allowFuture;
+    jQuery.timeago.settings.allowFuture = true;
+    jQuery(COMPONENT_SELECTOR).timeago();
+    jQuery.timeago.settings.allowFuture = allowFutureWas;
+  });
+}).call(this);

data/lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app.js

@@ -0,0 +1,53 @@
+//= require_self
+//= require_tree ./app
+
+(function () {
+  this.App = this.App || {};
+  var App = this.App;
+
+  var isTurbolinks = 'Turbolinks' in window && window.Turbolinks.supported;
+  var isTurbolinks5 = isTurbolinks && 'clearCache' in window.Turbolinks;
+
+  var onPageLoadFiredOnce = false;
+  var pageLoadCallbacks = [];
+  var triggerOnPageLoad = function () {
+    pageLoadCallbacks.forEach(function (callback) {
+      callback();
+    });
+    onPageLoadFiredOnce = true;
+  };
+
+  // Fires the callback on DOMContentLoaded or a Turbolinks page load.
+  // If called from an async script on the first page load, and the DOMContentLoad event
+  // has already fired, will execute the callback immediately.
+  App.onPageLoad = function (callback) {
+    pageLoadCallbacks.push(callback);
+    // With async script loading, a callback may be added after the DOMContentLoaded event has already triggered.
+    // This means we will receive neither a DOMContentLoaded event, nor a turbolinks:load event on Turbolinks 5.
+    if (!onPageLoadFiredOnce && App.DOMContentLoadedFired) {
+      callback();
+    }
+  };
+
+  if (isTurbolinks5) {
+    document.addEventListener('turbolinks:load', function () {
+      triggerOnPageLoad();
+    });
+  } else {
+    // Turbolinks Classic (with or without jQuery.Turbolinks), or no Turbolinks:
+    if (!App.DOMContentLoadedFired) {
+      document.addEventListener('DOMContentLoaded', function () {
+        triggerOnPageLoad();
+      });
+    }
+    if (isTurbolinks) {
+      document.addEventListener('page:load', function () {
+        triggerOnPageLoad();
+      })
+    }
+  }
+
+  App.isAppPage = function() {
+    return !!document.getElementById('app-page-container');
+  }
+}).call(this);

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

@@ -6,6 +6,9 @@
   <%= image_tag Thredded.avatar_url.call(user), class: 'thredded--user--avatar' %><%= user.thredded_display_name %>
 </h1>
 <ul>
+  <% if user == current_user %>
+    <%= link_to t('nav.edit_my_account'), edit_user_registration_path %>
+  <% end %>
   <li><%= t 'thredded.users.user_since_html', time_ago: time_ago(user.created_at) %></li>
   <% if user_detail.last_seen_at %>
       <li><%= t 'thredded.users.last_active_html', time_ago: time_ago(user_detail.last_seen_at) %></li>

data/lib/thredded_create_app/tasks/setup_app_skeleton.rb

@@ -59,6 +59,11 @@ module ThreddedCreateApp
         replace 'app/assets/javascripts/application.js',
                 %r{^//= require jquery$},
                 '//= require jquery3'
+
+        copy 'setup_app_skeleton/javascripts/app.js',
+             'app/assets/javascripts/app.js'
+        copy 'setup_app_skeleton/javascripts/app/time_ago.js',
+             'app/assets/javascripts/app/time_ago.js'
         git_commit 'Use jQuery v3 instead of jQuery v1'
       end
 

data/lib/thredded_create_app/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ThreddedCreateApp
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -140,6 +140,8 @@ files:
 - lib/thredded_create_app/tasks/setup_app_skeleton/application_helper_methods.rb
 - lib/thredded_create_app/tasks/setup_app_skeleton/en.yml.erb
 - lib/thredded_create_app/tasks/setup_app_skeleton/home_show.html.erb.erb
+- lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app.js
+- lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app/time_ago.js
 - lib/thredded_create_app/tasks/setup_app_skeleton/seeds.rb.erb
 - lib/thredded_create_app/tasks/setup_app_skeleton/spec/controllers/users_controller_spec.rb
 - lib/thredded_create_app/tasks/setup_app_skeleton/spec/features/homepage_spec.rb