tolaria 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad9a0fd53507635be02a3f66a8e48013e91c7c47
-  data.tar.gz: ec22b6a019726b19695f2dd1bd7d258f143b86b8
+SHA256:
+  metadata.gz: f1088a36bb83f98b7c701665d83a37ad22f6ae9365e3785d9345b98cdd133322
+  data.tar.gz: 9dcab578a3e5a3ec655cfd63307fa9680fedd08534c4654291c37c2f9556e207
 SHA512:
-  metadata.gz: f07432b01569d8849aa1b06d12efe4a42aef9d20698260081f907d1614bbc98eb7ba67c201cd0f3d06f920b9028e8e4ba64da57b7b76e57bce46c6cf813991f9
-  data.tar.gz: 2357aa1ed19e27cb05bb112e4ed006816d2cb0300852516e6cc2cba8f8e1ba534f9cfa8921ef8c35caaa6b0e525023ea6557fda704adab59f6ea667427da4e04
+  metadata.gz: 2a9d67623e2e304f540567358eb7b413a0d70c28d4520f81b4154764f77aacac6a0af3fdfba51155be99bc7279bef621021ebdce322be9704b48bafdabfd4572
+  data.tar.gz: c20a5bc1131b879206200c79e852d03d52893c6ab661e8c1547fcdccd8112fa9a0bdb8e0b15142355bc81544fa9b8d0c267ec894e79f8b9090e622adeab8ead3

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.3.1
+  - 2.6.3
 script: "rake test"

data/README.md

