tb_core 1.4.8 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6c66dcf54d5da5213a63e533eb04b5f64e726919654ece63a4565333c8a6d7
-  data.tar.gz: 224a045cc261e598c21677bcf28ee60dc82d0ea0f82392dcc9801eb86117aaf8
+  metadata.gz: 685a39f5f0708976182b94ca4eba53159105aae179377c82506808ac3c0140aa
+  data.tar.gz: 8281b2db3cd5ec6ff3c68b564ebc2b30d5fb4e90b1e1fd2d5966ad18b967ab49
 SHA512:
-  metadata.gz: 5dbc377a0b2723d633ff97989a57b41fd5e797247d442e14f7ad6c63ea5f3f402b82ea244d9eee072301dffbfcfb62896e5ffee978fb88c33858f4e8cb39558f
-  data.tar.gz: 4e85b15b625862b800ccb12e1490822d907ee696e6434cf7d08699ca5e0fac0412f032d2153b2d2137c66f87b7f6de10c11fc78c187496ae0bb123c0df691a2e
+  metadata.gz: 30658044ef646b5daffa80b31eaf80b6408d9336189e01671ab523a89d85edf86da366bf09d6b8ac0842a6c787718e5570452c461f98505ce79616ddc0e81efd
+  data.tar.gz: 78b94c0636177d2e71249dceaf11b153c1680f39597360393aa1b8b98defccae365f1509ae19295295e6db3aa58e5fe172125aeada933bfd98ef2f50efa5398f

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://semaphoreci.com/api/v1/moser-it/tb_core/branches/dev/shields_badge.svg)](https://semaphoreci.com/moser-it/tb_core)
+[![CircleCI](https://circleci.com/bb/moser-inc/tb_core.svg?style=svg)](https://circleci.com/bb/moser-inc/tb_core)
 
 Twice Baked Core
 ================
@@ -105,7 +105,7 @@ Create a file in your app at `app/views/admin/users/_form_additions.html.erb`.
       <%= f.label :avatar, :class=>"control-label"%>
       <div class="controls">
         <%= f.file_field :avatar %>
-      </div>  
+      </div>
     </div>
 
 ### Adding fields to the user show action

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

@@ -12,7 +12,9 @@ window.spud = { admin: window.tb };
 
 document.addEventListener('DOMContentLoaded', function() {
 
-  tb.editor.init();
+  if (typeof tinymce != "undefined") {
+    tb.editor.init();
+  }
 
   $("#modal_window .modal-footer .form-submit").bind('click', function() {
     $("#modal_window .modal-body form").submit();

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

@@ -4,7 +4,13 @@ tb.editor = {};
 
   var editor = tb.editor;
 
-  editor.tinymce = {loaded:false};
+  /*
+  * Use tb.editor.overrides to set custom configs in your application
+  *
+  * tb.editor.overrides = { menubar: true }
+  *
+  */
+  editor.overrides = {};
 
   var registeredPlugins = [
     'autolink','lists','image','link','media','paste', 'code'
@@ -14,62 +20,31 @@ tb.editor = {};
     'undo', 'redo', '|',
     'bold','italic','underline','strikethrough','|',
     'formatselect','|',
-    'cut','copy','paste', 'pasteword','pastetext','|',
+    'cut','copy','paste', '|',
     'bullist','numlist','outdent','indent','|',
     'link','unlink','image', '|', 'code', '|'
   ];
 
-  var validElements = "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|" +
-    "onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|" +
-    "onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|" +
-    "name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u," +
-    "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|" +
-    "src|border|alt=|title|hspace|vspace|width|height|align|hidpi_src],-sub,-sup," +
-    "-blockquote,-table[border=0|cellspacing|cellpadding|width|frame|rules|" +
-    "height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|" +
-    "height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot," +
-    "#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor" +
-    "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div," +
-    "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face" +
-    "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite]," +
-    "object[classid|width|height|codebase|*],param[name|value|_value],embed[type|width" +
-    "|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo," +
-    "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|" +
-    "valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method]," +
-    "input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value]," +
-    "kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value]," +
-    "q[cite],samp,select[disabled|multiple|name|size],small," +
-    "textarea[cols|rows|disabled|name|readonly],tt,var,big";
-
   var extendedValidElements = [
     "iframe[src|width|height|name|align|frameborder|allowfullscreen]"
   ];
 
-  editor.init = function(options) {
+  editor.init = function(args) {
     editor.unload();
-    editor.checkAndCallTinyMce(options);
-  };
 
-  editor.initMCEWithOptions = function(element, options){
-    var theme = options.theme || 'modern';
-    var height = options.height || 400;
-    var width = options.width || $(element).width();
-    var buttons = options.buttons || registeredButtons;
-    var plugins = options.plugins || registeredPlugins;
+    var selector = args ? args.selector : 'textarea.tinymce';
 
-    $(element).tinymce({
-      theme: theme,
-      language: 'en',
+    var options = Object.assign({
+      selector: selector,
+      height: 400,
       menubar: false,
-      plugins: plugins.join(' '),
-      toolbar: buttons.join(' '),
-      convert_urls: false,
-      valid_elements: validElements,
-      media_strict: false,
+      toolbar: registeredButtons.join(' '),
+      plugins: registeredPlugins.join(' '),
       extended_valid_elements: extendedValidElements.join(","),
-      width: width,
-      height: height
-    });
+      convert_urls: false
+    }, editor.overrides);
+
+    tinymce.init(options)
   };
 
   editor.unload = function() {
@@ -111,32 +86,4 @@ tb.editor = {};
     }
   };
 
-  var loadScript = null;
-
-  editor.checkAndCallTinyMce = function(options){
-    options = options || {};
-    var selector = options.selector || 'textarea.tinymce';
-    var $elements = $(selector);
-
-    if($elements.length === 0){
-      return;
-    }
-
-    if(loadScript === null){
-      loadScript = $.when(
-        $.ajax({url: '//cdn.tinymce.com/4.3/tinymce.min.js', dataType: 'script', cache: true}),
-        $.ajax({url: '//cdn.tinymce.com/4.3/jquery.tinymce.min.js', dataType: 'script', cache: true})
-      ).done(function(){
-        $('body').trigger("tb:tinymce-loaded");
-        editor.tinymce.loaded = true;
-      });
-    }
-
-    loadScript.done(function(){
-      $elements.each(function(){
-        editor.initMCEWithOptions(this, options);
-      });
-    });
-  };
-
 })();

data/app/controllers/admin/users_controller.rb

@@ -8,8 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
   respond_to :html, :csv
 
   sortable_by :email, :current_login_at,
-              name: [:last_name, :first_name],
-              default: :email
+    name: [:last_name, :first_name],
+    default: :email
 
   def index
     @spud_users = SpudUser.order(sortable_query).paginate(page: params[:page], per_page: 15)

data/app/controllers/concerns/tb_core/error_handling.rb

@@ -29,6 +29,7 @@ module TbCore
           render template: error.template,
                  layout: nil,
                  formats: [:html],
+                 locals: { },
                  status: error.code,
                  content_type: 'text/html'
         end

data/app/helpers/tb_core/application_helper.rb

@@ -13,6 +13,21 @@ module TbCore::ApplicationHelper
     return form_for(record, options, &block)
   end
 
+  def tb_form_with(record, **options, &block)
+    options[:builder] = TbCore::FormBuilder
+
+    options[:html] ||= {}
+    if options[:html][:class]
+      options[:html][:class] += ' form-horizontal'
+    else
+      options[:html][:class] = 'form-horizontal'
+    end
+
+    options[:model] = record
+
+    return form_with(options, &block)
+  end
+
   def tb_form_errors(record, *fields_to_display)
     if record.errors.any?
       content_tag :div, class: 'form-errors test' do
@@ -56,6 +71,7 @@ module TbCore::ApplicationHelper
     end
   end
 
+  # rubocop:disable Rails/HelperInstanceVariable
   def tb_page_title
     if content_for?(:title)
       title = content_for(:title) + ' | ' + TbCore.site_name
@@ -66,6 +82,7 @@ module TbCore::ApplicationHelper
     end
     return content_tag :title, title
   end
+  # rubocop:enable Rails/HelperInstanceVariable
 
   def current_site_name
     return TbCore.config.site_name

data/app/models/concerns/tb_core/user_model.rb

@@ -2,26 +2,27 @@ module TbCore
   module UserModel
     extend ActiveSupport::Concern
 
+    # rubocop:disable Metrics/BlockLength
     included do
       self.table_name = 'spud_users'
 
       acts_as_authentic do |c|
-        c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512
         c.crypto_provider = Authlogic::CryptoProviders::SCrypt
         c.logged_in_timeout = 24.hours
         c.login_field = :email if TbCore.config.use_email_as_login
-        if TbCore.config.user_password_length
-          c.merge_validates_length_of_password_field_options(minimum: TbCore.config.user_password_length)
-        end
+        c.require_password_confirmation = true
       end
 
+      attr_accessor :password_confirmation
+
       belongs_to :role,
-        class_name: SpudRole.to_s, foreign_key: :spud_role_id, optional: true
+        class_name: 'SpudRole', foreign_key: :spud_role_id, optional: true
       has_many :spud_user_settings,
         dependent: :destroy, foreign_key: :spud_user_id
 
       validates :first_name, :last_name, presence: true
       before_validation :set_login_to_email, if: -> { TbCore.config.use_email_as_login }
+
       before_update :unset_requires_password_change
 
       scope :admins, lambda {
@@ -29,7 +30,37 @@ module TbCore
       }
 
       scope :ordered, -> { order('last_name asc, first_name asc, email asc') }
+
+      # These used to be built in to Authlogic
+      # See: https://github.com/binarylogic/authlogic/blob/5986e1bd056ccecc519d9f49cc83a0ba757668b4/doc/use_normal_rails_validation.md
+      validates :email,
+        format: {
+          with: ::TbCore::Regex::EMAIL,
+          message: proc {
+            ::Authlogic::I18n.t(
+              'error_messages.email_invalid',
+              default: 'should look like an email address.'
+            )
+          }
+        },
+        length: { maximum: 100 },
+        uniqueness: {
+          case_sensitive: false,
+          if: :will_save_change_to_email?
+        }
+      validates :password,
+        confirmation: { if: :require_password? },
+        length: {
+          minimum: 8,
+          if: :require_password?
+        }
+      validates :password_confirmation,
+        length: {
+          minimum: 8,
+          if: :require_password?
+        }
     end
+    # rubocop:enable Metrics/BlockLength
 
     module ClassMethods
 

data/app/views/layouts/admin/application.html.erb

@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
   <title><%= TbCore.config.site_name %> Admin</title>
+  <%= tinymce_assets unless ENV['TB_SKIP_TINYMCE'] %>
   <%= stylesheet_link_tag *TbCore.config.admin_stylesheets %>
   <%= javascript_include_tag *TbCore.config.admin_javascripts %>
   <%= csrf_meta_tags %>

data/lib/tb_core/engine.rb

@@ -7,6 +7,7 @@ require 'will_paginate-bootstrap'
 require 'breadcrumbs_on_rails'
 require 'rails-ujs'
 require 'sortable_by'
+require 'tinymce-rails'
 
 module Spud
 end
@@ -15,6 +16,7 @@ module TbCore
   class Engine < ::Rails::Engine
     require "#{root}/lib/tb_core/errors"
     require "#{root}/lib/tb_core/form_builder"
+    require "#{root}/lib/tb_core/regex"
     require "#{root}/lib/tb_core/searchable"
     require "#{root}/lib/tb_core/spud_core"
 

data/lib/tb_core/form_builder.rb

@@ -219,7 +219,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   # Builds a file field group
   #
   def tb_file_field(attribute, options={})
-    tb_input_field(attribute) do
+    tb_input_field(attribute, nil, options) do
       file_field(attribute)
     end
   end

data/lib/tb_core/regex.rb

@@ -0,0 +1,12 @@
+module TbCore
+  module Regex
+    EMAIL = /
+      \A
+      [A-Z0-9_.&%+\-']+   # mailbox
+      @
+      (?:[A-Z0-9\-]+\.)+  # subdomains
+      (?:[A-Z]{2,25})     # TLD
+      \z
+    /ix.freeze
+  end
+end

data/lib/tb_core/test_helper.rb

@@ -1,29 +1,31 @@
 require 'authlogic/test_case'
 
-module TbCore::SessionHelper
-  include Authlogic::TestCase
+module TbCore
+  module TestHelper
+    include Authlogic::TestCase
 
-  # Use this helper in controller specs to establish a login session
-  # - admin: Set to true to create a super_admin
-  # - permissions: One or more permissions you want to assign to the user (a role will be auto generated)
-  #
-  def activate_session(admin: false, permissions: nil)
-    activate_authlogic()
-    if permissions
-      permissions = [permissions] unless permissions.is_a?(Array)
-      role = SpudRole.create(name: 'New Role', permission_tags: permissions)
-    else
-      role = nil
+    # Use this helper in controller specs to establish a login session
+    # - admin: Set to true to create a super_admin
+    # - permissions: One or more permissions you want to assign to the user (a role will be auto generated)
+    #
+    def activate_session(admin: false, permissions: nil)
+      activate_authlogic()
+      if permissions
+        permissions = [permissions] unless permissions.is_a?(Array)
+        role = SpudRole.create(name: 'New Role', permission_tags: permissions)
+      else
+        role = nil
+      end
+      @user = FactoryBot.create(:spud_user, super_admin: admin, role: role)
+      SpudUserSession.create(@user)
+      return @user
     end
-    @user = FactoryBot.create(:spud_user, super_admin: admin, role: role)
-    SpudUserSession.create(@user)
-    return @user
-  end
 
-  # Returns the current user
-  #
-  def current_user
-    return @user
+    # Returns the current user
+    #
+    def current_user
+      return @user
+    end
   end
 end
 
@@ -31,7 +33,7 @@ end
 #
 if defined?(RSpec)
   RSpec.configure do |config|
-    config.include TbCore::SessionHelper
+    config.include TbCore::TestHelper
   end
 end
 

data/lib/tb_core/version.rb

@@ -1,3 +1,3 @@
 module TbCore
-  VERSION = '1.4.8'.freeze
+  VERSION = '1.5.4'.freeze
 end

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe Admin::DashboardController, type: :controller do
     it 'should contain data array in reponse' do
       get :badges
       json = JSON.parse(response.body)
-      expect(response.content_type).to eq('application/json')
+      expect(response.media_type).to eq('application/json')
       expect(json).to have_key('data')
     end
 

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/config/application.rb

@@ -12,51 +12,6 @@ module Dummy
       config.from_address = 'no-reply@dummy.com'
     end
 
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    config.i18n.enforce_available_locales = true
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = 'utf-8'
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    # config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    # config.assets.version = '1.0'
-
+    config.load_defaults '6.0'
   end
 end

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.4
 platform: ruby
 authors:
 - Greg Woods
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.3
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.3
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -156,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tinymce-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +250,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta2
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,7 +277,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -426,6 +462,7 @@ files:
 - lib/tb_core/engine.rb
 - lib/tb_core/errors.rb
 - lib/tb_core/form_builder.rb
+- lib/tb_core/regex.rb
 - lib/tb_core/responder.rb
 - lib/tb_core/searchable.rb
 - lib/tb_core/spud_core.rb
@@ -442,6 +479,7 @@ files:
 - spec/controllers/tb_core/application_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/admin/application.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/admin/application.scss
@@ -488,7 +526,7 @@ files:
 homepage: http://bitbucket.org/moser-inc/tb_core
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -503,15 +541,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Twice Baked Core Engine
 test_files:
 - spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/admin/application.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.scss