tb_core 1.4.1 → 1.4.2

data/spec/controllers/tb_core/sortable_params_spec.rb

@@ -0,0 +1,64 @@
+require 'rails_helper'
+
+describe TbCore::SortableParams, type: :controller do
+  controller do
+    include TbCore::SortableParams
+    sortable_by :first_name, :last_name, :email,
+                display_name: [:first_name, :last_name],
+                birth_date: 'user_birthdays.date :dir',
+                special: proc { |dir| "some_other_tables.whatever #{dir}" },
+                default: :last_name
+
+    def index; end
+  end
+
+  describe '#sort_direction' do
+    it 'returns asc' do
+      expect(controller.sort_direction).to eq(:asc)
+    end
+    it 'returns desc' do
+      controller.params[:dir] = 'desc'
+      expect(controller.sort_direction).to eq(:desc)
+    end
+  end
+
+  describe '#sort_attribute' do
+    it 'returns the default' do
+      expect(controller.sort_attribute).to eq(:last_name)
+    end
+    it 'returns the param' do
+      controller.params[:sort] = 'email'
+      expect(controller.sort_attribute).to eq(:email)
+    end
+  end
+
+  describe '#sortable_query' do
+    it 'returns the value as a hash' do
+      controller.params[:sort] = 'email'
+      expect(controller.sortable_query).to eq(email: :asc)
+    end
+
+    it 'returns a multi value hash' do
+      controller.params[:sort] = 'display_name'
+      controller.params[:dir] = 'desc'
+      expect(controller.sortable_query).to eq(first_name: :desc, last_name: :desc)
+    end
+
+    it 'returns a string with substitution' do
+      controller.params[:sort] = 'birth_date'
+      controller.params[:dir] = 'desc'
+      expect(controller.sortable_query).to eq('user_birthdays.date desc')
+    end
+
+    it 'returns a string by calling a proc' do
+      controller.params[:sort] = 'special'
+      controller.params[:dir] = 'desc'
+      expect(controller.sortable_query).to eq('some_other_tables.whatever desc')
+    end
+
+    it 'returns nothing' do
+      controller.params[:sort] = 'not_allowed'
+      expect(controller.sortable_query).to eq(nil)
+    end
+  end
+end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < Spud::ApplicationController
+class ApplicationController < TbCore::ApplicationController
   protect_from_forgery
 end

data/spec/helpers/tb_core/application_helper_spec.rb

@@ -0,0 +1,39 @@
+require 'rails_helper'
+
+describe TbCore::ApplicationHelper, type: :helper do
+  describe '#tb_table_header' do
+
+    it 'returns a table header with rows' do
+      result = helper.tb_table_header(:admin_users_path)
+      expect(result).to include('<thead class="tb-table-header"><tr></tr></thead>')
+      expect(result).to include('</thead>')
+    end
+
+    it 'has some headers' do
+      result = helper.tb_table_header(:admin_users_path, model: SpudUser) do |t|
+        view.concat(t.header(:first_name))
+        view.concat(t.header(:email))
+      end
+      expect(result).to include('<th>First name</th>')
+      expect(result).to include('<th>Email</th>')
+    end
+
+    it 'generates links' do
+      result = helper.tb_table_header(:admin_users_path, model: SpudUser) do |t|
+        view.concat(t.sortable(:first_name))
+        view.concat(t.sortable(:email))
+      end
+      expect(result).to include('<a href="/admin/users?dir=asc&amp;sort=first_name">First name</a>')
+      expect(result).to include('<a href="/admin/users?dir=asc&amp;sort=email">Email</a>')
+    end
+
+    it 'sets the active class' do
+      helper.params[:sort] = 'first_name'
+      helper.params[:dir] = 'desc'
+      result = helper.tb_table_header(:admin_users_path, model: SpudUser) do |t|
+        view.concat(t.sortable(:first_name))
+      end
+      expect(result).to include('<th class="sortable sortable-active sortable-desc">')
+    end
+  end
+end

data/spec/rails_helper.rb

@@ -1,18 +1,17 @@
+require 'simplecov'
+SimpleCov.start 'rails'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'spec_helper'
-# require 'session_helper'
 require 'tb_core/test_helper'
 require 'rails-controller-testing'
 require 'rspec/rails'
 require 'database_cleaner'
-require 'simplecov'
 require 'factory_girl_rails'
 
-SimpleCov.start 'rails'
-
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.example_status_persistence_file_path = 'tmp/rspec.txt'
+
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
   # assertions if you prefer.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,6 @@ 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
@@ -295,9 +294,9 @@ files:
 - app/assets/libs/datepicker/js/bootstrap-datepicker.js
 - app/assets/libs/datepicker/less/datepicker.less
 - app/assets/libs/rails-ujs.js
+- app/assets/libs/sortable/sortable.js
 - 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
@@ -308,13 +307,16 @@ files:
 - app/controllers/admin/setup_controller.rb
 - app/controllers/admin/user_sessions_controller.rb
 - app/controllers/admin/users_controller.rb
