thredded 0.3.2 → 0.4.0

data/app/policies/thredded/messageboard_policy.rb

@@ -16,6 +16,10 @@ module Thredded
       @user.thredded_admin? || @user.thredded_can_read_messageboards.include?(@messageboard)
     end
 
+    def update?
+      @user.thredded_admin?
+    end
+
     def post?
       @user.thredded_admin? || @user.thredded_can_write_messageboards.include?(@messageboard)
     end

data/app/policies/thredded/post_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_dependency 'thredded/topic_policy'
 module Thredded
   class PostPolicy
     # @param user [Thredded.user_class]
@@ -12,6 +13,10 @@ module Thredded
       @user.thredded_admin? || !@post.postable.locked? && messageboard_policy.post?
     end
 
+    def read?
+      TopicPolicy.new(@user, @post.postable).read?
+    end
+
     def update?
       @user.thredded_admin? || own_post? || messageboard_policy.moderate?
     end

data/app/policies/thredded/private_post_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_dependency 'thredded/private_topic_policy'
 module Thredded
   class PrivatePostPolicy
     # @param user [Thredded.user_class]
@@ -12,6 +13,10 @@ module Thredded
       @user.thredded_admin? || @post.postable.users.include?(@user)
     end
 
+    def read?
+      PrivateTopicPolicy.new(@user, @post.postable).read?
+    end
+
     def update?
       @user.thredded_admin? || own_post?
     end

data/app/view_models/thredded/messageboard_group_view.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module Thredded
+  # A view model for a page of MessageboardGroupViews.
+  class MessageboardGroupView
+    delegate :name, to: :@group, allow_nil: true
+    attr_reader :group, :messageboards
+    # @param group Thredded::MessageboardGroup
+    # @param messageboards [Thredded::TopicCommon]
+    def initialize(group, messageboards)
+      @group = group
+      @messageboards = messageboards
+    end
+  end
+end

data/app/views/thredded/messageboard_groups/new.html.erb

@@ -0,0 +1,20 @@
+<% content_for :thredded_page_title, t('thredded.messageboard_group.create') %>
+<% content_for :thredded_page_id, 'thredded--messageboard-groups-new' %>
+<% content_for :thredded_breadcrumbs do %>
+  <ul class="thredded--navigation-breadcrumbs">
+    <li><%= t('thredded.messageboard_group.create') %></li>
+  </ul>
+<% end %>
+
+<%= thredded_page do %>
+  <%= form_for @messageboard_group, html: { class: 'thredded--form' } do |f| %>
+    <ul class="thredded--form-list">
+      <li>
+        <%= f.label :name %>
+        <%= f.text_field :name, required: true %>
+      </li>
+
+      <li><%= f.submit t('thredded.messageboard_group.create'), class: 'thredded--form--submit' %></li>
+    </ul>
+  <% end %>
+<% end %>

data/app/views/thredded/messageboards/_form.html.erb

@@ -0,0 +1,19 @@
+<%= form_for messageboard, html: { class: 'thredded--form' } do |f| %>
+  <ul class="thredded--form-list">
+    <li>
+      <%= f.label :name %>
+      <%= f.text_field :name, required: true %>
+    </li>
+    <li>
+      <%= f.label :description %>
+      <%= f.text_field :description %>
+    </li>
+    <li>
+      <%= f.label :messageboard_group_id %>
+      <%= f.collection_select :messageboard_group_id, Thredded::MessageboardGroup.all, :id, :name,
+                              include_blank: t('thredded.messageboard.form.no_group') %>
+    </li>
+    <li><%= f.submit @messageboard.persisted? ? t('thredded.messageboard.update') : t('thredded.messageboard.create'),
+                     class: 'thredded--form--submit' %></li>
+  </ul>
+<% end %>

data/app/views/thredded/messageboards/edit.html.erb

@@ -0,0 +1,11 @@
+<% content_for :thredded_page_title, t('thredded.nav.edit_messageboard') %>
+<% content_for :thredded_page_id, 'thredded--messageboard-edit' %>
+<% content_for :thredded_breadcrumbs do %>
+  <ul class="thredded--navigation-breadcrumbs">
+    <li><%= t('thredded.nav.edit_messageboard') %></li>
+  </ul>
+<% end %>
+
+<%= thredded_page do %>
+  <%= render 'form', messageboard: @messageboard %>
+<% end %>

data/app/views/thredded/messageboards/index.html.erb

@@ -3,12 +3,20 @@
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 <%= thredded_page do %>
   <section class="thredded--main-section thredded--messageboards">