@@ -21,7 +21,7 @@ Tolaria is a [content management system](https://en.wikipedia.org/wiki/Content_m
 - Easily overridable on a case-by-case basis.
 - Designed for use on Heroku, in containers, and on websites with TLS.
 - Modest dependencies.
-- Compatible with Rails 5 and Rails 4.2. 
+- Compatible with Rails 6, 5 and Rails 4.2.
 
 ### Browser Support
 
@@ -32,6 +32,9 @@ Tolaria supports IE10+, Edge, Safari, Chrome, Firefox, iOS, and Chrome for Andro
 Add Tolaria to your project's `Gemfile`:
 
 ```ruby
+# If you are running Rails 6, use Tolaria 3
+gem "tolaria", "~> 3.0"
+
 # If you are running Rails 5, use Tolaria 2
 gem "tolaria", "~> 2.0"
 
@@ -197,7 +200,7 @@ See the [TableHelper documentation](http://www.rubydoc.info/gems/tolaria/Admin/T
 
 Tolaria does not build editing forms for you, but it attempts to help speed up your work by providing a wrapper.
 
-If your model was `BlogPost`, you'll need to create a file in your project at  `app/views/admin/blog_posts/_form.html.erb`. You'll provide the form code that would appear inside the `form_for` block, excluding the submit buttons. The builder variable is `f`.
+If your model was `BlogPost`, you'll need to create a file in your project at `app/views/admin/blog_posts/_form.html.erb`. You'll provide the form code that would appear inside the `form_for` block, excluding the submit buttons. The builder variable is `f`.
 
 ```erb
 <% # app/views/admin/blog_posts/_form.html.erb %>
@@ -268,7 +271,7 @@ By default, Tolaria provides a single search field that searches over all of the
 
 **Important:** This system uses the [Ransack gem][ransack], which you'll need to familiarize yourself with.
 
-If your model was `BlogPost`, you'll need to create a file in your project at  `app/views/admin/blog_posts/_search.html.erb`. You'll provide the form code that would appear inside the `search_form_for` block, excluding the submit buttons. The builder variable is `f`.
+If your model was `BlogPost`, you'll need to create a file in your project at `app/views/admin/blog_posts/_search.html.erb`. You'll provide the form code that would appear inside the `search_form_for` block, excluding the submit buttons. The builder variable is `f`.
 
 ```erb
 <% # app/views/admin/blog_posts/_search.html.erb %>

data/Rakefile

@@ -39,7 +39,7 @@ task :server do
   binding = ENV.fetch("BIND_ON", "0.0.0.0")
   Dir.chdir "#{TOLARIA_ROOT}/test/demo"
   system "./bin/rake db:migrate"
-  exec "./bin/rails server --environment development --bind #{binding} --port #{port}"
+  exec "./bin/rails server --environment development --port #{port}"
 end
 
 desc "Start a Rails console with Tolaria loaded"

data/app/assets/javascripts/admin/admin.js

@@ -2,3 +2,5 @@
 // The actual manifest is stored in base.js.
 
 //= require admin/base.js
+
+FormOrchestrator.initializeViewsOver("body");

data/app/assets/javascripts/admin/base.js

@@ -9,5 +9,3 @@
 //= require_directory ./models
 //= require_directory ./views
 //= require_directory ./views/fields
-
-FormOrchestrator.initializeViewsOver("body");

data/app/assets/javascripts/admin/views/fields/markdown_composer.js

@@ -120,10 +120,37 @@ var MarkdownComposerView = Backbone.View.extend({
       // Wrap each selected line in the syntax
       var replacementText = [];
       var lines = selectedText.match(/^.*((\r\n|\n|\r)|$)/gm);
+
       $.each(lines, function(index, value){
+        // strip new lines
         value = value.replace(/(\r\n|\n|\r)/, '');
-        replacementText.push(buttonOps.before + value + buttonOps.after)
+
+        // Check if selected formatting includes a prefix and/or suffix
+        var hasBefore = buttonOps.before.length > 0;
+        var hasAfter = buttonOps.after.length > 0;
+        var hasBoth = hasBefore && hasAfter;
+
+        // Get prefix and suffix from selected text
+        var before = value.substr(0, buttonOps.before.length);
+        var after = value.substr(-buttonOps.after.length);
+
+        // Remove existing prefix and suffix if already applied to selected text (e.g. bold and italics)
+        if ( hasBoth && before === buttonOps.before && after === buttonOps.after ) {
+          value = value.substr(buttonOps.before.length);
+          value = value.substr(0, value.length - buttonOps.after.length);
+          replacementText.push(value);
+        }
+        // Remove prefix styling if already applied to selected text (e.g. headings, lists, and quotes)
+        else if ( hasBefore && before === buttonOps.before ) {
+          value = value.substr(buttonOps.before.length);
+          replacementText.push(value);
+        }
+        // Add styling
+        else {
+          replacementText.push(buttonOps.before + value + buttonOps.after)
+        }
       });
+
       this.$textarea.selection("replace", {text: replacementText.join("\n")});
     }
     else {

data/app/controllers/tolaria/resource_controller.rb

@@ -31,7 +31,7 @@ class Tolaria::ResourceController < Tolaria::TolariaController
     display_name = Tolaria.display_name(@resource)
 
     if @resource.save
-      flash[:success] = "#{random_blingword} You created the #{@managed_class.model_name.human} “#{display_name}”."
+      flash[:success] = "#{random_blingword} You created the #{@managed_class.navigation_label.singularize} “#{display_name}”."
       return redirect_to form_completion_redirect_path(@managed_class, @resource)
     else
       log_validation_errors!
@@ -53,7 +53,7 @@ class Tolaria::ResourceController < Tolaria::TolariaController
     display_name = Tolaria.display_name(@resource)
 
     if @resource.save
-      flash[:success] = "#{random_blingword} You updated the #{@managed_class.model_name.human.downcase} “#{display_name}”."
+      flash[:success] = "#{random_blingword} You updated the #{@managed_class.navigation_label.singularize.downcase} “#{display_name}”."
       return redirect_to form_completion_redirect_path(@managed_class, @resource)
     else
       log_validation_errors!
@@ -75,7 +75,7 @@ class Tolaria::ResourceController < Tolaria::TolariaController
       return redirect_to form_completion_redirect_path(@managed_class, @resource)
     end
 
-    flash[:destructive] = "You deleted the #{@managed_class.model_name.human.downcase} “#{display_name}”."
+    flash[:destructive] = "You deleted the #{@managed_class.navigation_label.singularize.downcase} “#{display_name}”."
     return redirect_to form_completion_redirect_path(@managed_class)
 
   end

data/app/helpers/admin/view_helper.rb

@@ -50,7 +50,7 @@ module Admin::ViewHelper
 
   # Returns a deletion warning message for the given ActiveRecord instance
   def deletion_warning(resource)
-    return %{Are you sure you want to delete the #{resource.model_name.human.downcase} “#{Tolaria.display_name(resource)}”? This action is not reversible.}
+    return %{Are you sure you want to delete the #{@managed_class.navigation_label.singularize.downcase} “#{Tolaria.display_name(resource)}”? This action is not reversible.}
   end
 
   # Returns the correct value to pass to the `url:` of `form_for`,

data/app/views/admin/shared/_navigation.html.erb

@@ -9,7 +9,7 @@
           <% if managed_class.allows?(:index) %>
             <li>
               <%= tolaria_navigation_link(
-                managed_class.model_name.human.pluralize.titleize,
+                managed_class.navigation_label,
                 managed_class.icon,
                 url_for(action:"index", controller:managed_class.plural)
               ) %>

data/app/views/admin/tolaria_resource/_index_table.html.erb

@@ -5,13 +5,13 @@
   <div class="blank-slate">
     <span class="blank-slate-icons"><%= fontawesome_icon @managed_class.icon %></span>
     <h3 class="blank-slate-header">
-      No <%= @managed_class.model_name.human.pluralize.titleize %> live here.
+      No <%= @managed_class.navigation_label %> live here.
     </h3>
     <% if @managed_class.allows?(:new) %>
       <p class="blank-slate-text">Get started on the first one:</p>
       <%= link_to url_for(action:"new"), class:"button -primary" do %>
         <%= fontawesome_icon :plus %>
-        New <%= @managed_class.model_name.human.titleize %>
+        New <%= @managed_class.navigation_label.singularize %>
       <% end %>
     <% end %>
   </div>
@@ -23,7 +23,7 @@
   <div class="blank-slate">
     <span class="blank-slate-icons"><%= fontawesome_icon :search %></span>
     <h3 class="blank-slate-header">
-      Your search didn't find any <%= @managed_class.model_name.human.pluralize.titleize %>.
+      Your search didn't find any <%= @managed_class.navigation_label %>.
     </h3>
     <p class="blank-slate-text">
       You can <%= link_to "clear the search form", url_for([:admin, @managed_class.klass]) %>

data/app/views/admin/tolaria_resource/_search_form.html.erb

@@ -19,7 +19,7 @@
     <div class="search-form-controlls">
       <%= f.button type:"submit", class:"button -primary", name:nil do %>
         <%= fontawesome_icon :search %>
-        Search <%= @managed_class.model_name.human.pluralize.titleize %>
+        Search <%= @managed_class.navigation_label %>
       <% end %>
       <%= link_to url_for([:admin, @managed_class.klass]), class:"button" do %>
         <%= fontawesome_icon :close %>

data/app/views/admin/tolaria_resource/_show_buttons.html.erb

@@ -8,6 +8,6 @@
 <% if @managed_class.allows?(:edit) %>
   <%= link_to url_for(action:"edit", id:@resource.id), class:"button -primary" do %>
     <%= fontawesome_icon :pencil %>
-    Edit This <%= @managed_class.model_name.human.titleize %>
+    Edit This <%= @managed_class.navigation_label.singularize %>
   <% end %>
 <% end %>

data/app/views/admin/tolaria_resource/edit.html.erb

@@ -1,7 +1,7 @@
 <% if @resource.persisted? %>
   <%= content_for :title, "#{Tolaria.display_name(@resource)}" %>
 <% else %>
-  <%= content_for :title, "New #{@managed_class.model_name.human.titleize}" %>
+  <%= content_for :title, "New #{@managed_class.navigation_label.singularize}" %>
 <% end %>
 
 <%= form_for [:admin, @resource], url:contextual_form_url, builder:Admin::FormBuilder, html:{class:"resource-form"}  do |form_builder| %>
@@ -27,9 +27,9 @@
         <span class="crumb">
           <%= fontawesome_icon @managed_class.icon %>
           <% if @managed_class.allows? :index %>
-            <%= link_to @managed_class.model_name.human.pluralize.titleize, url_for(action:"index", controller:@managed_class.plural, q:ransack_params, p:page_param) %>
+            <%= link_to @managed_class.navigation_label, url_for(action:"index", controller:@managed_class.plural, q:ransack_params, p:page_param) %>
           <% else %>
-            <%= @managed_class.model_name.human.pluralize.titleize %>
+            <%= @managed_class.navigation_label %>
           <% end %>
         </span>
         <%= content_for :title %>

data/app/views/admin/tolaria_resource/index.html.erb

@@ -1,4 +1,4 @@
-<%= content_for :title, "#{@managed_class.model_name.human.pluralize.titleize}" %>
+<%= content_for :title, "#{@managed_class.navigation_label}" %>
 
 <div class="main-controls">
 
@@ -28,7 +28,7 @@
     <% if @managed_class.allows?(:new) %>
       <%= link_to url_for(action:"new", q:ransack_params, p:page_param), class:"button -primary" do %>
         <%= fontawesome_icon :plus %>
-        New <%= @managed_class.model_name.human.titleize %>
+        New <%= @managed_class.navigation_label.singularize %>
       <% end %>
     <% end %>
 

data/app/views/admin/tolaria_resource/show.html.erb

@@ -7,9 +7,9 @@
       <span class="crumb">
         <%= fontawesome_icon @managed_class.icon %>
         <% if @managed_class.allows? :index %>
-          <%= link_to @managed_class.model_name.human.pluralize.titleize, url_for(action:"index", controller:@managed_class.plural, q:ransack_params, p:page_param) %>
+          <%= link_to @managed_class.navigation_label, url_for(action:"index", controller:@managed_class.plural, q:ransack_params, p:page_param) %>
         <% else %>
-          <%= @managed_class.model_name.human.pluralize.titleize %>
+          <%= @managed_class.navigation_label %>
         <% end %>
       </span>
       <%= content_for :title %>

data/lib/tolaria/active_record.rb

@@ -36,6 +36,9 @@ class ActiveRecord::Base
   #   Tolaria will pass this array as the `only:` option to the router.
   #   The default includes all CRUD actions:
   #   `[:index, :show, :new, :create, :edit, :update, :destroy]`
+  # - `:navigation_label` - By default, Tolaria will label buttons, headers, and other view elements for 
+  #   this model using the string obtained from `self.model_name.human.pluralize.titleize`. 
+  #   This setting provides an override label that Tolaria will use instead. 
   #
   # #### Example
   #

data/lib/tolaria/managed_class.rb

@@ -34,9 +34,12 @@ module Tolaria
     # A stored symbol for the `params.permit` key for this resource
     attr_accessor :param_key
 
+    # A String to override the model's label in the primary admin navigation
+    attr_accessor :navigation_label
+
     # A factory method that registers a new model in Tolaria and configures
     # its menu and param settings. Developers should use `ActiveRecord::Base.manage_with_tolaria`
-    def self.create(klass, icon:"file-o", permit_params:[], priority:10, category:"Settings", default_order:"id DESC", paginated:true, allowed_actions:[:index, :show, :new, :create, :edit, :update, :destroy])
+    def self.create(klass, icon:"file-o", permit_params:[], priority:10, category:"Settings", default_order:"id DESC", paginated:true, allowed_actions:[:index, :show, :new, :create, :edit, :update, :destroy], navigation_label: klass.model_name.human.pluralize.titleize)
 
       managed_class = self.new
       managed_class.klass = klass
@@ -49,6 +52,7 @@ module Tolaria
       managed_class.paginated = paginated.present?
       managed_class.permitted_params = permit_params.freeze
       managed_class.allowed_actions = allowed_actions.freeze
+      managed_class.navigation_label = navigation_label.freeze
 
       # Set auto-generated attributes
       managed_class.controller_name = "#{managed_class.model_name.collection.camelize}Controller".freeze

data/lib/tolaria/version.rb

@@ -2,7 +2,7 @@ module Tolaria
 
   # Returns Tolaria’s version number
   def self.version
-    Gem::Version.new("2.0.4")
+    Gem::Version.new("3.0.0")
   end
 
   module VERSION

data/test/demo/app/models/video.rb

@@ -4,11 +4,12 @@ class Video < ApplicationRecord
   validates_presence_of :youtube_id
 
   manage_with_tolaria using:{
+    navigation_label: "YouTube Videos",
     icon: "youtube-play",
     category: "Media",
     permit_params: [
       :title,
-      :yotube_id,
+      :youtube_id,
       :description,
     ],
   }

data/test/demo/db/schema.rb

@@ -2,104 +2,104 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150610135235) do
+ActiveRecord::Schema.define(version: 2015_06_10_135235) do
 
   create_table "administrators", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "email",                                      null: false
-    t.string   "name",                                       null: false
-    t.string   "organization",                               null: false
-    t.string   "passcode",            limit: 60,             null: false
-    t.datetime "passcode_expires_at",                        null: false
-    t.string   "auth_token",          limit: 32,             null: false
-    t.datetime "account_unlocks_at",                         null: false
-    t.integer  "lockout_strikes",                default: 0, null: false
-    t.integer  "total_strikes",                  default: 0, null: false
-    t.integer  "sessions_created",               default: 0, null: false
+    t.string "email", null: false
+    t.string "name", null: false
+    t.string "organization", null: false
+    t.string "passcode", limit: 60, null: false
+    t.datetime "passcode_expires_at", null: false
+    t.string "auth_token", limit: 32, null: false
+    t.datetime "account_unlocks_at", null: false
+    t.integer "lockout_strikes", default: 0, null: false
+    t.integer "total_strikes", default: 0, null: false
+    t.integer "sessions_created", default: 0, null: false
     t.index ["auth_token"], name: "index_administrators_on_auth_token"
     t.index ["email"], name: "index_administrators_on_email"
   end
 
   create_table "blog_post_topics", force: :cascade do |t|
     t.integer "blog_post_id", null: false
-    t.integer "topic_id",     null: false
+    t.integer "topic_id", null: false
     t.index ["blog_post_id"], name: "index_blog_post_topics_on_blog_post_id"
     t.index ["topic_id"], name: "index_blog_post_topics_on_topic_id"
   end
 
   create_table "blog_posts", force: :cascade do |t|
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
-    t.string   "title",        null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "title", null: false
     t.datetime "published_at", null: false
-    t.text     "summary"
-    t.text     "body"
-    t.string   "color"
-    t.text     "portrait"
-    t.text     "attachment"
+    t.text "summary"
+    t.text "body"
+    t.string "color"
+    t.text "portrait"
+    t.text "attachment"
   end
 
   create_table "footnotes", force: :cascade do |t|
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
-    t.integer  "blog_post_id", null: false
-    t.text     "description"
-    t.text     "url"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "blog_post_id", null: false
+    t.text "description"
+    t.text "url"
     t.index ["blog_post_id"], name: "index_footnotes_on_blog_post_id"
   end
 
   create_table "images", force: :cascade do |t|
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
-    t.string   "title",              null: false
-    t.text     "alternate_text"
-    t.text     "credit"
-    t.text     "keywords"
-    t.text     "attachment_address", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "title", null: false
+    t.text "alternate_text"
+    t.text "credit"
+    t.text "keywords"
+    t.text "attachment_address", null: false
   end
 
   create_table "legal_pages", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string   "title",      null: false
-    t.string   "slug",       null: false
-    t.text     "summary",    null: false
-    t.text     "body"
+    t.string "title", null: false
+    t.string "slug", null: false
+    t.text "summary", null: false
+    t.text "body"
     t.index ["slug"], name: "index_legal_pages_on_slug"
   end
 
   create_table "miscellany", force: :cascade do |t|
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.string   "key",         null: false
-    t.text     "value",       null: false
-    t.text     "description", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "key", null: false
+    t.text "value", null: false
+    t.text "description", null: false
     t.index ["key"], name: "index_miscellany_on_key"
   end
 
   create_table "topics", force: :cascade do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "label",      null: false
-    t.string   "slug",       null: false
+    t.string "label", null: false
+    t.string "slug", null: false
     t.index ["slug"], name: "index_topics_on_slug"
   end
 
   create_table "videos", force: :cascade do |t|
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.string   "title",       null: false
-    t.string   "youtube_id",  null: false
-    t.string   "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "title", null: false
+    t.string "youtube_id", null: false
+    t.string "description"
   end
 
 end

data/test/integration/filter_preservation_test.rb

@@ -16,7 +16,7 @@ class FilterPreservationTest < ActionDispatch::IntegrationTest
     find_link("Organization").click
     find_link("Nintendo").click
     first(".crumb a").click
-    assert page.current_url.include?("q[s]=organization+asc"), "filter not retained"
+    assert page.current_url.include?("q%5Bs%5D=organization+asc"), "filter not retained"
   end
 
   test "after filtering index, should retain filter on edit and back with button" do
@@ -25,7 +25,7 @@ class FilterPreservationTest < ActionDispatch::IntegrationTest
     find_link("Organization").click
     find_link("Nintendo").click
     first(".button.-cancel").click
-    assert page.current_url.include?("q[s]=organization+asc"), "filter should be retained"
+    assert page.current_url.include?("q%5Bs%5D=organization+asc"), "filter should be retained"
   end
 
   test "after filtering index, should retain filter on edit and save" do
@@ -34,7 +34,7 @@ class FilterPreservationTest < ActionDispatch::IntegrationTest
     find_link("Organization").click
     find_link("Nintendo").click
     first(".button.-save").click
-    assert page.current_url.include?("q[s]=organization+asc"), "filter not retained"
+    assert page.current_url.include?("q%5Bs%5D=organization+asc"), "filter not retained"
   end
 
   test "after filtering index, should retain filter on edit and failed validation" do
@@ -45,7 +45,7 @@ class FilterPreservationTest < ActionDispatch::IntegrationTest
     fill_in("administrator[email]", with:"")
     first(".button.-save").click
     first(".button.-cancel").click
-    assert page.current_url.include?("q[s]=organization+asc"), "filter retained"
+    assert page.current_url.include?("q%5Bs%5D=organization+asc"), "filter retained"
   end
 
   test "after filtering index, should NOT retain filter on save and review" do
@@ -54,7 +54,7 @@ class FilterPreservationTest < ActionDispatch::IntegrationTest
     find_link("Organization").click
     find_link("Nintendo").click
     first(".button.-save-and-review").click
-    assert page.current_url.exclude?("q[s]=organization+asc"), "filter not retained"
+    assert page.current_url.exclude?("q%5Bs%5D=organization+asc"), "filter not retained"
   end
 
 end

data/test/integration/forbidden_routes_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class CreateCardsMigration < ActiveRecord::Migration
+class CreateCardsMigration < ActiveRecord::Migration[5.0]
   def change
     create_table :cards, force:true do |t|
       t.timestamps null:false

data/test/integration/navigation_label_test.rb

@@ -0,0 +1,45 @@
+require "test_helper"
+
+class NavigationLabelTest < ActionDispatch::IntegrationTest
+
+  def setup
+    Video.destroy_all
+  end
+
+  def teardown
+    Video.destroy_all
+  end
+
+  test "navigation label is overidden" do
+
+    sign_in_dummy_administrator!
+
+    # index view is overridden
+    visit("/admin/videos")
+    assert page.has_content?("YouTube Videos")
+    assert page.has_content?("New YouTube Video")
+    assert page.has_content?("No YouTube Videos live here")
+
+    # new/edit view is overriden
+    first(".button.-primary").click
+    assert page.has_content?("New YouTube Video")
+    fill_in("video[title]", with:"Neko Atsume")
+    fill_in("video[youtube_id]", with:"xxxxxxxxxxx")
+    first(".button[name=save]").click
+
+    # created flash message is overridden
+    assert page.has_content?("created the YouTube Video"), "should see flash message"
+
+    # show view is overriden
+    find_link("Inspect").click
+    assert page.has_content?("YouTube Videos")
+    assert page.has_content?("Edit This YouTube Video")
+
+    # updated flash message is overriden
+    first(".button.-primary").click
+    first(".button[name=save]").click
+    assert page.has_content?("updated the youtube video"), "should see flash message"
+
+  end
+
+end

data/test/integration/session_test.rb

@@ -33,8 +33,8 @@ class SessionTest < ActionDispatch::IntegrationTest
 
   test "admin form fields should be empty" do
     visit "/admin/signin"
-    assert_equal nil, find("#session-form-email").value()
-    assert_equal nil, find("#session-form-passcode", visible:false).value()
+    assert_nil find("#session-form-email").value
+    assert_nil find("#session-form-passcode", visible: false).value
   end
 
   test "session form doesn't explode when junk submitted" do

data/test/unit/managed_classes_test.rb

@@ -6,6 +6,7 @@ class ManagedClassesTest < ActiveSupport::TestCase
 
     class ::Card < ActiveRecord::Base
       manage_with_tolaria using:{
+        navigation_label: "Widgets",
         icon: "credit-card",
         priority: 5,
         category: "Payments",
@@ -32,6 +33,9 @@ class ManagedClassesTest < ActiveSupport::TestCase
     assert_equal managed_class.allowed_actions, [:index, :show]
     assert managed_class.paginated, true
 
+    # Can we override the navigation label?
+    assert_equal managed_class.navigation_label, "Widgets"
+
     # Can we check action allowances?
     assert managed_class.allows?(:index), "should allow `index` action"
     assert managed_class.allows?(:show), "should allow `show` action"

data/test/unit/menu_test.rb

@@ -9,7 +9,7 @@ class MenuTest < ActiveSupport::TestCase
   test "menu categories supersede class categories" do
     old_setting = Tolaria.config.menu_categories
     Tolaria.config.menu_categories = ["Bull", "Krem"]
-    assert_equal ["Bull", "Krem", "Settings", "Prose", "Media"], Tolaria.categories
+    assert_equal ["Bull", "Krem", "Settings", "Media", "Prose"], Tolaria.categories
     Tolaria.config.menu_categories = old_setting
   end
 

data/tolaria.gemspec

@@ -17,17 +17,18 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files --directory test`.split("\n")
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.3"
+
+  s.required_ruby_version = ">= 2.6"
 
   s.add_dependency "bcrypt", "~> 3.1"
-  s.add_dependency "kaminari", "~> 0.16"
-  s.add_dependency "rails", "~> 5.0"
-  s.add_dependency "ransack", "~> 1.8"
-  s.add_dependency "sass-rails", "~> 5.0"
+  s.add_dependency "kaminari", "~> 1.1.1"
+  s.add_dependency "rails", "~> 6.0.0"
+  s.add_dependency "ransack", "~> 2.3"
+  s.add_dependency "sass-rails", "~> 6.0"
   s.add_dependency "sass", "~> 3.0"
 
-  s.add_development_dependency "capybara", "~> 2.4"
-  s.add_development_dependency "minitest", "~> 5.7"
+  s.add_development_dependency "capybara", "~> 3.28"
+  s.add_development_dependency "minitest", "~> 5.11"
   s.add_development_dependency "redcarpet", "~> 3"
   s.add_development_dependency "sqlite3", "~> 1.3"
   s.add_development_dependency "timecop", "~> 0.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolaria
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Corey Csuhta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -31,56 +31,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.28'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.7'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +398,7 @@ files:
 - test/integration/filter_preservation_test.rb
 - test/integration/forbidden_routes_test.rb
 - test/integration/help_link_test.rb
+- test/integration/navigation_label_test.rb
 - test/integration/pagination_test.rb
 - test/integration/router_test.rb
 - test/integration/session_test.rb
@@ -420,15 +421,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Rails CMS framework for making people happy.
@@ -494,6 +494,7 @@ test_files:
 - test/integration/filter_preservation_test.rb
 - test/integration/forbidden_routes_test.rb
 - test/integration/help_link_test.rb
+- test/integration/navigation_label_test.rb
 - test/integration/pagination_test.rb
 - test/integration/router_test.rb
 - test/integration/session_test.rb