tb_core 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f0ab03560e57efe477e7fb0f9ae6f72a8a042c
-  data.tar.gz: e8d702fe0332d78ae18bc9d0605db1d89ec3cb26
+  metadata.gz: f6bf453f0beae57a1071c09c8d17bb2af451d8f1
+  data.tar.gz: 24fcc7c6774cf0957886dd28675a5fa9fd8cdc6f
 SHA512:
-  metadata.gz: 6b6d73ea8d50f6930b71df507147e5644128cd2a04024522984aed28fe1832dcc1e9e37059945c34e22a31b41747d9a914868af5eead68d5a466917bdd3b0a46
-  data.tar.gz: 778f7e4d4a48508249c54cff93cdda5334a0beddf158e4a5b68eaab544e9cc6539a53b18fc8aa64480267b549a436cf2713f4d7b7344380a6a232ae815071a40
+  metadata.gz: 6e82de4ddd86404ab8a03bce734b7bc6a5f57e63e1528d9b9c4e58b687cb0eee48bb41f6921997463e68d7062bc09f76f52cd4b3bdfebb544ba75e3db32b33e5
+  data.tar.gz: ed7a6ac11107b0602eb0d21a50af16662657aa0462e7a288acb5f00c9dda9c78e364478d45e9d0b6a93438f2629fb7bb92a401df7a57da0978ddeca17586defe

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

@@ -1,5 +1,4 @@
 //= require jquery
-//= require jquery_ujs
 //= require tinymce-jquery
 //= require bootstrap-sprockets
 //= require ../../tb_core

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

