tb_cms 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cf2fe4b361b6f73b675c9c263b53be34c0a80c60
-  data.tar.gz: 2b8ced4d2cfdd18bd7578f2dadc284dcf89cb9e7
+SHA256:
+  metadata.gz: d674e42a14812fcc99fc125a85514ba33f016752e5cdcc7c4d7319e841505ea3
+  data.tar.gz: 5b1669484dff7f06e78db700051107954229d95ec11819a3d05144d5929fe050
 SHA512:
-  metadata.gz: fb80687cde5988b4b9151c31e711c4487807d6d794a398da68bb6f606957194cbd8f5e58c8c51d3a0654ade1b0efa43386c0b8ffe9fb8a937018b603e64e9817
-  data.tar.gz: 0a11371e6df82a12cd4d0652d4a6ab6db7580cd58d8e95b9568573327dc5b8c5fb88637bdc2331a9cd9b9ffda839028476f69cad20adb7e55b22b0d1b8b81d47
+  metadata.gz: b819655bcdbb65fc611da5ddbba4a159dcb9a495d05fbcbd46b7c8d04351d014b8d974b0889b2fb0b53162a089658b99cbe69a190b88916699fbfa97e9240a59
+  data.tar.gz: 6583b6a1d64056748b9252381e51d6cfda5949c7b119ed0a731e7b5e382cb9522e0e6355d1a9392ba36ed50509d2c3b9c233ed389f037a16a1d77e42f392e88a

data/app/controllers/pages_controller.rb

@@ -12,7 +12,7 @@ class PagesController < ApplicationController
     end
 
     url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
-    @page = SpudPage.published_pages.find_by(url_name: url_name)
+    @page = SpudPage.published_pages.find_ignoring_case(url_name)
 
     if @page.blank?
       render_404

data/app/models/spud_page.rb

@@ -59,6 +59,10 @@ class SpudPage < ActiveRecord::Base
     return visibility == 1
   end
 
+  def self.find_ignoring_case(url_name)
+    find_by(arel_table[:url_name].matches(url_name))
+  end
+
   private
 
   def generate_url_name

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Cms
-    VERSION = '1.3.3'.freeze
+    VERSION = '1.3.5'.freeze
   end
 end

data/spec/dummy/config/database.yml

@@ -4,12 +4,9 @@
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
 development:
-  adapter: mysql2
+  adapter: postgresql
   database: spud_cms_development
-  username: root
-  
+
 test:
-  adapter: mysql2
+  adapter: postgresql
   database: spud_cms_test
-  username: root
-

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

@@ -23,11 +23,11 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false

data/spec/dummy/db/schema.rb

@@ -12,163 +12,166 @@
 
 ActiveRecord::Schema.define(version: 20160215180157) do
 
-  create_table "spud_menu_items", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "parent_type"
-    t.integer  "parent_id"
-    t.integer  "item_type"
-    t.integer  "spud_page_id"
-    t.integer  "menu_order",   default: 0
-    t.string   "url"
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "spud_menu_items", id: :serial, force: :cascade do |t|
+    t.string "parent_type"
+    t.integer "parent_id"
+    t.integer "item_type"
+    t.integer "spud_page_id"
+    t.integer "menu_order", default: 0
+    t.string "url"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name"
-    t.integer  "spud_menu_id"
-    t.string   "classes"
-    t.index ["menu_order"], name: "index_spud_menu_items_on_menu_order", using: :btree
-    t.index ["parent_type", "parent_id"], name: "index_spud_menu_items_on_parent_type_and_parent_id", using: :btree
-    t.index ["spud_menu_id"], name: "index_spud_menu_items_on_spud_menu_id", using: :btree
+    t.string "name"
+    t.integer "spud_menu_id"
+    t.string "classes"
+    t.index ["menu_order"], name: "index_spud_menu_items_on_menu_order"
+    t.index ["parent_type", "parent_id"], name: "index_spud_menu_items_on_parent_type_and_parent_id"
+    t.index ["spud_menu_id"], name: "index_spud_menu_items_on_spud_menu_id"
   end
 
