message_train 0.7.5 → 1.0.0

data/spec/controllers/message_train/boxes_controller_spec.rb

@@ -71,15 +71,19 @@ describe MessageTrain::BoxesController do
         )
       end
       it_should_behave_like(
-        'a page with an error message matching',
-        /Access to Conversation \d+ denied/
+        'a redirect matching',
+        %r{^http://test\.host/messages/box/in}
       )
+      context 'sets error' do
+        subject { flash[:error] }
+        it { is_expected.to match(/Access to Conversation \d+ denied/) }
+      end
     end
     describe 'without params' do
       before do
         put :update, params: { division: 'in' }
       end
-      it_should_behave_like 'a page with an alert message', 'Nothing to do'
+      it_should_behave_like 'a redirect with alert', '/messages/box/in', 'Nothing to do'
     end
     describe 'with valid params' do
       before do
@@ -92,8 +96,7 @@ describe MessageTrain::BoxesController do
           }
         )
       end
-      it_should_behave_like 'a page with a notice message', 'Update successful'
-      it_should_behave_like 'a response without error'
+      it_should_behave_like 'a redirect with notice', '/messages/box/in', 'Update successful'
     end
   end
 
@@ -115,7 +118,7 @@ describe MessageTrain::BoxesController do
       before do
         delete :destroy, params: { division: 'in' }
       end
-      it_should_behave_like 'a page with an alert message', 'Nothing to do'
+      it_should_behave_like 'a redirect with alert', '/messages/box/in', 'Nothing to do'
     end
     describe 'with valid params' do
       context 'ignoring' do
@@ -130,7 +133,8 @@ describe MessageTrain::BoxesController do
           )
         end
         it_should_behave_like(
-          'a page with a notice message',
+          'a redirect with notice',
+          '/messages/box/in',
           'Update successful'
         )
       end
@@ -146,7 +150,8 @@ describe MessageTrain::BoxesController do
           )
         end
         it_should_behave_like(
-          'a page with a notice message',
+          'a redirect with notice',
+          '/messages/box/in',
           'Update successful'
         )
       end

data/spec/controllers/message_train/concerns_spec.rb

@@ -37,7 +37,7 @@ describe MessageTrain::BoxesController do
       end
       it_should_behave_like(
         'a redirect with error',
-        '/collectives/groups:first-group/box/sent',
+        '/messages/collectives/groups:first-group/box/sent',
         'Access to that box denied'
       )
     end
@@ -55,7 +55,7 @@ describe MessageTrain::BoxesController do
       end
       it_should_behave_like(
         'a redirect with error',
-        '/collectives/groups:membered-group/box/in',
+        '/messages/collectives/groups:membered-group/box/in',
         'Access to that box denied'
       )
     end

data/spec/controllers/message_train/conversations_controller_spec.rb

@@ -57,7 +57,14 @@ describe MessageTrain::ConversationsController do
       before do
         put :update, params: { box_division: 'in', id: unread_conversation.id }
       end
-      it_should_behave_like 'a page with an alert message', 'Nothing to do'
+      it_should_behave_like(
+        'a redirect matching',
+        %r{^http://test\.host/messages/box/in/conversations/\d+$}
+      )
+      context 'sets alert' do
+        subject { flash[:alert] }
+        it { is_expected.to eq 'Nothing to do' }
+      end
     end
     describe 'with valid params' do
       before do
@@ -71,7 +78,14 @@ describe MessageTrain::ConversationsController do
           }
         )
       end
-      it_should_behave_like 'a page with a notice message', 'Update successful'
+      it_should_behave_like(
+        'a redirect matching',
+        %r{^http://test\.host/messages/box/in/conversations/\d+$}
+      )
+      context 'sets notice' do
+        subject { flash[:notice] }
+        it { is_expected.to eq 'Update successful' }
+      end
     end
   end
 
@@ -101,7 +115,14 @@ describe MessageTrain::ConversationsController do
             }
         )
       end
-      it_should_behave_like 'a page with an alert message', 'Nothing to do'
+      it_should_behave_like(
+        'a redirect matching',
+        %r{^http://test\.host/messages/box/in/conversations/\d+$}
+      )
+      context 'sets alert' do
+        subject { flash[:alert] }
+        it { is_expected.to eq 'Nothing to do' }
+      end
     end
     describe 'with valid params' do
       context 'ignoring' do
@@ -116,9 +137,13 @@ describe MessageTrain::ConversationsController do
           )
         end
         it_should_behave_like(
-          'a page with a notice message',
-          'Update successful'
+          'a redirect matching',
+          %r{^http://test\.host/messages/box/in/conversations/\d+$}
         )
+        context 'sets notice' do
+          subject { flash[:notice] }
+          it { is_expected.to eq 'Update successful' }
+        end
       end
       context 'unignoring' do
         before do
@@ -132,9 +157,13 @@ describe MessageTrain::ConversationsController do
           )
         end
         it_should_behave_like(
-          'a page with a notice message',
-          'Update successful'
+          'a redirect matching',
+          %r{^http://test\.host/messages/box/in/conversations/\d+$}
         )
+        context 'sets notice' do
+          subject { flash[:notice] }
+          it { is_expected.to eq 'Update successful' }
+        end
       end
     end
   end

data/spec/controllers/message_train/messages_controller_spec.rb

@@ -132,7 +132,7 @@ describe MessageTrain::MessagesController do
             }
           )
         end
