tolaria 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0021b04069a27736d350b9f50b850b91831a3e4
-  data.tar.gz: 781b231085124aefc9b43dcc9f8853c04434f732
+  metadata.gz: 8a8632ffd73133959fb3a8893109fca1491bdb7c
+  data.tar.gz: 083d48b6aded6a19ed88945c639df67ae2b06202
 SHA512:
-  metadata.gz: 7d90b23e835165a2c63b2278a7ec5801a02071529b5a650884c5383ec63d90da5eb58cae007c2c4cd34f7292a731d9e2d5449e63611ab89f5598fbeeb217e896
-  data.tar.gz: 58dbc2c40aea7359284175422113518e0c92021bb2a3568447b7cc652879748453731fa5a4233282b291b6d03d4dd493565c3bc7617d52a805ca98b564e19d65
+  metadata.gz: f337e69d3db9ca302952ae78ed0bb2d33455aeb7fd502502812fd63107913fc1363b8821dd0c3a90d7da2854cdc4adfd44211b814c843dd68c01f3e8eabb4cdd
+  data.tar.gz: 5e58da0e79dded8cf09851e28a9923228ce204488fdce06cb4aa403c663fa17bbe7a9283d1ed526aac25d5bc0a7cdb9098b4426f9f69ec8678f24a2eb1ef562f

data/.travis.yml

@@ -1,6 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.2.4
-  - 2.3.0
+  - 2.3.1
 script: "rake test"

data/README.md

@@ -21,20 +21,25 @@ 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. 
 
 ### Browser Support
 
-Tolaria supports IE10+, Safari, Chrome, Firefox, iOS, and Chrome for Android. Note that these are the browsers your site editors will need, not the general site audience, which can differ.
+Tolaria supports IE10+, Edge, Safari, Chrome, Firefox, iOS, and Chrome for Android. Note that these are the browsers your site editors will need, not the general site audience, which can differ.
 
 ### Getting Started
 
 Add Tolaria to your project's `Gemfile`:
 
 ```ruby
-gem "tolaria"
+# If you are running Rails 5, use Tolaria 2
+gem "tolaria", "~> 2.0"
+
+# If you are running Rails 4.2, use Tolaria 1.2
+gem "tolaria", "~> 1.2"
 ```
 
-Then update your bundle.
+Then update your bundle with `bundle update`
 
 Now run the installation generator. This will create an initializer for Tolaria plus a migration to set up an `administrators` table. Migrate your database.
 

data/Rakefile

@@ -11,6 +11,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
   t.verbose = false
+  t.warning = false
 end
 
 task default: :test

data/app/assets/stylesheets/admin/components/_navigation.scss

@@ -8,20 +8,15 @@
     @include clearfix;
     background-color: $cCoolGrey;
     border-bottom: 3px double $cGrey;
-    margin-left: -20px;
-    margin-right: -20px;
+    left: 0;
+    margin: 0;
     padding: 10px 20px 20px 20px;
-
-    .js & {
-      left: 0;
-      margin: 0;
-      position: absolute;
-      width: 100%;
-      transition: transform 300ms cubic-bezier(0.215, 0.61, 0.355, 1);
-      transform: translateY(-100%);
-      &.-open {
-        transform: translateY(0);
-      }
+    position: absolute;
+    transform: translateY(-100%);
+    transition: transform 300ms cubic-bezier(0.215, 0.61, 0.355, 1);
+    width: 100%;
+    &.-open {
+      transform: translateY(0);
     }
 
   }

data/app/assets/stylesheets/admin/components/_resource_form.scss

@@ -79,8 +79,24 @@
       outline: none;
     }
 
+    &:disabled {
+      color: darken($cPlum, 2);
+      background: black(0.06);
+      cursor: not-allowed;
+    }
+
   }
 