-    <%= render @messageboards %>
-  </section>
+    <% @groups.each do |group| %>
+      <% if group.name.present? %>
+        <h3><%= group.name %></h3>
+      <% end %>
+      <%= render group.messageboards %>
+    <% end %>
 
-  <% if policy(Thredded::Messageboard.new).create? %>
-    <div class="thredded--messageboard--create">
-      <a class="thredded--button" href="<%= new_messageboard_path %>">Create a New Messageboard</a>
+    <div class="thredded--messageboards--actions">
+      <% if policy(Thredded::Messageboard.new).create? %>
+        <a class="thredded--button" href="<%= new_messageboard_path %>"><%= t('thredded.messageboard.create') %></a>
+      <% end %>
+      <% if policy(Thredded::MessageboardGroup.new).create? %>
+        <a class="thredded--button" href="<%= new_messageboard_group_path %>"><%= t('thredded.messageboard_group.create') %></a>
+      <% end %>
     </div>
-  <% end %>
+  </section>
 <% end %>

data/app/views/thredded/messageboards/new.html.erb

@@ -1,24 +1,11 @@
-<% content_for :thredded_page_title, 'Create a New Messageboard' %>
+<% content_for :thredded_page_title, t('thredded.messageboard.create') %>
 <% content_for :thredded_page_id, 'thredded--messageboards-new' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li>Create a New Messageboard</li>
+    <li><%= t('thredded.messageboard.create') %></li>
   </ul>
 <% end %>
 
 <%= thredded_page do %>
-  <%= form_for @messageboard, html: { class: 'thredded--form' } do |f| %>
-    <ul class="thredded--form-list">
-      <li>
-        <%= f.label :name %>
-        <%= f.text_field :name, required: true %>
-      </li>
-      <li>
-        <%= f.label :description %>
-        <%= f.text_field :description %>
-      </li>
-
-      <li><%= f.submit 'Create New Messageboard', class: 'thredded--form--submit' %></li>
-    </ul>
-  <% end %>
+  <%= render 'form', messageboard: @messageboard %>
 <% end %>

data/app/views/thredded/post_mailer/at_notification.html.erb

@@ -4,7 +4,7 @@
 
 <p>
   This email was sent to you because <%= @post.user %> mentioned you in
-  "<%= link_to @post.postable.title, post_url(@post) %>".
+  "<%= link_to @post.postable.title, post_permalink_url(@post.id) %>".
   <%= link_to 'View the conversation here', topic_url(@post.postable) %>.
 </p>
 

data/app/views/thredded/post_mailer/at_notification.text.erb

@@ -4,7 +4,7 @@
 
 This email was sent to you because <%= @post.user %> mentioned you in
 "<%= @post.postable.title %>". Go here to view the conversation:
-<%= post_url @post %>
+<%= post_permalink_url @post %>
 
 To unsubscribe from these emails, update your preferences here:
   <%= edit_messageboard_preferences_url @post.messageboard %>

data/app/views/thredded/posts_common/_form.html.erb

@@ -1,7 +1,7 @@
 <%= form_for (post.private_topic_post? ? [topic, post] : [messageboard, topic, post]), as: :post,
              html: { class: 'thredded--form thredded--post-form', 'data-thredded-post-form' => true } do |form| %>
   <ul class="thredded--form-list">
-    <%= render 'thredded/posts/content_field', form: form, content_label: content_label %>
+    <%= render 'thredded/posts_common/form/content_field', form: form, content_label: content_label %>
 
     <li>
       <%= form.submit button_text, class: 'thredded--form--submit' %>

data/app/views/thredded/posts_common/form/_content_field.html.erb

@@ -0,0 +1,6 @@
+<li>
+  <%= form.label :content, content_label %>
+  <%= render 'thredded/posts_common/form/before_content', form: form %>
+  <%= form.text_area :content, { rows: 5, required: true }  %>
+  <%= render 'thredded/posts_common/form/after_content', form: form %>
+</li>

data/app/views/thredded/private_post_mailer/at_notification.html.erb

@@ -4,7 +4,7 @@
 
 <p>
   This email was sent to you because <%= @post.user %> mentioned you in
-  "<%= link_to @post.postable.title, post_url(@post) %>".
+  "<%= link_to @post.postable.title, private_post_permalink_url(@post.id) %>".
   <%= link_to 'View the conversation here', topic_url(@post.postable) %>.
 </p>
 

data/app/views/thredded/private_topics/_form.html.erb

@@ -15,7 +15,7 @@
                           'data-autocomplete-url'      => autocomplete_users_path %>
     </li>
 
