Merge pull request #73 from Threespot/v3.0

v3.0

Author: danielboggs

.travis.yml

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

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 %>

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"

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

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

test/integration/filter_preservation_test.rb

@@ -16,7 +16,7 @@ def teardown
     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 @@ def teardown
     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 @@ def teardown
     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 @@ def teardown
     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 @@ def teardown
     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

test/integration/session_test.rb

@@ -33,8 +33,8 @@ def assert_failed_authentication!
 
   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

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
 

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"