@@ -1,3 +1,6 @@
+//= require_self
+//= require jquery_ujs
+
 (function(){
 
 /*
@@ -20,15 +23,17 @@ tb.remote = {
     $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);
+    $document.ready(extendEnableFormElementMethod);
   }
 };
 
 /*
 * UJS likes to request application/javascript by default, but Twice Baked prefers JSON.
 */
-var onRemoteFormBefore = function(xhr, settings){
-  if($(this).data('type') === undefined){
-    $(this).data('type', 'json');  
+var onRemoteFormBefore = function(event){
+  var $form = $(this);
+  if($form.data('type') === undefined){
+    $form.data('type', 'json');  
   }
 };
 
@@ -97,7 +102,7 @@ var onRemoteFormErrors = function(event, jqXHR, textStatus, errorThrown){
       displayErrorsInline($form, jqXHR.responseJSON.errors);
     }
     else{
-      displayErrorsAlert(jqXHR.responseJSON.full_messages);
+      displayErrorsAlert(jqXHR.responseJSON);
     }
   }
   else if(jqXHR.status == 401 || jqXHR.status == 403){
@@ -159,11 +164,15 @@ var displayErrorsInline = function($form, errors){
 /*
 * Display errors in a standard window.alert dialog
 */
-var displayErrorsAlert = function(errors){
+var displayErrorsAlert = function(json){
   var text = "Please correct the following errors:\n";
-  var len = errors.length;
-  for(var i=0; i<len; i++){
-    text += " - " + errors[i] + "\n";
+  var label, message;
+  var index = 0;
+  for(var key in json.errors){
+    label = json.labels[index];
+    message = json.errors[key][0];
+    text += " - " + label + ' ' + message + "\n";
+    index++;
   }
   window.alert(text);
 };
@@ -208,24 +217,26 @@ var onRemoteAbortedFile = function(event, inputs){
 * delay and a success text value to the button before returning to 
 * default state.
 */
-var originalEnableFormElement = $.rails.enableFormElement;
-
-$.rails.enableFormElement = function(element){
-  var success = $(element).parents('form').data('lastRemoteSuccess');
-  var message = element.data('enableWith');
-
-  if(success && message){
-    var method = element.is('button') ? 'html' : 'val';
-    element[method](message);
-    setTimeout(function(){
-      originalEnableFormElement(element);
-    }, 1000);
-  }
-  else{
-    originalEnableFormElement(element); 
-  }
+var extendEnableFormElementMethod = function(){
+  var originalEnableFormElement = $.rails.enableFormElement;
+
+  $.rails.enableFormElement = function(element){
+    var success = $(element).parents('form').data('lastRemoteSuccess');
+    var message = element.data('enableWith');
+
+    if(success && message){
+      var method = element.is('button') ? 'html' : 'val';
+      element[method](message);
+      setTimeout(function(){
+        originalEnableFormElement(element);
+      }, 1000);
+    }
+    else{
+      originalEnableFormElement(element); 
+    }
+  };
 };
 
-$(document).ready(tb.remote.init);
+tb.remote.init();
 
 })();

data/app/controllers/admin/application_controller.rb

@@ -4,7 +4,6 @@ class Admin::ApplicationController < Spud::ApplicationController
   add_breadcrumb "Dashboard", :admin_root_path
   layout 'admin/detail'
   respond_to :html, :json
-  # self.responder = TbCore::Responder
 
 private
 

data/app/controllers/admin/roles_controller.rb

@@ -2,7 +2,7 @@ class Admin::RolesController < Admin::ApplicationController
 
   before_action :get_record, :only => [:show, :edit, :update, :destroy]
   respond_to :html, :json, :xml
-  belongs_to_spud_app :users
+  belongs_to_app :users
   add_breadcrumb "Users", :admin_users_path
   add_breadcrumb "Roles", :admin_roles_path
 

data/app/controllers/admin/settings_controller.rb

@@ -14,14 +14,14 @@ class Admin::SettingsController < Admin::ApplicationController
   end
 
   def update
-    if @current_user.update_attributes(user_params)
+    if check_password && @current_user.update_attributes(user_params)
       if user_params.include?(:password)
-        SpudUserSession.create(@current_user)
+          SpudUserSession.create(@current_user)
       end
       flash[:notice] = "User settings saved successfully."
       respond_with @current_user, :location => admin_settings_path
     else
-      render 'edit'  
+      render 'edit', :status => 401
     end
   end
 
@@ -31,4 +31,16 @@ private
     params.require(:spud_user).permit(:login, :first_name, :last_name, :email, :password, :password_confirmation, :time_zone)
   end
 
+  def check_password
+    if params[:spud_user][:password].nil? || params[:spud_user][:password].empty?
+      return true
+    else
+      if !current_user.valid_password?(params[:current_password])
+        current_user.errors.add(:current_password, "is not correct. Please enter correct password.")
+        return false
+      end
+      return true
+    end
+  end
+
 end

data/app/controllers/admin/users_controller.rb

@@ -1,7 +1,6 @@
 class Admin::UsersController < Admin::ApplicationController
 
-  self.responder = TbCore::Responder
-  belongs_to_spud_app :users
+  belongs_to_app :users
   add_breadcrumb "Users", :admin_users_path
   before_action :load_user, :only => [:edit, :update, :show, :destroy]
   after_action :send_credentials_email, :only => [:create, :update]

data/app/controllers/spud/application_controller.rb

@@ -10,6 +10,8 @@ class Spud::ApplicationController < ActionController::Base
   include TbCore::ApplicationHelper
   before_action :set_mailer_default_url
 
+  self.responder = TbCore::Responder
+
   rescue_from Spud::RequestError, :with => :handle_request_error
   rescue_from ActiveRecord::RecordNotFound, :with => :handle_record_not_found
   rescue_from ActionController::UnknownFormat, :with => :handle_unknown_format_error

data/app/controllers/user_sessions_controller.rb

@@ -4,7 +4,6 @@
   skip_before_action :check_requires_password_change, :only => [:destroy, :change_password, :set_change_password]
 
   respond_to :html, :json, :js
-  self.responder = TbCore::Responder
   layout 'user_sessions'
   
   def new

data/app/views/admin/settings/_form.html.erb

@@ -38,7 +38,14 @@
 <h4>Credentials</h4>
 
 <div class="form-group">
-	<%= f.label :password, :class => "col-sm-2 control-label" %>
+	<%= f.label :current_password, :class => "col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= password_field :current_password, nil, class:"form-control"  %>
+		<p class="help-block">Enter current password to change it.</p>
+	</div>  
+</div>
+<div class="form-group">
+	<%= f.label "New Password", :class => "col-sm-2 control-label" %>
 	<div class="col-sm-10">
 		<%= f.password_field :password, :title => "", :class => 'form-control', :autocomplete => 'new-password' %>
 		<p class="help-block">Password must be at least 8 characters</p>

data/lib/generators/spud/templates/admin_controller.rb.erb

@@ -1,6 +1,6 @@
 class Admin::<%= module_name_formatted.camelize%>Controller < Admin::ApplicationController
 
-  belongs_to_spud_app :<%= module_name_formatted %>
+  belongs_to_app :<%= module_name_formatted %>
   add_breadcrumb "<%= module_name_formatted.humanize.titlecase %>", :admin_<%= module_name_formatted %>_path
   before_action :load_<%= module_name_formatted.singularize %>, :only => [:show, :edit, :update, :destroy]
 

data/lib/generators/spud/templates/assets/application.js

@@ -1,5 +1,4 @@
 //= require jquery
-//= require jquery_ujs
 //= require tb_core
 //= require bootstrap_modules
 //= require_self

data/lib/spud_core/engine.rb

@@ -16,7 +16,6 @@ end
 module Spud
   module Core
     class Engine < ::Rails::Engine
-      require "#{root}/lib/spud_core/belongs_to_app"
       require "#{root}/lib/spud_core/errors"
       require "#{root}/lib/spud_core/searchable"
       require "#{root}/lib/responds_to_parent"
@@ -26,7 +25,7 @@ module Spud
 
       initializer 'tb_core.controller_overrides' do |config|
          ActionController::Base.class_eval do
-          include Spud::BelongsToApp
+          include TbCore::BelongsToApp
          end
       end
 
@@ -78,6 +77,10 @@ module Spud
         end
       end
 
+      initializer 'tb_core.assets' do
+        Rails.application.config.assets.precompile += ['admin/users_thumb.png', 'admin/module_icon.png']
+      end
+
     end
   end
 end

data/lib/spud_core/version.rb

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

data/lib/tb_core/belongs_to_app.rb

@@ -0,0 +1,55 @@
+module TbCore::BelongsToApp
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def belongs_to_spud_app(name, options={})
+      ActiveSupport::Deprecation.warn 'ApplicationController#belongs_to_spud_app is deprecated. Please use #belongs_to_app instead.', caller
+      belongs_to_app(name, page_title: options[:page_title])
+    end
+
+    # Adds a before action to the current controller to act like the specified twice baked app
+    #
+    # symbol: This should be the :key value for the app you want to use
+    # page_title: Override the base name value for the app (optional)
+    # only: An array of controller actions you want this to apply to (optional)
+    #
+    def belongs_to_app(name, page_title: nil, only: nil)
+      before_action ->(){
+        act_as_app(name, page_title: page_title)
+      }, :only => only
+    end
+  end
+
+private
+
+  # Call the make the current controller behave as though it belongs to the specified twice baked app
+  #
+  # symbol: This should be the :key value for the app you want to use
+  # page_title: Override the base name value for the app (optional)
+  #
+  def act_as_app(symbol, page_title: nil)
+    @page_application = Spud::Core.admin_applications.find{ |app| app[:key] == symbol }
+    if @page_application.blank?
+      raise "Requested application '#{symbol}' could not be found"
+    elsif !current_user.can_view_app?(@page_application)
+      raise Spud::AccessDeniedError.new(:item => 'module', :template => '/layouts/admin/error_page')
+    end
+    @page_thumbnail = @page_application[:thumbnail]
+    @page_name = determine_page_name(page_title || @page_application[:name], action_name)
+  end
+
+  # Takes a base app name and controller action name and returns an appropriate page title
+  #
+  def determine_page_name(base_name, action_name)
+    if action_name == 'new' || action_name == 'create'
+      return "New #{base_name.singularize}"
+    elsif action_name == 'edit' || action_name == 'update'
+      return "Edit #{base_name.singularize}"
+    elsif action_name == 'show'
+      return "#{base_name.singularize} Detail"
+    else
+      return base_name
+    end
+  end
+
+end

data/lib/tb_core/form_builder.rb

@@ -109,12 +109,16 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
 
   # Builds a row of save/cancel buttons
   #
-  def tb_save_buttons(model_name, cancel_path)
+  def tb_save_buttons(model_name, cancel_path, delete_path=nil)
     content_tag :div, :class => 'form-group' do
       content_tag :div, :class => 'col-sm-offset-2 col-sm-10' do
         concat submit "Save #{model_name}", :class => 'btn btn-primary', :data => {:disable_with => "Saving #{model_name}...", :enable_with => 'Saved!'}
         concat ' '
         concat @template.link_to 'Cancel', cancel_path, :class => 'btn btn-default', :data => {:dismiss => :modal}
+        if delete_path != nil
+          concat ' '
+          concat @template.link_to 'Delete', delete_path, :class => 'btn btn-danger', :data => {:confirm => "This action can't be undone. Would you like to delete the #{model_name.downcase}?"}, :method => :delete
+        end
       end
     end
   end

data/lib/tb_core/mysql2_extensions.rb

@@ -1,5 +1,14 @@
 module TbCore::Mysql2Extensions
-  extend ActiveSupport::Concern
+
+  # Create a new table
+  #
+  def create_table(table_name, options = {})
+    if @connection.query_options[:encoding] == 'utf8mb4'
+      super(table_name, options.reverse_merge(:options => 'ROW_FORMAT=DYNAMIC ENGINE=InnoDB'))
+    else
+      super
+    end
+  end
 
   # Build a hash of length options for a given table and column name
   #

data/lib/tb_core/responder.rb

@@ -23,10 +23,13 @@ class TbCore::Responder < ActionController::Responder
   end
 
   # Default responder only sends the basic errors array
-  # This override also sends the full messages for convenience
+  # This override also sends the translated labels for convenience
   #
   def json_resource_errors
-    return {:errors => resource.errors, :full_messages => resource.errors.full_messages}
+    return {
+      :errors => resource.errors,
+      :labels => resource.errors.keys.collect{ |attribute| resource.class.human_attribute_name(attribute) }
+    }
   end
 
 end

data/spec/controllers/admin/settings_controller_spec.rb

@@ -13,6 +13,13 @@ describe Admin::SettingsController, :type => :controller do
   end
   
   describe 'update' do
+    it "should give an error if password change does not include a valid current password" do
+      u = FactoryGirl.build(:spud_user)
+      u.password = "test"
+      put :update, :spud_user => {:first_name => "Mike", :password => "Imapassword", :current_password => "ImaTest"}
+      is_expected.to respond_with 401
+    end
+
     it "should redirect to the settings page with a successful update" do
       put :update, :spud_user => {:first_name => "Mike"}
       expect(response).to redirect_to(admin_settings_path)

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,5 +1,4 @@
 //= require jquery
-//= require jquery_ujs
 //= require tb_core
 //= require bootstrap-sprockets
 //= require_self

data/spec/lib/tb_core/belongs_to_app_spec.rb

@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+class DummyController < ActionController::Base
+  attr_accessor :current_user
+end
+
+describe TbCore::BelongsToApp do
+
+  let(:controller){
+    DummyController.new()
+  }
+
+  before(:each) do
+
+  end
+
+  describe '.belongs_to_app' do
+    it 'should add a before_action' do
+      # Not sure how to test for this...
+      DummyController.belongs_to_app(:users)
+    end
+  end
+
+  describe '#acts_as_app' do
+    it 'should configure the app' do
+      controller.current_user = FactoryGirl.create(:spud_user, :super_admin => true)
+      controller.send(:act_as_app, :users)
+      expect(controller.instance_variable_get('@page_application')).to be_a(Hash)
+    end
+
+    it 'should raise an error if the app cannot be found' do
+      expect{
+        controller.send(:act_as_app, :fail)
+      }.to raise_error
+    end
+    
+    it 'should raise an error if the user does not have access' do
+      controller.current_user = FactoryGirl.create(:spud_user, :super_admin => false)
+      expect{
+        controller.send(:act_as_app, :users)
+      }.to raise_error(Spud::AccessDeniedError)
+    end
+  end
+
+  describe '#determine_page_name' do
+    it 'should contain "New"' do
+      result = controller.send(:determine_page_name, 'Users', 'new')
+      expect(result).to eq('New User')
+    end
+
+    it 'should contain "Edit"' do
+      result = controller.send(:determine_page_name, 'Users', 'edit')
+      expect(result).to eq('Edit User')
+    end
+
+    it 'should contain "Detail"' do
+      result = controller.send(:determine_page_name, 'Users', 'show')
+      expect(result).to eq('User Detail')
+    end
+
+    it 'should return the base name' do
+      result = controller.send(:determine_page_name, 'Users', 'other')
+      expect(result).to eq('Users')
+    end
+  end
+
+end

data/spec/lib/tb_core/mysql2_extensions_spec.rb

@@ -6,6 +6,19 @@ describe TbCore::Mysql2Extensions do
     SpudUser.connection
   }
 
+  describe '#create_table' do
+    before(:each){
+      allow_any_instance_of(ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter).to receive(:create_table) do |abstract_adapter, table_name, arguments|
+        arguments[:options]
+      end
+    }
+
+    it 'should pass the dynamic option' do
+      options = adapter.create_table(:tests)
+      expect(options).to match('ROW_FORMAT=DYNAMIC')
+    end
+  end
+
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -410,7 +410,6 @@ files:
 - lib/generators/spud/templates/views/layouts/application.html.erb
 - lib/generators/spud/templates/views/layouts/error_page.html.erb
 - lib/responds_to_parent.rb
-- lib/spud_core/belongs_to_app.rb
 - lib/spud_core/catch_all_route.rb
 - lib/spud_core/configuration.rb
 - lib/spud_core/engine.rb
@@ -420,6 +419,7 @@ files:
 - lib/spud_core/version.rb
 - lib/tasks/spud_core_tasks.rake
 - lib/tb_core.rb
+- lib/tb_core/belongs_to_app.rb
 - lib/tb_core/form_builder.rb
 - lib/tb_core/mysql2_extensions.rb
 - lib/tb_core/responder.rb
@@ -478,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/belongs_to_app_spec.rb
 - spec/lib/tb_core/mysql2_extensions_spec.rb
 - spec/models/spud_role_spec.rb
 - spec/models/spud_user_spec.rb
@@ -561,6 +562,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/belongs_to_app_spec.rb
 - spec/lib/tb_core/mysql2_extensions_spec.rb
 - spec/models/spud_role_spec.rb
 - spec/models/spud_user_spec.rb

data/lib/spud_core/belongs_to_app.rb

@@ -1,46 +0,0 @@
-module Spud::BelongsToApp
-  extend ActiveSupport::Concern
-
-  included do
-    extend ClassMethods
-  end
-
-  module ClassMethods
-    def belongs_to_spud_app(name=nil,options={})
-      @page_title = options[:page_title]
-      Spud::Core.admin_applications.each do |app|
-        if app[:key] == name
-          @page_application = app
-          break
-        end
-      end
-      self.class_eval do
-        before_action do |controller|
-          @page_thumbnail = self.class.page_application[:thumbnail]
-          @application_name = self.class.page_application[:name]
-          @page_name = self.class.page_title
-
-          if !current_user.can_view_app?(self.class.page_application)
-            raise Spud::AccessDeniedError.new(:item => 'module', :template => '/layouts/admin/error_page')
-          end
-
-          if controller.action_name == 'new' || controller.action_name == 'create'
-            @page_name = "New #{@page_name.singularize}"
-          elsif controller.action_name == 'edit' || controller.action_name == 'update'
-              @page_name = "Edit #{@page_name.singularize}"
-          elsif controller.action_name == 'show'
-            @page_name = "#{@page_name.singularize} Detail"
-          end
-        end
-      end
-    end
-    
-    def page_application
-      @page_application || self.superclass.instance_variable_get('@page_application')
-    end
-
-    def page_title
-      @page_title || self.superclass.instance_variable_get('@page_title') || page_application[:name]
-    end
-  end
-end