tb_core 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2f47767b015951d5eca3a7af3055b5c20101d6
-  data.tar.gz: 3869ef7c61f21fbef83d92303d81bbd819081abc
+  metadata.gz: 06f0ab03560e57efe477e7fb0f9ae6f72a8a042c
+  data.tar.gz: e8d702fe0332d78ae18bc9d0605db1d89ec3cb26
 SHA512:
-  metadata.gz: d4e8a3d18f3768dd7bdc4c4c58bed5ce6d412203cda91e86b324e7a36af44e672a1ee7722e9ded0b869590a975210ad5d9789d1ec5a5230e7a2c5d1e71528619
-  data.tar.gz: c084bff092e94de06d53b90d8253e041be1d4e338dce48d83c95d00563579bc7f326b90648c8e70defbd2f50f5f1110117afd171e2f7bd721a422c51aabaf616
+  metadata.gz: 6b6d73ea8d50f6930b71df507147e5644128cd2a04024522984aed28fe1832dcc1e9e37059945c34e22a31b41747d9a914868af5eead68d5a466917bdd3b0a46
+  data.tar.gz: 778f7e4d4a48508249c54cff93cdda5334a0beddf158e4a5b68eaab544e9cc6539a53b18fc8aa64480267b549a436cf2713f4d7b7344380a6a232ae815071a40

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

@@ -1,9 +1,7 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
 //= require tinymce-jquery
 //= require bootstrap-sprockets
-
 //= require ../../tb_core
 //= require_self
 //= require_tree .

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

@@ -6,6 +6,7 @@ spud.admin.dashboard = {
   init:function(){
     badgeInterval = setInterval(updateBadges, 30000);
     updateBadges();
+    sortableIcons();
   }
 };
 
@@ -44,4 +45,28 @@ var updateBadge = function(badge_id, count) {
   }
 };
 
+var sortableIcons = function(){
+  $(".sortable").sortable({
+    update : function(e, ui) {
+      var sortArr = [];
+      var index = 0;
+      $(".sortable > div > a").each(function() {
+        sortArr.push($(this).attr('href'));
+      });
+      //save the order to userSettings
+      $.ajax('/admin/change_sort', { 
+        method: 'PUT', 
+        data: {order:sortArr}, 
+        dataType: "json",
+        success: function(data, status, jqXHR) {
+
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) { 
+            alert("Status: " + textStatus); alert("Error: " + errorThrown); 
+        }       
+      });
+    }
+  });
+};
+
 })();

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

@@ -0,0 +1,22 @@
+// Use this file to customize which jQuery UI JavaScript modules we include in the admin.
+//
+// https://github.com/joliss/jquery-ui-rails
+//
+// We primarily use UI for some interaction utilties and to fill in gaps
+// left by Bootstrap. As a general rule, we should try to use a Bootstrap
+// equivalent FIRST and then fall back to jQuery UI if necessary.
+//
+// For example, we prefer bootstrap-datepicker over jQuery UI Datepicker
+//
+// To see a full list of available modules (and their dependencies), see here:
+// http://jqueryui.com/download
+//
+// NOTE: Don't forget to also add the corresponding modules to jquery_ui.scss!
+//
+//= require jquery-ui/core
+//= require jquery-ui/widget
+//= require jquery-ui/mouse
+//= require jquery-ui/draggable
+//= require jquery-ui/droppable
+//= require jquery-ui/sortable
+//

data/app/assets/javascripts/tb_core/remote.js

@@ -13,11 +13,13 @@
 */
 tb.remote = {
   init: function(){
-    $('body').on('ajax:before', 'form', onRemoteFormBefore);
-    $('body').on('ajax:complete', 'form', onRemoteFormComplete);
-    $('body').on('ajax:success', 'form[data-success]', onRemoteFormSuccess);
-    $('body').on('ajax:error', 'form[data-errors]', onRemoteFormErrors);
-    $('body').on('ajax:success', 'tr a[data-method=delete][data-remote=true]', onRemoteDeleteTableRow);
+    var $document = $(document);
+    $document.on('ajax:before', 'form', onRemoteFormBefore);
+    $document.on('ajax:complete', 'form', onRemoteFormComplete);
+    $document.on('ajax:success', 'form[data-success]', onRemoteFormSuccess);
+    $document.on('ajax:error', 'form[data-errors]', onRemoteFormErrors);
+    $document.on('ajax:success', 'tr a[data-method=delete][data-remote=true]', onRemoteDeleteTableRow);
+    $document.on('ajax:aborted:file', 'form', onRemoteAbortedFile);
   }
 };
 