-    <%= render 'thredded/posts/content_field',
+    <%= render 'thredded/posts_common/form/content_field',
                form:          form,
                content_label: t('thredded.private_topics.form.content_label') %>
 

data/app/views/thredded/topics/_form.html.erb

@@ -15,7 +15,7 @@
       </li>
     <% end %>
 
-    <%= render 'thredded/posts/content_field',
+    <%= render 'thredded/posts_common/form/content_field',
                form:          form,
                content_label: t('thredded.topics.form.content_label') %>
     <%= render 'thredded/topics/topic_form_admin_options', form: form %>

data/app/views/thredded/topics/index.html.erb

@@ -15,4 +15,12 @@
   <footer>
     <%= paginate @topics %>
   </footer>
+
+  <div class="thredded--messageboards--actions">
+    <% if policy(messageboard).update? %>
+      <a class="thredded--button" href="<%= edit_messageboard_path(messageboard) %>">
+        <%= t('thredded.nav.edit_messageboard') %>
+      </a>
+    <% end %>
+  </div>
 <% end %>

data/app/views/thredded/users/_link.html.erb

@@ -5,5 +5,5 @@
 <%= user.to_s %>
   <% end %>
 <% else %>
-<em>Deleted user</em>
+<em><%= t 'thredded.null_user_name' %></em>
 <% end %>

data/config/locales/en.yml

@@ -1,21 +1,32 @@
 ---
 en:
   thredded:
+    form:
+      update: Update
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.
       private_topic_create_denied: You are not authorized to create private topics.
       private_topic_not_found: This private topic does not exist.
     messageboard:
+      create: Create a New Messageboard
+      update: :thredded.form.update
+      form:
+        no_group: No Group
       last_updated_by_html: Updated %{time_ago} <cite>by %{user}</cite>
       topics_and_posts_counts: "%{topics_count} topics / %{posts_count} posts"
+      updated_notice: Messageboard has been updated
+    messageboard_group:
+      create: Create a New Messageboard Group
     nav:
       all_messageboards: All Messageboards
+      edit_messageboard: Edit Messageboard
       edit_post: Edit Post
       edit_private_topic: :thredded.nav.edit_topic
       edit_topic: Edit
       private_topics: Private Messages
       settings: Notification Settings
+    null_user_name: Deleted user
     posts:
       delete: Delete Post
       delete_confirm: Are you sure you want to delete this post?

data/config/locales/pt-BR.yml

@@ -6,16 +6,27 @@ pt-BR:
       not_authorized: Você não está autorizado a acessar esta página.
       private_topic_create_denied: Você não está autorizado a criar tópicos privados.
       private_topic_not_found: Este tópico privado não existe.
+    form:
+      update: Atualizar
     messageboard:
+      create: Criar um novo Fórum de Mensagem
+      form:
+        no_group: Sem Grupo
       last_updated_by_html: Atualizado %{time_ago} <cite>por %{user}</cite>
       topics_and_posts_counts: "%{topics_count} tópicos / %{posts_count} posts"
+      update: :thredded.form.update
+      updated_notice: Fórum de mensagem foi atualizado
+    messageboard_group:
+      create: Criar um novo grupo de mensagens
     nav:
       all_messageboards: Todos os Fóruns de Mensagens
+      edit_messageboard: Editar Fórum de Mensagem
       edit_post: Editar Post
       edit_private_topic: :thredded.nav.edit_topic
       edit_topic: Editar
       private_topics: Mensagens Privadas
       settings: Configurações de Notificação
+    null_user_name: Usuário deletado
     posts:
       delete: Remover Post
       delete_confirm: Você tem certeza que deseja remover este post?
@@ -32,8 +43,8 @@ pt-BR:
         global_preferences_label: Configurações Globais
         messageboard_notify_on_mention:
           hint: >-
-            Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você irá
-            receber um e-mail com o conteúdo deste post.
+            Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você irá receber
+            um e-mail com o conteúdo deste post.
           label: :thredded.preferences.form.notify_on_mention.label
         messageboard_preferences_label_html: Configurações de Notificação para <em>%{messageboard}</em>
         notify_on_mention:
@@ -42,7 +53,8 @@ pt-BR:
             deste post.
           label: "@ Notificações"
         notify_on_message:
-          hint: Quando você for adicionado a uma conversa privada, você receberá um e-mail com o conteúdo desta conversa.
+          hint: Quando você for adicionado a uma conversa privada, você receberá um e-mail com o conteúdo desta
+            conversa.
           label: Notificação de Mensagens Privadas
         submit_btn: Atualizar Configurações
         title: Configurações

data/config/routes.rb