+- app/controllers/concerns/tb_core/error_handling.rb
+- app/controllers/concerns/tb_core/redirection.rb
+- app/controllers/concerns/tb_core/sortable_params.rb
+- app/controllers/concerns/tb_core/user_authentication.rb
 - app/controllers/password_resets_controller.rb
-- app/controllers/spud/admin/application_controller.rb
 - app/controllers/spud/application_controller.rb
+- app/controllers/tb_core/application_controller.rb
 - app/controllers/user_sessions_controller.rb
 - app/helpers/admin/application_helper.rb
 - app/helpers/admin/roles_helper.rb
-- app/helpers/spud/application_helper.rb
 - app/helpers/tb_core/application_helper.rb
 - app/mailers/tb_core_mailer.rb
 - app/models/spud/spud_user_model.rb
@@ -408,6 +410,7 @@ files:
 - lib/tb_core/belongs_to_app.rb
 - lib/tb_core/form_builder.rb
 - lib/tb_core/responder.rb
+- lib/tb_core/table_header.rb
 - lib/tb_core/test_helper.rb
 - spec/controllers/admin/application_controller_spec.rb
 - spec/controllers/admin/dashboard_controller_spec.rb
@@ -416,7 +419,8 @@ files:
 - spec/controllers/admin/setup_controller_spec.rb
 - spec/controllers/admin/user_sessions_controller_spec.rb
 - spec/controllers/admin/users_controller_spec.rb
-- spec/controllers/spud/application_controller_spec.rb
+- spec/controllers/tb_core/application_controller_spec.rb
+- spec/controllers/tb_core/sortable_params_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/admin/application.js
@@ -452,6 +456,7 @@ files:
 - spec/factories/spud_role_factories.rb
 - spec/factories/spud_user_factories.rb
 - spec/helpers/spud/admin/application_helper_spec.rb
+- spec/helpers/tb_core/application_helper_spec.rb
 - spec/lib/spud_core/configuration_spec.rb
 - spec/lib/tb_core/belongs_to_app_spec.rb
 - spec/models/spud_role_spec.rb
@@ -489,7 +494,8 @@ test_files:
 - spec/controllers/admin/setup_controller_spec.rb
 - spec/controllers/admin/user_sessions_controller_spec.rb
 - spec/controllers/admin/users_controller_spec.rb
-- spec/controllers/spud/application_controller_spec.rb
+- spec/controllers/tb_core/application_controller_spec.rb
+- spec/controllers/tb_core/sortable_params_spec.rb
 - spec/dummy/app/assets/javascripts/admin/application.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/admin/application.scss
@@ -525,6 +531,7 @@ test_files:
 - spec/factories/spud_role_factories.rb
 - spec/factories/spud_user_factories.rb
 - spec/helpers/spud/admin/application_helper_spec.rb
+- spec/helpers/tb_core/application_helper_spec.rb
 - spec/lib/spud_core/configuration_spec.rb
 - spec/lib/tb_core/belongs_to_app_spec.rb
 - spec/models/spud_role_spec.rb

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

@@ -1,22 +0,0 @@
-// 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/widgets/mouse
-//= require jquery-ui/widgets/draggable
-//= require jquery-ui/widgets/droppable
-//= require jquery-ui/widgets/sortable
-//

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

@@ -1,19 +0,0 @@
-// 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/spud/admin/application_controller.rb

@@ -1,12 +0,0 @@
-class Spud::Admin::ApplicationController < Admin::ApplicationController
-
-  def initialize
-    ActiveSupport::Deprecation.warn(
-      "Spud::Admin::ApplicationController is deprecated and may be removed from future releases,
-      use Admin::ApplicationController instead.",
-      caller
-    )
-    super
-  end
-
-end

data/app/helpers/spud/application_helper.rb

@@ -1,36 +0,0 @@
-module Spud::ApplicationHelper
-
-  def tb_page_title
-    if content_for?(:title)
-      title = content_for(:title) + ' | ' + Spud::Core.site_name
-    elsif @page_title
-      title = @page_title + ' | ' + Spud::Core.site_name
-    else
-      title = Spud::Core.site_name
-    end
-    return content_tag :title, title
-  end
-
-  def current_site_name
-    return Spud::Core.config.site_name
-  end
-
-  def cache_key_for_spud_collection(collection, key:'view', cache_params:[], for_user:false)
-    cache_keys = [controller_name, action_name, key]
-    cache_keys << collection.collect(&:updated_at).max().try(:utc).try(:to_i)
-    if for_user
-      cache_keys << current_user_id
-    end
-    if cache_params.any?
-      cache_keys += cache_params.collect{ |cache_param| params[cache_param] || 'nil' }
-    end
-    cache_keys += collection.collect(&:id)
-    cache_key = cache_keys.join('/')
-    if cache_key.length > 250
-      return Digest::SHA1.hexdigest(cache_key)
-    else
-      return cache_key
-    end
-  end
-
-end