tolaria 1.1.2 → 1.2.0

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

@@ -5,6 +5,7 @@ var AttachmentFieldView = Backbone.View.extend({
     this.$label = this.$(".attachment-field-label");
     this.$icon = this.$(".icon");
     this.$preview = this.$(".attachment-field-preview");
+    this.refreshLabel();
   },
 
   activateFileInput: function(event) {

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

@@ -0,0 +1,9 @@
+var TextareaView = Backbone.View.extend({
+
+  initialize: function() {
+    autosize(this.$el);
+  },
+
+});
+
+FormOrchestrator.register("textarea:not(.markdown-composer-textarea, .disable-autosize)", "TextareaView");

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

@@ -13,17 +13,23 @@
   font-weight: bold;
   height: 32px;
   line-height: 30px;
+  margin: 0 0 5px 0;
   padding: 0px 14px 0px 12px;
-  vertical-align: middle;
   transition: background-color 100ms linear, border-color 100ms linear;
+  vertical-align: middle;
   white-space: nowrap;
 
+  @include min-width($bpFull) {
+    margin: 0;
+  }
+
   &.-small {
     transition: none;
     font-size: 12px;
     line-height: 16px;
     padding: 2px 9px 2px 9px;
     height: auto;
+    margin: 0;
     .icon {
       font-size: 12px;
     }

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

@@ -4,8 +4,8 @@
   z-index: 99999;
 
   @include max-width($bpFull - 1px) {
-    @include clearfix;
 
+    @include clearfix;
     background-color: $cCoolGrey;
     border-bottom: 3px double $cGrey;
     margin-left: -20px;
@@ -17,26 +17,21 @@
       margin: 0;
       position: absolute;
       width: 100%;
-
-      -webkit-transition: -webkit-transform 300ms cubic-bezier(0.215, 0.61, 0.355, 1);
-              transition: transform 300ms cubic-bezier(0.215, 0.61, 0.355, 1);
-
-      -webkit-transform: translateY(-100%);
-              transform: translateY(-100%);
-
+      transition: transform 300ms cubic-bezier(0.215, 0.61, 0.355, 1);
+      transform: translateY(-100%);
       &.-open {
-        -webkit-transform: translateY(0);
-                transform: translateY(0);
+        transform: translateY(0);
       }
     }
+
   }
 
   @include min-width($bpFull) {
-    width: 16%;
     border-bottom: 0;
-    padding: 0;
     display: table-cell;
+    padding: 0 0 15px 0;
     vertical-align: top;
+    width: 16%;
   }
 
 }

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

@@ -22,7 +22,7 @@
 
 // ----------------------------------------------------------------------------
 // ICON CLASSES
-// Modified from Font Awesome 4.3.0
+// Modified from Font Awesome 4.5.0
 // ----------------------------------------------------------------------------
 
 .icon-glass:before {
@@ -2453,3 +2453,83 @@
 .icon-fonticons:before {
   content: "\f280";
 }
+
+.icon-reddit-alien:before {
+  content: "\f281";
+}
+
+.icon-edge:before {
+  content: "\f282";
+}
+
+.icon-credit-card-alt:before {
+  content: "\f283";
+}
+
+.icon-codiepie:before {
+  content: "\f284";
+}
+
+.icon-modx:before {
+  content: "\f285";
+}
+
+.icon-fort-awesome:before {
+  content: "\f286";
+}
+
+.icon-usb:before {
+  content: "\f287";
+}
+
+.icon-product-hunt:before {
+  content: "\f288";
+}
+
+.icon-mixcloud:before {
+  content: "\f289";
+}
+
+.icon-scribd:before {
+  content: "\f28a";
+}
+
+.icon-pause-circle:before {
+  content: "\f28b";
+}
+
+.icon-pause-circle-o:before {
+  content: "\f28c";
+}
+
+.icon-stop-circle:before {
+  content: "\f28d";
+}
+
+.icon-stop-circle-o:before {
+  content: "\f28e";
+}
+
+.icon-shopping-bag:before {
+  content: "\f290";
+}
+
+.icon-shopping-basket:before {
+  content: "\f291";
+}
+
+.icon-hashtag:before {
+  content: "\f292";
+}
+
+.icon-bluetooth:before {
+  content: "\f293";
+}
+
+.icon-bluetooth-b:before {
+  content: "\f294";
+}
+
+.icon-percent:before {
+  content: "\f295";
+}

data/app/controllers/tolaria/resource_controller.rb

@@ -1,7 +1,7 @@
 class Tolaria::ResourceController < Tolaria::TolariaController
 
   before_filter :load_managed_class!
-  before_filter :strip_invalid_ransack_params!, only:[:index]
+  before_filter :strip_invalid_ransack_params!
 
   def index
     @search = @managed_class.klass.ransack(params[:q])
@@ -92,8 +92,8 @@ class Tolaria::ResourceController < Tolaria::TolariaController
   # Returns a path we should redirect to when the form is completed successfully.
   # Handles route forbidding cases.
   def form_completion_redirect_path(managed_class, resource = nil)
-    if managed_class.allows? :index
-      url_for([:admin, managed_class.klass])
+    if managed_class.allows?(:index) && params[:save_and_review].blank?
+      url_for(action:"index", q:params[:q])
     elsif managed_class.allows?(:show) && resource.present?
       url_for(action:"show", id:resource.id)
     elsif managed_class.allows?(:edit) && resource.present?

data/app/helpers/admin/table_helper.rb

@@ -137,9 +137,9 @@ module Admin::TableHelper
     end
 
     if @managed_class.allows? :edit
-      link = url_for(action:"edit", id:resource.id)
+      link = url_for(action:"edit", id:resource.id, q:params[:q])
     elsif @managed_class.allows? :show
-      link = url_for(action:"show", id:resource.id)
+      link = url_for(action:"show", id:resource.id, q:params[:q])
     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), class:"button -small")