@@ -2,7 +2,8 @@
 Thredded::Engine.routes.draw do
   resource :theme_preview, only: [:show], path: 'theme-preview' if %w(development test).include? Rails.env
 
-  page_constraint = { page: /[1-9]\d*/ }
+  positive_int = /[1-9]\d*/
+  page_constraint = { page: positive_int }
 
   scope path: 'private-topics' do
     resource :private_topic, only: [:new], path: ''
@@ -14,6 +15,11 @@ Thredded::Engine.routes.draw do
     end
   end
 
+  scope only: [:show], constraints: { id: positive_int } do
+    resources :private_post_permalinks, path: 'private-posts'
+    resources :post_permalinks, path: 'posts'
+  end
+
   resources :autocomplete_users, only: [:index], path: 'autocomplete-users'
 
   constraints(->(req) { req.env['QUERY_STRING'].include? 'q=' }) do
@@ -21,8 +27,13 @@ Thredded::Engine.routes.draw do
     get '/:messageboard_id(.:format)' => 'topics#search', as: :messageboard_search
   end
 
+  scope path: 'admin' do
+    resources :messageboard_groups, only: [:new, :create]
+  end
+
   resource :preferences, only: [:edit, :update]
   resource :messageboard, path: 'messageboards', only: [:new]
+  resources :messageboards, only: [:edit, :update]
   resources :messageboards, only: [:index, :create], path: '' do
     resource :preferences, only: [:edit, :update]
     resource :topic, path: 'topics', only: [:new]

data/db/migrate/20160329231848_create_thredded.rb

@@ -168,6 +168,14 @@ class CreateThredded < ActiveRecord::Migration
       end
       add_index table_name, [:user_id, :postable_id], name: :"#{table_name}_user_postable", unique: true
     end
+
+    create_table :thredded_messageboard_groups do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+
+    add_column :thredded_messageboards, :messageboard_group_id, :integer
+    add_index :thredded_messageboards, [:messageboard_group_id], name: :index_thredded_messageboards_on_messageboard_group_id
   end
 end
 # rubocop:enable Metrics/LineLength

data/db/seeds.rb

@@ -63,13 +63,16 @@ module Thredded
     end
 
     def create_additional_messageboards
+      meta_group_id = MessageboardGroup.create!(name: 'Meta').id
       additional_messageboards = [
         ['Off-Topic', "Talk about whatever here, it's all good."],
-        ['Meta', 'Need help using the forum? Want to report a bug or make a suggestion? This is the place.']
+        ['Help, Bugs, and Suggestions',
+         'Need help using the forum? Want to report a bug or make a suggestion? This is the place.', meta_group_id],
+        ['Praise', 'Want to tell us how great we are? This is the place.', meta_group_id]
       ]
       log "Creating #{additional_messageboards.length} additional messageboards..."
-      additional_messageboards.each do |(name, description)|
-        messageboard = Messageboard.create!(name: name, description: description)
+      additional_messageboards.each do |(name, description, group_id)|
+        messageboard = Messageboard.create!(name: name, description: description, messageboard_group_id: group_id)
         FactoryGirl.create_list(:topic, 1 + rand(3), messageboard: messageboard, with_posts: 1)
       end
     end
@@ -80,13 +83,15 @@ module Thredded
         :topic, count,
         messageboard: messageboard,
         user:         users.sample,
-        last_user:    users.sample)
+        last_user:    users.sample
+      )
 
       @private_topics = FactoryGirl.create_list(
         :private_topic, count,
         user:      users.sample,
         last_user: users.sample,
-        users:     [user])
+        users:     [user]
+      )
     end
 
     def create_posts(count: (1..30))

data/db/upgrade_migrations/20160429222452_upgrade_v0_3_to_v0_4.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class UpgradeV03ToV04 < ActiveRecord::Migration[5.0]
+  def up
+    create_table :thredded_messageboard_groups do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+
+    add_column :thredded_messageboards, :messageboard_group_id, :integer
+    add_index :thredded_messageboards, [:messageboard_group_id],
+              name: :index_thredded_messageboards_on_messageboard_group_id
+  end
+end

data/heroku.gemfile

@@ -5,7 +5,7 @@ ruby '2.3.1'
 gem 'thredded', path: File.dirname(__FILE__)
 
 # Rails 5
-gem 'rails', '~> 5.0.0.beta4'
+gem 'rails', '~> 5.0.0.racecar1'
 gem 'kaminari', git: 'https://github.com/amatsuda/kaminari'
 gem 'active_record_union', git: 'https://github.com/glebm/active_record_union', branch: 'rails-5-test-harness'
 