-  create_table "spud_menus", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
-    t.text     "description", limit: 65535
+  create_table "spud_menus", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.text "description"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_page_partial_revisions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
-    t.text     "content",      limit: 65535
-    t.string   "format"
-    t.integer  "spud_page_id"
+  create_table "spud_page_partial_revisions", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.text "content"
+    t.string "format"
+    t.integer "spud_page_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["spud_page_id", "name"], name: "revision_idx", using: :btree
+    t.index ["spud_page_id", "name"], name: "revision_idx"
   end
 
-  create_table "spud_page_partials", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "spud_page_id"
-    t.string   "name"
-    t.text     "content",           limit: 65535
-    t.string   "format"
+  create_table "spud_page_partials", id: :serial, force: :cascade do |t|
+    t.integer "spud_page_id"
+    t.string "name"
+    t.text "content"
+    t.string "format"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "symbol_name"
-    t.text     "content_processed", limit: 65535
-    t.index ["spud_page_id"], name: "index_spud_page_partials_on_spud_page_id", using: :btree
+    t.string "symbol_name"
+    t.text "content_processed"
+    t.index ["spud_page_id"], name: "index_spud_page_partials_on_spud_page_id"
   end
 
-  create_table "spud_pages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
-    t.string   "url_name"
+  create_table "spud_pages", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.string "url_name"
     t.datetime "publish_at"
-    t.integer  "created_by"
-    t.integer  "updated_by"
-    t.string   "format",                            default: "html"
-    t.integer  "spud_page_id"
-    t.text     "meta_description",    limit: 65535
-    t.string   "meta_keywords"
-    t.integer  "page_order"
+    t.integer "created_by"
+    t.integer "updated_by"
+    t.string "format", default: "html"
+    t.integer "spud_page_id"
+    t.text "meta_description"
+    t.string "meta_keywords"
+    t.integer "page_order"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "visibility",                        default: 0
-    t.boolean  "published",                         default: true
-    t.boolean  "use_custom_url_name",               default: false
-    t.text     "notes",               limit: 65535
-    t.string   "layout"
-    t.string   "page_title"
+    t.integer "visibility", default: 0
+    t.boolean "published", default: true
+    t.boolean "use_custom_url_name", default: false
+    t.text "notes"
+    t.string "layout"
+    t.string "page_title"
   end
 
-  create_table "spud_permalinks", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "url_name"
-    t.string   "attachment_type"
-    t.integer  "attachment_id"
+  create_table "spud_permalinks", id: :serial, force: :cascade do |t|
+    t.string "url_name"
+    t.string "attachment_type"
+    t.integer "attachment_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "site_id",         default: 0, null: false
-    t.index ["attachment_type", "attachment_id"], name: "idx_permalink_attachment", using: :btree
-    t.index ["site_id"], name: "idx_permalinks_site_id", using: :btree
+    t.integer "site_id", default: 0, null: false
+    t.index ["attachment_type", "attachment_id"], name: "idx_permalink_attachment"
+    t.index ["site_id"], name: "idx_permalinks_site_id"
   end
 
-  create_table "spud_permissions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name",       null: false
-    t.string   "tag",        null: false
+  create_table "spud_permissions", id: :serial, force: :cascade do |t|
+    t.string "name", null: false
+    t.string "tag", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
+    t.index ["tag"], name: "index_spud_permissions_on_tag", unique: true
   end
 
-  create_table "spud_role_permissions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "spud_role_id",        null: false
-    t.string   "spud_permission_tag", null: false
+  create_table "spud_role_permissions", id: :serial, force: :cascade do |t|
+    t.integer "spud_role_id", null: false
+    t.string "spud_permission_tag", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
-    t.index ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
+    t.index ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag"
+    t.index ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id"
   end
 