+      links << link_to("Edit", url_for(action:"edit", id:resource.id, q:params[:q]), class:"button -small")
     end
 
     if @managed_class.allows?(:show)
-      links << link_to("Inspect", url_for(action:"show", id:resource.id), class:"button -small")
+      links << link_to("Inspect", url_for(action:"show", id:resource.id, q:params[:q]), class:"button -small")
     end
 
     if @managed_class.allows?(:destroy)
-      links << link_to("Delete", url_for(action:"destroy", id:resource.id), class: "button -small", method: :delete, :'data-confirm' => deletion_warning(resource))
+      links << link_to("Delete", url_for(action:"destroy", id:resource.id, q:params[:q]), class: "button -small", method: :delete, :'data-confirm' => deletion_warning(resource))
     end
 
     return content_tag(:td, links.join("").html_safe, class:"actions-td")

data/app/views/admin/administrators/_show.html.erb

@@ -4,11 +4,11 @@
     <%= show_thead_tr %>
   </thead>
   <tbody>
-    <%= show_tr "Avatar", image_tag(gravatar_for(@resource.email)) %>
     <%= show_tr :name %>
     <%= show_tr :organization %>
     <%= show_tr :email, class:"monospace" %>
-    <%= show_tr "Created At", @resource.created_at.presence.try(:strftime, "%Y-%m-%d %I:%M %p"), class:"monospace" %>
+    <%= show_tr "Created At", @resource.created_at.try(:strftime, "%Y-%m-%d %H:%M %Z"), class:"monospace" %>
+    <%= show_tr "Avatar", image_tag(gravatar_for(@resource.email)) %>
   </tbody>
 
 <% end %>

data/app/views/admin/shared/forms/_markdown_composer.html.erb

@@ -22,7 +22,9 @@
   </div>
 
   <div class="markdown-composer-workspace">
-    <%= f.text_area method, options.reverse_merge({rows: 20}) %>
+    <% options[:class] = "markdown-composer-textarea #{options[:class]}" %>
+    <% options[:rows] = 20 %>
+    <%= f.text_area method, options %>
     <div class="markdown-composer-preview markdown-body" style="display:none"></div>
   </div>
 

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

@@ -1,12 +1,21 @@
 <% if @managed_class.allows? :index %>
-  <%= link_to url_for([:admin, @managed_class.klass]), class:"button" do %>
+  <%= link_to url_for(action:"index", q:params[:q]), class:"button -cancel" do %>
     <%= fontawesome_icon :close %>
     Cancel
   <% end %>
 <% end %>
 
-<%= button_tag type:"submit", name:nil, class:"button -primary" do %>
+<% if @managed_class.allows? :show %>
+  <%= button_tag type:"submit", name:"save_and_review", class:"button -primary -save-and-review", value:"Save & Review" do %>
+    <%= fontawesome_icon :check %>
+    <%= @resource.persisted?? "Save" : "Create" %>
+    <%= "& Review" %>
+  <% end %>
+<% end %>
+
+<%= button_tag type:"submit", name:"save", class:"button -primary -save", value:"Save" do %>
   <%= fontawesome_icon :check %>
   <%= @resource.persisted?? "Save" : "Create" %>