-        it_should_behave_like 'a redirect to', '/box/drafts'
+        it_should_behave_like 'a redirect to', '/messages/box/drafts'
         it_should_behave_like 'a response without error'
 
         context "sets the flash with an alert of the messages's draft status" do
@@ -150,7 +150,7 @@ describe MessageTrain::MessagesController do
             }
           )
         end
-        it_should_behave_like 'a redirect to', '/box/sent'
+        it_should_behave_like 'a redirect to', '/messages/box/sent'
         it_should_behave_like 'a response without error'
 
         context "sets the flash with a notice of the messages's creation" do
@@ -307,7 +307,7 @@ describe MessageTrain::MessagesController do
                 }
               )
             end
-            it_should_behave_like 'a redirect to', '/box/sent'
+            it_should_behave_like 'a redirect to', '/messages/box/sent'
             it_should_behave_like 'a response without error'
 
             context 'updates @message' do
@@ -345,7 +345,7 @@ describe MessageTrain::MessagesController do
             end
             it_should_behave_like(
               'a redirect matching',
-              %r{/box/in/conversations/\d+}
+              %r{/messages/box/in/conversations/\d+}
             )
             it_should_behave_like 'a response without error'
 

data/spec/dummy/app/assets/stylesheets/application.scss

@@ -1,20 +1,149 @@
-// 'bootstrap-sprockets' must be imported before 'bootstrap' and 'bootstrap/variables'
-@import 'bootstrap-sprockets';
-@import 'bootstrap-everything';
-@import 'bootstrap/theme';
 @import 'message_train';
 