+  input::-webkit-input-placeholder {color: #ccc}
+  input:-moz-placeholder {color: #ccc}
+  input::-moz-placeholder {color: #ccc}
+  input:-ms-input-placeholder {color: #ccc}
+
+  textarea::-webkit-input-placeholder {color: #ccc}
+  textarea:-moz-placeholder {color: #ccc}
+  textarea::-moz-placeholder {color: #ccc}
+  textarea:-ms-input-placeholder {color: #ccc}
+
   .field-cluster {
 
     @include clearfix;
@@ -209,11 +225,6 @@
     }
   }
 
-  input::-webkit-input-placeholder {color: #ccc}
-  input:-moz-placeholder {color: #ccc}
-  input::-moz-placeholder {color: #ccc}
-  input:-ms-input-placeholder {color: #ccc}
-
   .field_with_errors {
     input, textarea, select,
     button {

data/app/assets/stylesheets/admin/settings/_fonts.scss

@@ -16,16 +16,10 @@ $fHelvetica: "Helvetica Neue", "Segoe UI", Arial, Freesans, sans-serif;
 
 @font-face {
   font-family: "FontAwesome";
-  src: font-url("admin/fontawesome.eot");
-  src: font-url("admin/fontawesome.eot?#iefix") format("embedded-opentype"),
-       font-url("admin/fontawesome.woff2") format("woff2"),
-       font-url("admin/fontawesome.woff") format("woff"),
-       font-url("admin/fontawesome.ttf") format("truetype"),
-       font-url("admin/fontawesome.svg#fontawesome") format("svg");
+  src: font-url("admin/fontawesome.woff2") format("woff2"),
+       font-url("admin/fontawesome.woff") format("woff");
   font-weight: normal;
   font-style: normal;
 }
 
 $fFontAwesome: FontAwesome;
-
-

data/app/assets/stylesheets/admin/settings/_icons.scss

@@ -1775,6 +1775,7 @@
 }
 
 .icon-ra:before,
+.icon-resistance:before,
 .icon-rebel:before {
   content: "\f1d0";
 }
@@ -2533,3 +2534,125 @@
 .icon-percent:before {
   content: "\f295";
 }
+
+.icon-gitlab:before {
+  content: "\f296";
+}
+
+.icon-wpbeginner:before {
+  content: "\f297";
+}
+
+.icon-wpforms:before {
+  content: "\f298";
+}
+
+.icon-envira:before {
+  content: "\f299";
+}
+
+.icon-universal-access:before {
+  content: "\f29a";
+}
+
+.icon-wheelchair-alt:before {
+  content: "\f29b";
+}
+
+.icon-question-circle-o:before {
+  content: "\f29c";
+}
+
+.icon-blind:before {
+  content: "\f29d";
+}
+
+.icon-audio-description:before {
+  content: "\f29e";
+}
+
+.icon-volume-control-phone:before {
+  content: "\f2a0";
+}
+
+.icon-braille:before {
+  content: "\f2a1";
+}
+
+.icon-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+
+.icon-asl-interpreting:before,
+.icon-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+
+.icon-deafness:before,
+.icon-hard-of-hearing:before,
+.icon-deaf:before {
+  content: "\f2a4";
+}
+
+.icon-glide:before {
+  content: "\f2a5";
+}
+
+.icon-glide-g:before {
+  content: "\f2a6";
+}
+
+.icon-signing:before,
+.icon-sign-language:before {
+  content: "\f2a7";
+}
+
+.icon-low-vision:before {
+  content: "\f2a8";
+}
+
+.icon-viadeo:before {
+  content: "\f2a9";
+}
+
+.icon-viadeo-square:before {
+  content: "\f2aa";
+}
+
+.icon-snapchat:before {
+  content: "\f2ab";
+}
+
+.icon-snapchat-ghost:before {
+  content: "\f2ac";
+}
+
+.icon-snapchat-square:before {
+  content: "\f2ad";
+}
+
+.icon-pied-piper:before {
+  content: "\f2ae";
+}
+
+.icon-first-order:before {
+  content: "\f2b0";
+}
+
+.icon-yoast:before {
+  content: "\f2b1";
+}
+
+.icon-themeisle:before {
+  content: "\f2b2";
+}
+
+.icon-google-plus-circle:before,
+.icon-google-plus-official:before {
+  content: "\f2b3";
+}
+
+.icon-fa:before,
+.icon-font-awesome:before {
+  content: "\f2b4";
+}

data/app/controllers/admin/admin_controller.rb

@@ -1,6 +1,6 @@
 class Admin::AdminController < Tolaria::TolariaController
 
-  skip_before_filter :authenticate_admin!, only:[:markdown]
+  skip_before_action :authenticate_admin!, only:[:markdown]
 
   def root
     redirect_to(Tolaria.config.default_redirect, status:303)

data/app/controllers/admin/sessions_controller.rb

@@ -1,6 +1,6 @@
 class Admin::SessionsController < Tolaria::TolariaController
 
-  skip_before_filter :authenticate_admin!
+  skip_before_action :authenticate_admin!
 
   # Present the signin form
 

data/app/controllers/tolaria/resource_controller.rb

@@ -1,13 +1,12 @@
 class Tolaria::ResourceController < Tolaria::TolariaController
 
-  before_filter :load_managed_class!
-  before_filter :strip_invalid_ransack_params!
+  before_action :load_managed_class!
 
   def index
-    @search = @managed_class.klass.ransack(params[:q])
+    @search = @managed_class.klass.ransack(ransack_params)
     @resources = @search.result
     if @managed_class.paginated?
-      @resources = @resources.page(params[:page]).per(Tolaria.config.page_size)
+      @resources = @resources.page(page_param).per(Tolaria.config.page_size)
     end
     unless currently_sorting?
       @resources = @resources.order(@managed_class.default_order)
@@ -93,7 +92,7 @@ class Tolaria::ResourceController < Tolaria::TolariaController
   # Handles route forbidding cases.
   def form_completion_redirect_path(managed_class, resource = nil)
     if managed_class.allows?(:index) && params[:save_and_review].blank?
-      url_for(action:"index", q:params[:q])
+      url_for(action:"index", q:ransack_params, p:page_param)
     elsif managed_class.allows?(:show) && resource.present?
       url_for(action:"show", id:resource.id)
     elsif managed_class.allows?(:edit) && resource.present?
@@ -119,20 +118,6 @@ class Tolaria::ResourceController < Tolaria::TolariaController
     )
   end
 
-  # Some Ransack methods raise exceptions if the `q` param is invalid.
-  # Strip `q` params not created by Ransack
-  def strip_invalid_ransack_params!
-    return true if params[:q].blank?
-    unless params[:q].is_a?(Hash)
-      params.delete(:q)
-    end
-  end
-
-  # Returns true if there is a sorting parameter for Ransack
-  def currently_sorting?
-    params[:q].present? && params[:q][:s].present?
-  end
-
   # Logs all validation errors for the current resource to the Rails console
   def log_validation_errors!
     unless Rails.env.test?
@@ -143,4 +128,42 @@ class Tolaria::ResourceController < Tolaria::TolariaController
     end
   end
 
+  # Returns the current `params[:p]` as an Integer if it is valid.
+  # Returns `nil` otherwise.
+  def page_param
+    integer_page = params[:p].to_i
+    return integer_page if integer_page > 0
+    return nil
+  end
+
+  # Returns params[:q] as a hash if it can be converted.
+  # Ransack expects this generic hash and has its own internal
+  # logic for handing the many possible keys of the hash.
+  def ransack_params
+    if params[:q].present? && params[:q].respond_to?(:permit!)
+      return params[:q].to_unsafe_hash
+    else
+      return nil
+    end
+  end
+
+  # True if there is a sorting parameter for Ransack
+  def currently_sorting?
+    ransack_params.present? && ransack_params[:s].present?
+  end
+
+  # True if there are filtering parameters for Ransack
+  def currently_filtering?
+    if currently_sorting?
+      ransack_params.keys.many?
+    else
+      ransack_params.present? && ransack_params.keys.any?
+    end
+  end
+
+  helper_method :page_param
+  helper_method :ransack_params
+  helper_method :currently_sorting?
+  helper_method :currently_filtering?
+
 end

data/app/controllers/tolaria/tolaria_controller.rb

@@ -1,8 +1,8 @@
 class Tolaria::TolariaController < ::ApplicationController
 
   protect_from_forgery
-  before_filter :add_admin_headers!
-  before_filter :authenticate_admin!
+  before_action :add_admin_headers!
+  before_action :authenticate_admin!
 
   protected
 

data/app/helpers/admin/table_helper.rb

@@ -95,11 +95,11 @@ module Admin::TableHelper
     end
 
     if sort.is_a?(Symbol)
-      return content_tag(:th, sort_link(@search, sort, display_label), class:"index-th")
+      return content_tag(:th, sort_link(@search, sort), class:"index-th")
     end
 
     if sort.eql?(true) && field_or_label.is_a?(Symbol)
-      return content_tag(:th, sort_link(@search, field_or_label, display_label), class:"index-th")
+      return content_tag(:th, sort_link(@search, field_or_label), class:"index-th")
     end
 
     return content_tag(:th, display_label, class:"index-th")
@@ -137,9 +137,9 @@ module Admin::TableHelper
     end
 
     if @managed_class.allows? :edit
-      link = url_for(action:"edit", id:resource.id, q:params[:q])
+      link = url_for(action:"edit", id:resource.id, q:ransack_params, p:page_param)
     elsif @managed_class.allows? :show
-      link = url_for(action:"show", id:resource.id, q:params[:q])
+      link = url_for(action:"show", id:resource.id, q:ransack_params, p:page_param)
     else
       link = "#" # Guh, painted ourseves into a corner here
     end
@@ -162,15 +162,15 @@ module Admin::TableHelper
     links = []
 
     if @managed_class.allows?(:edit)
-      links << link_to("Edit", url_for(action:"edit", id:resource.id, q:params[:q]), class:"button -small")
+      links << link_to("Edit", url_for(action:"edit", id:resource.id, q:ransack_params, p:page_param), class:"button -small -edit")
     end
 
     if @managed_class.allows?(:show)
-      links << link_to("Inspect", url_for(action:"show", id:resource.id, q:params[:q]), class:"button -small")
+      links << link_to("Inspect", url_for(action:"show", id:resource.id, q:ransack_params, p:page_param), class:"button -small -inspect")
     end
 
     if @managed_class.allows?(:destroy)
-      links << link_to("Delete", url_for(action:"destroy", id:resource.id, q:params[:q]), class: "button -small", method: :delete, :'data-confirm' => deletion_warning(resource))
+      links << link_to("Delete", url_for(action:"destroy", id:resource.id, q:ransack_params, p:page_param), class: "button -small -delete", method: :delete, :'data-confirm' => deletion_warning(resource))
     end
 
     return content_tag(:td, links.join("").html_safe, class:"actions-td")