-  <%= @managed_class.model_name.human.titleize %>
 <% end %>
+
+

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

@@ -23,7 +23,7 @@
       <% end %>
       <%= link_to url_for([:admin, @managed_class.klass]), class:"button" do %>
         <%= fontawesome_icon :close %>
-        Close
+        Clear Search
       <% end %>
     </div>
 

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

@@ -6,13 +6,19 @@
 
 <%= form_for [:admin, @resource], url:contextual_form_url, builder:Admin::FormBuilder, html:{class:"resource-form"}  do |form_builder| %>
 
+  <% if params[:q].present? %>
+    <% params[:q].each do |key, value| %>
+      <%= hidden_field_tag "q[#{key}]", value %>
+    <% end %>
+  <% end %>
+
   <div class="main-controls">
     <div class="main-controls-left">
       <h1>
         <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) %>
+            <%= link_to @managed_class.model_name.human.pluralize.titleize, url_for(action:"index", controller:@managed_class.plural, q:params[:q]) %>
           <% else %>
             <%= @managed_class.model_name.human.pluralize.titleize %>
           <% end %>

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

@@ -12,14 +12,21 @@
   <div class="main-controls-right">
 
     <% unless @managed_class.no_resources? %>
-      <%= button_tag type:"button", class:"button search-form-toggle" do %>
-        <%= fontawesome_icon :search %>
-        Search
+      <% if currently_filtering? %>
+        <%= link_to url_for(action:"index"), class:"button" do %>
+          <%= fontawesome_icon :close %>
+          Clear Search
+        <% end %>
+      <% else %>
+        <%= button_tag type:"button", class:"button search-form-toggle" do %>
+          <%= fontawesome_icon :search %>
+          Search
+        <% end %>
       <% end %>
     <% end %>
 
     <% if @managed_class.allows?(:new) %>
-      <%= link_to url_for(action:"new"), class:"button -primary" do %>
+      <%= link_to url_for(action:"new", q:params[:q]), class:"button -primary" do %>
         <%= fontawesome_icon :plus %>
         New <%= @managed_class.model_name.human.titleize %>
       <% end %>

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

@@ -7,7 +7,7 @@
       <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) %>
+          <%= link_to @managed_class.model_name.human.pluralize.titleize, url_for(action:"index", controller:@managed_class.plural, q:params[:q]) %>
         <% else %>
           <%= @managed_class.model_name.human.pluralize.titleize %>
         <% end %>
@@ -35,13 +35,22 @@
       <%= show_thead_tr %>
     </thead>
     <tbody>
+      <% if @resource.respond_to? :id %>
+        <%= show_tr "ID", @resource.id, class:"monospace" %>
+      <% end %>
+      <% if @resource.respond_to? :uuid %>
+        <%= show_tr "UUID", @resource.uuid, class:"monospace" %>
+      <% end %>
       <% if @resource.respond_to? :created_at %>
-        <%= show_tr "Created At", @resource.created_at.try(:strftime, "%Y-%m-%d %I:%M %p"), class:"monospace" %>
+        <%= show_tr "Created At", @resource.created_at.try(:strftime, "%Y-%m-%d %H:%M %Z"), class:"monospace" %>
       <% end %>
       <% if @resource.respond_to? :updated_at %>
-        <%= show_tr "Updated At", @resource.updated_at.try(:strftime, "%Y-%m-%d %I:%M %p"), class:"monospace" %>
+        <%= show_tr "Updated At", @resource.updated_at.try(:strftime, "%Y-%m-%d %H:%M %Z"), class:"monospace" %>
+      <% end %>
+      <% @resource.attributes.each do |attribute, value| %>
+        <% next if attribute.in?(%[id uuid created_at updated_at]) %>
+        <%= show_tr attribute.humanize, value %>
       <% end %>
-      <%= show_tr "Label", Tolaria.display_name(@resource) %>
     </tbody>
   </table>
 

data/lib/tasks/admin.rake

@@ -5,16 +5,25 @@ namespace :admin do
 
     @administrator = Administrator.new
 
-    STDOUT.puts "Enter the new administrator’s credentials. All fields are required."
+    if ENV.has_key?("EMAIL") || ENV.has_key?("NAME") || ENV.has_key?("ORGANIZATION")
 