@@ -50,14 +52,32 @@ var onRemoteFormComplete = function(event, jqXHR, textStatus){
 var onRemoteFormSuccess = function(event, json, textStatus, jqXHR){
   var successPath = $(this).data('success');
   if(successPath == 'reload'){
-    window.location.reload();
+    window.location.reload(true);
   }
   else{
-    if(json && json.id){
-      successPath = successPath.replace(':id', json.id);
-    }
-    window.location = successPath;
+    window.location = buildSuccessPath(successPath, json);
+  }
+};
+
+/*
+* Build a path for redirection.
+*
+* - Adds a timestamp GET param for cache busting
+* - Inserts an ID attribute if necessary
+*
+*/
+var buildSuccessPath = function(path, json){
+  var timestamp = (new Date()).valueOf();
+  if(path.indexOf('?') > -1){
+    path += ('&t=' + timestamp);
+  }
+  else{
+    path += ('?t=' + timestamp);
+  }
+  if(json && json.id){
+    path = path.replace(':id', json.id);
   }
+  return path;
 };
 
 /*
@@ -104,16 +124,21 @@ var displayErrorsInline = function($form, errors){
 
       keyArr = key.split('.');
 
-      if (keyArr.length === 2) {
+      if(keyArr.length === 2){
         keyArr[0] += '_attributes';
         $input = $form.find("[name$='[" + keyArr.join('][') + "]']");
-      } else {
+      }
+      else{
         $input = $form.find("[name$='[" + key + "]']");
+
+        if($input.length === 0 && !key.match(/_id$/)){
+          $input = $form.find("[name$='[" + key + "_id]']");
+        }
       }
 
       if($input.length > 0){
         var message = errors[key][0];
-        $input.after('<p class="form-error form-error-inline">'+message+'</p>');
+        $input.parent().append('<p class="form-error form-error-inline">'+message+'</p>');
       }
       else{
         console.warn('Missing input field for key:', key);
@@ -154,6 +179,30 @@ var onRemoteDeleteTableRow = function(){
   });
 };
 
+/*
+* Attach an authenticity_token input field when a remote form aborts due to a file input field
+*
+* When a form is configured with remote:true, the authenticity_token hidden input you would normally see is not included. Then what 
+* can happen is the form can fall back to a non-remote action for some reason, possibly due to the presence of a file input field. The
+* net result is that the server responds with a "Can't verify CSRF token authenticity" error because none was sent.
+*
+* This function handles that case by injecting the missing authenticity_token input just before the form is posted.
+*
+*/
+var onRemoteAbortedFile = function(event, inputs){
+  var $form = $(this);
+  var csrfParam = $.rails.csrfParam();
+  if($form.find('input[name='+csrfParam+']').length === 0){
+    var csrfToken = $.rails.csrfToken();
+    var $input = $('<input/>', {
+      type: 'hidden',
+      name: csrfParam,
+      value: csrfToken
+    });
+    $form.prepend($input);
+  }
+};
+
 /*
 * Monkeypatch the base $.rails.enableFormElement function to add a
 * delay and a success text value to the button before returning to 

data/app/assets/stylesheets/admin/core/application.scss

@@ -1,8 +1,6 @@
 //= require_self
 //= require_directory
 
-//= require jquery-ui
-
 @import "bootstrap-sprockets";
 @import "bootstrap";
 

data/app/assets/stylesheets/admin/core/jquery_ui.scss

@@ -0,0 +1,19 @@
+// Use this file to customize which jQuery UI CSS modules we include in the admin.
+//
+// https://github.com/joliss/jquery-ui-rails
+//
+// We primarily use UI for some interaction utilties and to fill in gaps
+// left by Bootstrap. As a general rule, we should try to use a Bootstrap
+// equivalent FIRST and then fall back to jQuery UI if necessary.
+//
+// For example, we prefer bootstrap-datepicker over jQuery UI Datepicker
+//
+// To see a full list of available modules (and their dependencies), see here:
+// http://jqueryui.com/download
+//
+// NOTE: Don't forget to also add the corresponding modules to jquery_ui.js!
+//
+//= require jquery-ui/core
+//= require jquery-ui/draggable
+//= require jquery-ui/sortable
+//

data/app/controllers/admin/dashboard_controller.rb

@@ -1,13 +1,30 @@
 class Admin::DashboardController < Admin::ApplicationController
 
+  respond_to :html, :json
   layout 'admin/application'
 
   def index
-    @admin_applications = Spud::Core.admin_applications.select do |admin_application|
+    @setting = SpudUserSetting.find_by(:spud_user_id => current_user.id, :key => "dash_icon_order")
+    apps = Spud::Core.admin_applications
+    if @setting.nil? == false
+      apps = arrange_apps(apps)
+    end
+    @admin_applications = apps.select do |admin_application|
       current_user.can_view_app?(admin_application)
     end
   end
 
+  def change_sort
+    @order = params[:order]
+    @setting = SpudUserSetting.find_or_initialize_by(:spud_user_id => current_user.id, :key => "dash_icon_order")
+    @setting.value = @order
+    if @setting.save
+      respond_to do |format|
+        format.json  { head :no_content }
+      end
+    end
+  end
+
   def badges
     data = []
     @admin_applications = Spud::Core.admin_applications.select do |admin_application|
@@ -20,4 +37,25 @@ class Admin::DashboardController < Admin::ApplicationController
     render :json => {:data => data}
   end
 
+  private
+
+  def arrange_apps(applications)
+    begin
+      order = JSON.parse(@setting.value)
+    rescue JSON::ParserError
+      return applications
+    end
+
+    return applications.sort do |a, b|
+      index_a = order.index(a[:url])
+      index_b = order.index(b[:url])
+      if index_a.nil?
+        1
+      elsif index_b.nil?
+        -1
+      else
+        index_a <=> index_b
+      end
+    end
+  end
 end

data/config/routes.rb

@@ -9,6 +9,7 @@ Rails.application.routes.draw do
 
     get 'settings' => 'settings#edit', :as => 'settings'
     put 'settings' => 'settings#update'
+    put 'change_sort' => 'dashboard#change_sort'
 
     root :to => "dashboard#index"
     resources :users, :controller

data/db/migrate/20111214161146_create_spud_users.rb

@@ -23,7 +23,7 @@ class CreateSpudUsers < ActiveRecord::Migration
       t.string    :last_login_ip                                      # optional, see Authlogic::Session::MagicColumns
       t.timestamps
     end
-    add_index :spud_users,:login
-    add_index :spud_users,:email
+    add_index :spud_users, :login
+    add_index :spud_users, :email
   end
 end

data/lib/spud_core/engine.rb

@@ -68,6 +68,16 @@ module Spud
         end
       end
 
+      initializer 'tb_core.mysql2_extensions' do
+        ActiveSupport.on_load(:active_record) do
+          if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+            ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
+              include TbCore::Mysql2Extensions
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.4"
+    VERSION = "1.3.5"
   end
 end

data/lib/tb_core/mysql2_extensions.rb

@@ -0,0 +1,36 @@
+module TbCore::Mysql2Extensions
+  extend ActiveSupport::Concern
+
+  # Build a hash of length options for a given table and column name
+  #
+  # column_name can be either a symbol or an array of symbols
+  #
+  def length_options_for_utf8mb4_string_index(table_name, column_names)
+    length_options = {}
+    column_names = [column_names] unless column_names.is_a?(Array)
+    column_names.each do |column_name|
+      begin
+        column = column_for(table_name, column_name)
+        if column && column.type == :string
+          length_options[column_name] = ActiveRecord::ConnectionAdapters::Mysql2Adapter::MAX_INDEX_LENGTH_FOR_UTF8MB4
+        end
+      rescue ActiveRecord::ActiveRecordError => e
+        logger.info e.message
+      end
+    end
+    return length_options
+  end
+
+  # Adds an index to the table
+  #
+  # See parent method implementation here: 
+  # http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-add_index
+  #
+  def add_index(table_name, column_name, options = {})
+    if options[:length].nil? && @connection.query_options[:encoding] == 'utf8mb4'
+      options[:length] = length_options_for_utf8mb4_string_index(table_name, column_name)
+    end
+    super(table_name, column_name, options)
+  end
+
+end

data/spec/dummy/config/database.yml

@@ -6,10 +6,13 @@
 development:
   adapter: mysql2
   database: tb_core_development
+  encoding: utf8mb4
+  collation: utf8mb4_bin
   username: root
-  
+
 test:
   adapter: mysql2
   database: tb_core_test
+  encoding: utf8mb4
+  collation: utf8mb4_bin
   username: root
-

data/spec/lib/tb_core/mysql2_extensions_spec.rb

@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+describe TbCore::Mysql2Extensions do
+
+  let(:adapter){
+    SpudUser.connection
+  }
+
+  describe '#length_options_for_utf8mb4_string_index' do
+    it 'should return a hash with a single value' do
+      options = adapter.length_options_for_utf8mb4_string_index(:spud_users, :first_name)
+      expect(options).to eq({:first_name => 191})
+    end
+    
+    it 'should return a hash with multiple values' do
+      options = adapter.length_options_for_utf8mb4_string_index(:spud_users, [:first_name, :last_name])
+      expect(options[:first_name]).to eq(191)
+      expect(options[:last_name]).to eq(191)
+    end
+
+    it 'should not assign a length for a non-string column' do
+      options = adapter.length_options_for_utf8mb4_string_index(:spud_users, [:first_name, :last_name, :super_admin])
+      expect(options[:super_admin]).to eq(nil)
+    end
+  end
+
+  describe '#add_index' do
+    before(:each){
+      # Mock the add_index method to simply return the options hash rather than adding an index, so that we can inspect the contents of options
+      allow_any_instance_of(ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter).to receive(:add_index) do |abstract_adapter, table_name, column_name, options|
+        options
+      end
+    }
+
+    it 'should pass a length option' do
+      options = adapter.add_index(:spud_users, :first_name)
+      expect(options[:length]).to eq({:first_name => 191})
+    end
+
+    it 'should not override the given length option' do
+      options = adapter.add_index(:spud_users, :first_name, :length => 20)
+      expect(options[:length]).to eq(20)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,16 +196,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -295,6 +295,7 @@ files:
 - app/assets/javascripts/admin/core/dashboard.js
 - app/assets/javascripts/admin/core/date_picker.js
 - app/assets/javascripts/admin/core/editor.js
+- app/assets/javascripts/admin/core/jquery_ui.js
 - app/assets/javascripts/admin/core/modal.js
 - app/assets/javascripts/admin/core/preinit.js
 - app/assets/javascripts/admin/core/roles.js
@@ -309,6 +310,7 @@ files:
 - app/assets/libs/datepicker/less/datepicker.less
 - app/assets/stylesheets/admin/application.css
 - app/assets/stylesheets/admin/core/application.scss
+- app/assets/stylesheets/admin/core/jquery_ui.scss
 - app/assets/stylesheets/admin/core/login.scss
 - app/assets/stylesheets/admin/core/users.scss
 - app/controllers/admin/application_controller.rb
@@ -419,6 +421,7 @@ files:
 - lib/tasks/spud_core_tasks.rake
 - lib/tb_core.rb
 - lib/tb_core/form_builder.rb
+- lib/tb_core/mysql2_extensions.rb
 - lib/tb_core/responder.rb
 - lib/tb_core/test_helper.rb
 - spec/controllers/admin/application_controller_spec.rb
@@ -475,6 +478,7 @@ files:
 - spec/factories/spud_user_factories.rb
 - spec/helpers/spud/admin/application_helper_spec.rb
 - spec/lib/spud_core/configuration_spec.rb
+- spec/lib/tb_core/mysql2_extensions_spec.rb
 - spec/models/spud_role_spec.rb
 - spec/models/spud_user_spec.rb
 - spec/rails_helper.rb
@@ -557,6 +561,7 @@ test_files:
 - spec/factories/spud_user_factories.rb
 - spec/helpers/spud/admin/application_helper_spec.rb
 - spec/lib/spud_core/configuration_spec.rb
+- spec/lib/tb_core/mysql2_extensions_spec.rb
 - spec/models/spud_role_spec.rb
 - spec/models/spud_user_spec.rb
 - spec/rails_helper.rb