-  create_table "spud_roles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
+  create_table "spud_roles", id: :serial, force: :cascade do |t|
+    t.string "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_snippets", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "name"
-    t.text     "content",           limit: 65535
-    t.string   "format"
-    t.text     "content_processed", limit: 65535
+  create_table "spud_snippets", id: :serial, force: :cascade do |t|
+    t.string "name"
+    t.text "content"
+    t.string "format"
+    t.text "content_processed"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["name"], name: "index_spud_snippets_on_name", using: :btree
+    t.index ["name"], name: "index_spud_snippets_on_name"
   end
 
-  create_table "spud_user_settings", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
+  create_table "spud_user_settings", id: :serial, force: :cascade do |t|
+    t.integer "spud_user_id"
+    t.string "key"
+    t.string "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "first_name"
-    t.string   "last_name"
-    t.boolean  "super_admin"
-    t.string   "login",                                    null: false
-    t.string   "email",                                    null: false
-    t.string   "crypted_password",                         null: false
-    t.string   "password_salt",                            null: false
-    t.string   "persistence_token",                        null: false
-    t.string   "single_access_token",                      null: false
-    t.string   "perishable_token",                         null: false
-    t.integer  "login_count",              default: 0,     null: false
-    t.integer  "failed_login_count",       default: 0,     null: false
+  create_table "spud_users", id: :serial, force: :cascade do |t|
+    t.string "first_name"
+    t.string "last_name"
+    t.boolean "super_admin"
+    t.string "login", null: false
+    t.string "email", null: false
+    t.string "crypted_password", null: false
+    t.string "password_salt", null: false
+    t.string "persistence_token", null: false
+    t.string "single_access_token", null: false
+    t.string "perishable_token", null: false
+    t.integer "login_count", default: 0, null: false
+    t.integer "failed_login_count", default: 0, null: false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
+    t.string "current_login_ip"
+    t.string "last_login_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "time_zone"
-    t.integer  "spud_role_id"
-    t.boolean  "requires_password_change", default: false
-    t.index ["email"], name: "index_spud_users_on_email", using: :btree
-    t.index ["login"], name: "index_spud_users_on_login", using: :btree
-    t.index ["spud_role_id"], name: "index_spud_users_on_spud_role_id", using: :btree
+    t.string "time_zone"
+    t.integer "spud_role_id"
+    t.boolean "requires_password_change", default: false
+    t.index ["email"], name: "index_spud_users_on_email"
+    t.index ["login"], name: "index_spud_users_on_login"
+    t.index ["spud_role_id"], name: "index_spud_users_on_spud_role_id"
   end
 
-  create_table "tb_redirects", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.string   "owner_type"
-    t.integer  "owner_id"
-    t.string   "source",      null: false
-    t.string   "destination", null: false
-    t.string   "created_by"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
-    t.index ["owner_type", "owner_id"], name: "index_tb_redirects_on_owner_type_and_owner_id", using: :btree
-    t.index ["source"], name: "index_tb_redirects_on_source", unique: true, using: :btree
+  create_table "tb_redirects", id: :serial, force: :cascade do |t|
+    t.string "owner_type"
+    t.integer "owner_id"
+    t.string "source", null: false
+    t.string "destination", null: false
+    t.string "created_by"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["owner_type", "owner_id"], name: "index_tb_redirects_on_owner_type_and_owner_id"
+    t.index ["source"], name: "index_tb_redirects_on_source", unique: true
   end
 
 end

data/spec/models/spud_page_spec.rb

@@ -92,4 +92,12 @@ describe SpudPage, type: :model do
     end
   end
 
+  describe '.find_ignoring_case' do
+    it 'finds the page ignoring case' do
+      page = FactoryBot.create(:spud_page, url_name: 'HEy-guyS-lETS-Mix-CAsE')
+      found = SpudPage.find_ignoring_case('hey-guys-lets-mix-case')
+      expect(page).to eq(found)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
 platform: ruby
 authors:
 - Moser Consulting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.beta1
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -337,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Twice Baked CMS