-    STDOUT.print "Email address: "
-    @administrator.email = STDIN.gets.chomp
+      # Get the administrator from environment variables
+      @administrator.email = ENV.fetch("EMAIL").chomp
+      @administrator.name = ENV.fetch("NAME").chomp
+      @administrator.organization = ENV.fetch("ORGANIZATION").chomp
 
-    STDOUT.print "Full name: "
-    @administrator.name = STDIN.gets.chomp
+    else
+
+      # Get the administrator interactively
+      STDOUT.puts "Enter the new administrator’s credentials. All fields are required."
+      STDOUT.print "Email address: "
+      @administrator.email = STDIN.gets.chomp
+      STDOUT.print "Full name: "
+      @administrator.name = STDIN.gets.chomp
+      STDOUT.print "Organization: "
+      @administrator.organization = STDIN.gets.chomp
 
-    STDOUT.print "Organization: "
-    @administrator.organization = STDIN.gets.chomp
+    end
 
     if @administrator.save
       STDOUT.puts %{The administrator "#{@administrator.name}" <#{@administrator.email}> was successfully created.}

data/lib/tolaria/default_config.rb

@@ -41,6 +41,7 @@ Tolaria.configure do |config|
     authenticity_token
     id
     utf8
+    save_and_review
   ]
 
 end

data/lib/tolaria/form_buildable.rb

@@ -3,8 +3,9 @@ module Tolaria
 
     # Returns a `p.hint` used to explain a nearby form field containing
     # the given `hint_text`.
-    def hint(hint_text)
-      content_tag(:p, content_tag(:span, hint_text.chomp), class:"hint")
+    def hint(hint_text, options = {})
+      css_class = "hint #{options.delete(:class)}"
+      content_tag(:p, content_tag(:span, hint_text.chomp), class:css_class, **options)
     end
 
     # Creates a `<select>` list that can be filtered by typing word fragments.

data/lib/tolaria/version.rb

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

data/test/integration/{interface_test.rb → crud_test.rb}

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class InterfaceTest < ActionDispatch::IntegrationTest
+class CrudTest < ActionDispatch::IntegrationTest
 
   def setup
     BlogPost.destroy_all
@@ -37,7 +37,7 @@ class InterfaceTest < ActionDispatch::IntegrationTest
     assert page.has_content?("live here")
   end
 
-  test "create a blog post, see it on the index, inspect it" do
+  test "create a blog post, see it on the index, and then inspect it" do
 
     sign_in_dummy_administrator!
     visit("/admin/blog_posts")
@@ -45,7 +45,7 @@ class InterfaceTest < ActionDispatch::IntegrationTest
     fill_in("blog_post[title]", with:"Neko Atsume")
     fill_in("blog_post[summary]", with:"Neko Atsume")
     fill_in("blog_post[body]", with:"Neko Atsume")
-    first(".button.-primary").click
+    first(".button[name=save]").click
 
     assert page.current_path.include?(admin_blog_posts_path)
     assert page.has_content?("Neko Atsume")
@@ -58,6 +58,22 @@ class InterfaceTest < ActionDispatch::IntegrationTest
 
   end
 
+  test "create a blog post and review it" do
+
+    sign_in_dummy_administrator!
+    visit("/admin/blog_posts")
+    first(".button.-primary").click
+    fill_in("blog_post[title]", with:"Neko Atsume")
+    fill_in("blog_post[summary]", with:"Neko Atsume")
+    fill_in("blog_post[body]", with:"Neko Atsume")
+    first(".button[name=save_and_review]").click
+
+    assert page.current_path.include?(admin_blog_post_path(BlogPost.first.id))
+    assert page.has_content?("Neko Atsume")
+    assert page.has_content?("created the"), "should see flash message"
+
+  end
+
   test "blog post fails validation and sees flash message" do
 
     sign_in_dummy_administrator!

data/test/integration/filter_preservation_test.rb