-.navbar-header {
-  overflow: hidden;
+// Without this, the browser's default body margin (8px) keeps .nav-items'
+// full-bleed background from actually reaching the viewport edge.
+body {
+  margin: 0;
 }
 
-.navbar-brand {
-  display: block;
-  width: 300px;
+.top-navigation {
+  a {
+    text-decoration: none;
+  }
+}
+
+// Logo row: plain background, left-aligned (not width-capped/centered
+// like the nav-links bar below it).
+.top-navigation-inner {
+  display: flex;
+  align-items: center;
+  padding: var(--message-train-space-md);
+}
+
+// The nav-links bar sits below the logo row and is full-bleed (edge to
+// edge) rather than width-capped like the rest of the page, so the blue
+// reads as a distinct band across the whole viewport. Its own content
+// (.nav-items-inner) is still width-capped/centered to line up with the
+// logo row and page content above/below it.
+.nav-items {
+  background: var(--message-train-color-accent);
+  color: var(--message-train-color-accent-contrast);
+
+  // Every link in here - top-level (Groups/Inbox dropdown triggers,
+  // Manage Notifications, Sign Out) and nested (the dropdown popover's
+  // own box/collective links) - should read as white against the blue
+  // bar, not just the top level.
+  a {
+    color: inherit;
+  }
+
+  // The dropdown popover (.message-train-dropdown-nav-item ul, in
+  // message_train.scss) normally gets its own light "elevated surface"
+  // background so it stands out as a floating menu over page content -
+  // here it sits over the blue bar instead, so it keeps the same blue
+  // (rather than falling back to that light surface) to stay readable
+  // with the white text above.
+  .message-train-dropdown-nav-item ul {
+    background: var(--message-train-color-accent);
+    border-color: rgba(255, 255, 255, 0.3);
+  }
+}
+
+.nav-items-inner {
+  box-sizing: border-box;
+  max-width: 75rem;
+  margin: 0 auto;
+  padding: var(--message-train-space-sm) var(--message-train-space-md);
+
+  // One list: each collective/box <details> dropdown and each plain
+  // account link (Manage Notifications, Sign Out) is its own <li>, so
+  // this is valid list markup throughout rather than a details element
+  // sitting loose alongside a <ul>. Mobile-first: stacked vertically by
+  // default (gap alone separates items, no divider lines), one row only
+  // once there's room (same 48rem breakpoint the dropdowns themselves
+  // switch at) - subtle left borders between adjacent items only make
+  // sense once they're actually side by side.
+  //
+  // Direct child only (> li) - a dropdown's own popover <ul>/<li> (in
+  // message_train.scss) is nested two levels deeper (li > details > ul >
+  // li), so it's naturally excluded here without extra scoping.
+  > ul {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: var(--message-train-space-md);
+    list-style: none;
+    margin: 0;
+    padding: 0;
+
+    @media (min-width: 48rem) {
+      flex-direction: row;
+      align-items: center;
+      flex-wrap: wrap;
+      // The list is usually narrower than the 75rem-capped bar, so
+      // without this it hugs the left edge of that (invisible) cap
+      // instead of actually centering in the bar.
+      justify-content: center;
+
+      > li + li {
+        border-top: none;
+        border-left: 1px solid rgba(255, 255, 255, 0.3);
+        padding-top: 0;
+        padding-left: var(--message-train-space-md);
+      }
+    }
+  }
+}
+
+// Heading hierarchy: h1 (site-brand, in the persistent top nav) is the
+// largest/heaviest per TYPOGRAPHY.md's Hierarchy rule, h2 (page title)
+// and h3 (subtitle) step down from there. Left unsized, the browser's UA
+// default made h2 render bigger than h1 - exactly backwards.
+h1.site-brand {
+  margin: 0;
+  font-size: var(--message-train-fs-2xl);
+  font-weight: 700;
+
+  a {
+    display: inline-flex;
+    align-items: center;
+    gap: var(--message-train-space-sm);
+    text-decoration: none;
+    color: inherit;
+  }
+}
+
+main.content {
+  padding: var(--message-train-space-md);
+
+  > h2 {
+    margin: 0 0 var(--message-train-space-xs);
+    font-size: var(--message-train-fs-xl);
+    font-weight: 600;
+  }
+
+  > h3 {
+    margin: 0 0 var(--message-train-space-md);
+    font-size: var(--message-train-fs-base);
+    font-weight: 400;
+  }
+}
+
+// Mobile-first (RESPONSIVE.md): single column with the sidebar widget
+// stacking below the main content by default; a real side-by-side
+// sidebar only once there's room for both without cramming either.
+.page-grid {
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: var(--message-train-space-xl);
+
+  @media (min-width: 48rem) {
+    grid-template-columns: 1fr 18rem;
+    align-items: start;
+  }
 }
 
 .logo {
-  float: left;
-  height: 2em;
-  margin: -.5em 1em -.5em 0;
+  height: 1.5em;
+  width: auto;
 }

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
-  include MessageTrain::MessageTrainSupport
+  include MessageTrainSupport
 
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.

data/spec/dummy/app/javascript/application.js

@@ -0,0 +1,4 @@
+// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+import "@hotwired/turbo-rails"
+
+import "controllers"

data/spec/dummy/app/javascript/controllers/application.js

@@ -0,0 +1,9 @@
+import { Application } from "@hotwired/stimulus"
+
+const application = Application.start()
+
+// Configure Stimulus development experience
+application.debug = false
+window.Stimulus   = application
+
+export { application }

data/spec/dummy/app/javascript/controllers/index.js

@@ -0,0 +1,4 @@
+// Import and register all your controllers from the importmap via controllers/**/*_controller
+import { application } from "controllers/application"
+import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
+eagerLoadControllersFrom("controllers", application)

data/spec/dummy/app/models/role.rb

@@ -1,6 +1,6 @@
 class Role < ActiveRecord::Base
   has_and_belongs_to_many :users, join_table: :users_roles
-  belongs_to :resource, polymorphic: true
+  belongs_to :resource, polymorphic: true, optional: true
 
   validates(
     :resource_type,

data/spec/dummy/app/views/active_storage/blobs/_blob.html.erb

@@ -0,0 +1,14 @@
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.representable? %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+  <% end %>
+
+  <figcaption class="attachment__caption">
+    <% if caption = blob.try(:caption) %>
+      <%= caption %>
+    <% else %>
+      <span class="attachment__name"><%= blob.filename %></span>
+      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+    <% end %>
+  </figcaption>
+</figure>

data/spec/dummy/app/views/layouts/_top_navigation.html.haml

@@ -1,7 +1,18 @@
-= navbar container_mode: :inside, class: 'navbar-static-top' do
-  = nav_list class: 'navbar-nav navbar-right' do
-    - if user_signed_in?
-      = collective_boxes_dropdown_list(current_user)
-      = boxes_dropdown_list(current_user)
-      = nav_item 'Manage Notifications', '/unsubscribes'
-      = nav_item 'Sign Out', '/users/sign_out', method: :delete
+%nav.top-navigation
+  .top-navigation-inner
+    %h1.site-brand
+      %a{ href: '/' }
+        %img.logo{ src: image_path('logo.svg'), alt: '' }
+        = MessageTrain.configuration.site_name
+  - if user_signed_in?
+    .nav-items
+      .nav-items-inner
+        %ul
+          - collective_boxes_html = collective_boxes_dropdown_list(current_user)
+          - if collective_boxes_html.present?
+            %li= collective_boxes_html
+          - boxes_html = boxes_dropdown_list(current_user)
+          - if boxes_html.present?
+            %li= boxes_html
+          %li= link_to 'Manage Notifications', message_train.unsubscribes_path
+          %li= link_to 'Sign Out', '/users/sign_out', method: :delete

data/spec/dummy/app/views/layouts/application.html.haml

@@ -1,29 +1,25 @@
-%head
-  = render_title          # For the title tag, including SEO content
-  = render_keywords       # Defaults to what you put in the config file
-  = render_description    # Can be hooked up within a mountable rails engine, too.
-  = responsive_meta_tag   # If you're using the responsive features, you need this in your head
+!!!
+%html
+  %head
+    %title= content_for?(:title) ? content_for(:title) : MessageTrain.configuration.site_name
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
+    = stylesheet_link_tag 'application'
+    = javascript_importmap_tags
+    = csrf_meta_tags
 
-  = stylesheet_link_tag 'application'
+  %body
+    = render 'layouts/top_navigation'
 
-  = render_head_css
-  = javascript_include_tag 'application'
-  = csrf_meta_tags
+    %main.content
+      - if content_for?(:title)
+        %h2= content_for(:title)
+      - if content_for?(:subtitle)
+        %h3= content_for(:subtitle)
+      #alert_area
+        - flash.each do |type, message|
+          .alert{class: flash_alert_class(type)}= message
 
-%body
-  = render 'layouts/top_navigation'
-
-  .container
-    = render_hero_unit
-    .row
-      - if user_signed_in?
-        = message_train_widget
-      = render_widgets 'md', 3
-      .col-md-9.content
-        = render_h1         # For the h1 tag containing the title alone
-        #alert_area
-          = alert_flash_messages
-        = yield
-
-  %footer
-  = render_footer_javascript
+      .page-grid
+        .page-main= yield
+        - if user_signed_in?
+          %aside.page-sidebar= message_train_widget

data/spec/dummy/bin/importmap

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require_relative "../config/application"
+require "importmap/commands"

data/spec/dummy/config/application.rb

@@ -1,11 +1,13 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
+require 'rails'
 # Pick the frameworks you want:
 require 'active_record/railtie'
+require 'active_storage/engine'
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
+require 'action_mailbox/engine'
 require 'action_view/railtie'
-require 'sprockets/railtie'
 # require 'rails/test_unit/railtie'
 
 Bundler.require(*Rails.groups)
@@ -13,22 +15,7 @@ require 'message_train'
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified
-    # here. Application configuration should go into files in
-    # config/initializers -- all .rb files in that directory are automatically
-    # loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record
-    # auto-convert to this zone. Run 'rake -D time' for a list of tasks for
-    # finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from
-    # config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[
-    #   Rails.root.join('my', 'locales', '*.{rb,yml}').to_s
-    # ]
-    # config.i18n.default_locale = :de
+    config.load_defaults 8.1
 
     config.generators do |g|
       g.orm             :active_record
@@ -40,10 +27,10 @@ module Dummy
 
     config.time_zone = 'America/Denver'
     config.active_record.default_timezone = :local
+    config.active_storage.variant_processor = :mini_magick
   end
 end
 
-FactoryGirl.definition_file_paths << MessageTrain::Engine.root.join(
+FactoryBot.definition_file_paths << MessageTrain::Engine.root.join(
   'spec/factories'
 )
-FactoryGirl.reload

data/spec/dummy/config/environments/development.rb

@@ -2,18 +2,24 @@ Rails.application.configure do
   # Settings specified here will take precedence over those in
   # config/application.rb.
 
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  # Make code changes take effect immediately without server restart.
+  config.enable_reloading = true
 
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable Action Controller caching. By default Action Controller caching is disabled.
   config.action_controller.perform_caching = false
 
+  # Change to :null_store to avoid any caching.
+  config.cache_store = :memory_store
+
+  # Store uploaded files on the local file system (see config/storage.yml for options).
+  config.active_storage.service = :local
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
   config.action_mailer.default_url_options = { host: 'localhost:3000' }
@@ -24,20 +30,10 @@ Rails.application.configure do
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
-  # Asset digests allow you to set far-future HTTP expiration dates on all
-  # assets, yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
   # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
+
+  config.secret_key_base = 'ac4907450d833ae9cdd320e25bdeedbf3ecb2617dd15e6' \
+                            '28bd9704882a26eb298f6cc0d5a11543d287de47f39c60' \
+                            'c47e81290600189fe72205f34e84143260c9'
 end