data/heroku.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/amatsuda/kaminari
-  revision: 0e21d52feca1f79a9aca83613cf053eb5273827e
+  revision: 9c44b6461f00471886caff921feea36f29dbb06d
   specs:
     kaminari (1.0.0.alpha)
       actionpack (>= 3.0.0)
@@ -17,7 +17,7 @@ GIT
 PATH
   remote: .
   specs:
-    thredded (0.3.2)
+    thredded (0.4.0)
       active_record_union (>= 1.1.1)
       autoprefixer-rails
       autosize-rails
@@ -47,40 +47,40 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.beta4)
-      actionpack (= 5.0.0.beta4)
+    actioncable (5.0.0.rc1)
+      actionpack (= 5.0.0.rc1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.beta4)
-      actionpack (= 5.0.0.beta4)
-      actionview (= 5.0.0.beta4)
-      activejob (= 5.0.0.beta4)
+    actionmailer (5.0.0.rc1)
+      actionpack (= 5.0.0.rc1)
+      actionview (= 5.0.0.rc1)
+      activejob (= 5.0.0.rc1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (5.0.0.beta4)
-      actionview (= 5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
+    actionpack (5.0.0.rc1)
+      actionview (= 5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
       rack (~> 2.x)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
+    actionview (5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
+    activejob (5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
-    activerecord (5.0.0.beta4)
-      activemodel (= 5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
+    activemodel (5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
+    activerecord (5.0.0.rc1)
+      activemodel (= 5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
       arel (~> 7.0)
-    activesupport (5.0.0.beta4)
-      concurrent-ruby (~> 1.0)
+    activesupport (5.0.0.rc1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
@@ -123,7 +123,7 @@ GEM
     github-markdown (0.6.9)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
-    html-pipeline (2.4.0)
+    html-pipeline (2.4.1)
       activesupport (>= 2, < 5)
       nokogiri (>= 1.4)
     html-pipeline-vimeo (0.1.1)
@@ -167,24 +167,24 @@ GEM
     puma (3.4.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
-    rack (2.0.0.alpha)
+    rack (2.0.0.rc1)
       json
     rack-canonical-host (0.2.1)
       addressable (> 0, < 3)
       rack (>= 1.0.0, < 3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.beta4)
-      actioncable (= 5.0.0.beta4)
-      actionmailer (= 5.0.0.beta4)
-      actionpack (= 5.0.0.beta4)
-      actionview (= 5.0.0.beta4)
-      activejob (= 5.0.0.beta4)
-      activemodel (= 5.0.0.beta4)
-      activerecord (= 5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
+    rails (5.0.0.rc1)
+      actioncable (= 5.0.0.rc1)
+      actionmailer (= 5.0.0.rc1)
+      actionpack (= 5.0.0.rc1)
+      actionview (= 5.0.0.rc1)
+      activejob (= 5.0.0.rc1)
+      activemodel (= 5.0.0.rc1)
+      activerecord (= 5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.beta4)
+      railties (= 5.0.0.rc1)
       sprockets-rails (>= 2.0.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -200,14 +200,14 @@ GEM
     rails-timeago (2.13.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_email_preview (1.0.3)
-      rails (>= 3.2)
+    rails_email_preview (2.0.1)
+      rails (>= 4.2)
       request_store
       sass-rails
       turbolinks
-    railties (5.0.0.beta4)
-      actionpack (= 5.0.0.beta4)
-      activesupport (= 5.0.0.beta4)
+    railties (5.0.0.rc1)
+      actionpack (= 5.0.0.rc1)
+      activesupport (= 5.0.0.rc1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -216,7 +216,7 @@ GEM
     ref (2.0.0)
     request_store (1.3.1)
     rinku (1.7.3)
-    rollbar (2.11.1)
+    rollbar (2.11.3)
       multi_json
     sanitize (4.0.1)
       crass (~> 1.0.2)
@@ -247,7 +247,7 @@ GEM
       ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.3)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
@@ -271,7 +271,7 @@ DEPENDENCIES
   pg
   puma
   rack-canonical-host
-  rails (~> 5.0.0.beta4)
+  rails (~> 5.0.0.racecar1)
   rails-i18n
   rails_email_preview (>= 1.0.3)
   rollbar
@@ -283,4 +283,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.1
+   1.12.3

data/lib/generators/thredded/install/USAGE

@@ -1,13 +1,8 @@
 Description:
-    Create an initializer with description of configuration and defaults
+    Create an initializer with description of configuration and defaults.
 
 Example:
     rails generate thredded:install
 
     This will create:
         config/initializers/thredded.rb
-
-Options:
-
-    [--theme]   # Will copy thredded layout, views, and assets to the parent app
-