@@ -0,0 +1,61 @@
+require "test_helper"
+
+class FilterPreservationTest < ActionDispatch::IntegrationTest
+
+  def setup
+    BlogPost.destroy_all
+  end
+
+  def teardown
+    BlogPost.destroy_all
+  end
+
+  test "after filtering index, should retain filter on edit and back with crumb" do
+    sign_in_dummy_administrator!
+    visit("/admin/administrators")
+    find_link("Organization").click
+    find_link("Nintendo").click
+    first(".crumb a").click
+    assert page.current_url.include?("q[s]=organization+asc"), "filter not retained"
+  end
+
+  test "after filtering index, should retain filter on edit and back with button" do
+    sign_in_dummy_administrator!
+    visit("/admin/administrators")
+    find_link("Organization").click
+    find_link("Nintendo").click
+    first(".button.-cancel").click
+    assert page.current_url.include?("q[s]=organization+asc"), "filter not retained"
+  end
+
+  test "after filtering index, should retain filter on edit and save" do
+    sign_in_dummy_administrator!
+    visit("/admin/administrators")
+    find_link("Organization").click
+    find_link("Nintendo").click
+    first(".button.-save").click
+    assert page.current_url.include?("q[s]=organization+asc"), "filter not retained"
+  end
+
+  test "after filtering index, should retain filter on edit and failed validation" do
+    sign_in_dummy_administrator!
+    visit("/admin/administrators")
+    find_link("Organization").click
+    find_link("Nintendo").click
+    fill_in("administrator[email]", with:"")
+    first(".button.-save").click
+    first(".button.-cancel").click
+    assert page.current_url.include?("q[s]=organization+asc"), "filter retained"
+  end
+
+  test "after filtering index, should NOT retain filter on save and review" do
+    sign_in_dummy_administrator!
+    visit("/admin/administrators")
+    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"
+  end
+
+end
+

data/tolaria.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.licenses      = ["MIT"]
   s.authors       = ["Corey Csuhta", "Daniel Boggs"]
+  s.email         = "hello+tolaria@threespot.com"
   s.homepage      = "https://github.com/threespot/tolaria"
   s.summary       = "A Rails CMS framework for making people happy."
   s.description   = "Tolaria is a content management system (CMS) framework for Ruby on Rails. It greatly speeds up the necessary—but repetitive—task of creating useful admin panels, forms, and model workflow. Includes a library of rich form components, passwordless authentication, and text search tools. Make your editors happy!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolaria
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Corey Csuhta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -183,7 +183,7 @@ description: Tolaria is a content management system (CMS) framework for Ruby on
   It greatly speeds up the necessary—but repetitive—task of creating useful admin
   panels, forms, and model workflow. Includes a library of rich form components, passwordless
   authentication, and text search tools. Make your editors happy!
-email: 
+email: hello+tolaria@threespot.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -208,6 +208,7 @@ files:
 - app/assets/images/admin/select_arrows.svg
 - app/assets/javascripts/admin/admin.js
 - app/assets/javascripts/admin/base.js
+- app/assets/javascripts/admin/lib/autosize.js
 - app/assets/javascripts/admin/lib/backbone.js
 - app/assets/javascripts/admin/lib/jquery.chosen.js
 - app/assets/javascripts/admin/lib/jquery.js
@@ -225,6 +226,7 @@ files:
 - app/assets/javascripts/admin/views/fields/searchable_select.js
 - app/assets/javascripts/admin/views/fields/slug_field.js
 - app/assets/javascripts/admin/views/fields/swatch_field.js
+- app/assets/javascripts/admin/views/fields/textarea.js
 - app/assets/javascripts/admin/views/fields/timestamp_field.js
 - app/assets/javascripts/admin/views/flash_message.js
 - app/assets/javascripts/admin/views/form_orchestrator.js
@@ -395,9 +397,10 @@ files:
 - test/demo/public/422.html
 - test/demo/public/500.html
 - test/demo/public/favicon.ico
+- test/integration/crud_test.rb
+- test/integration/filter_preservation_test.rb
 - test/integration/forbidden_routes_test.rb
 - test/integration/help_link_test.rb
-- test/integration/interface_test.rb
 - test/integration/router_test.rb
 - test/integration/session_test.rb
 - test/test_helper.rb
@@ -488,9 +491,10 @@ test_files:
 - test/demo/public/422.html
 - test/demo/public/500.html
 - test/demo/public/favicon.ico
+- test/integration/crud_test.rb
+- test/integration/filter_preservation_test.rb
 - test/integration/forbidden_routes_test.rb
 - test/integration/help_link_test.rb
-- test/integration/interface_test.rb
 - test/integration/router_test.rb
 - test/integration/session_test.rb
 - test/test_helper.rb
@@ -499,4 +503,3 @@ test_files:
 - test/unit/markdown_test.rb
 - test/unit/menu_test.rb
 - test/unit/random_tokens_test.rb
-has_rdoc: