tb_core 1.4.3.1 → 1.4.4

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

@@ -11,6 +11,6 @@ window.app = {
   }
 };
 
-$(document).ready(app.admin.init);
+document.addEventListener('DOMContentLoaded', app.admin.init);
 
 })();

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

@@ -12,6 +12,6 @@ window.app = {
   }
 };
 
-$(document).ready(app.init);
+document.addEventListener('DOMContentLoaded', app.init);
 
 })();

data/spec/dummy/config/application.rb

@@ -7,7 +7,7 @@ require 'tb_core'
 
 module Dummy
   class Application < Rails::Application
-    Spud::Core.configure do |config|
+    TbCore.configure do |config|
       config.site_name = 'Dummy'
       config.from_address = 'no-reply@dummy.com'
     end

data/spec/factories/spud_admin_permission_factories.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :permission_name do |n|
     "app#{n}"
   end
   
   factory :spud_admin_permission do
-    name { FactoryGirl.generate(:permission_name) }
+    name { FactoryBot.generate(:permission_name) }
     access true
   end
 end

data/spec/factories/spud_role_factories.rb

@@ -1,9 +1,9 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :name do |n|
     "SomeRole#{n}"
   end
 
   factory :spud_role do
-    name { FactoryGirl.generate(:name) }
+    name { FactoryBot.generate(:name) }
   end
 end

data/spec/factories/spud_user_factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence :first_name do |n|
     "John#{n}"
   end
@@ -20,12 +20,12 @@ FactoryGirl.define do
   end
     
   factory :spud_user do
-    first_name { FactoryGirl.generate(:first_name) }
-    last_name { FactoryGirl.generate(:last_name) }
-    login { FactoryGirl.generate(:login) }
-    email { FactoryGirl.generate(:email) }
+    first_name { FactoryBot.generate(:first_name) }
+    last_name { FactoryBot.generate(:last_name) }
+    login { FactoryBot.generate(:login) }
+    email { FactoryBot.generate(:email) }
     password 'password'
     password_confirmation 'password'
-    single_access_token { FactoryGirl.generate(:single_access_token) }
+    single_access_token { FactoryBot.generate(:single_access_token) }
   end
 end

data/spec/helpers/spud/admin/application_helper_spec.rb

@@ -26,7 +26,7 @@ describe Admin::ApplicationHelper, type: :helper do
 
   describe '#tb_form_errors' do
     before(:each) do
-      @user = FactoryGirl.create(:spud_user)
+      @user = FactoryBot.create(:spud_user)
     end
 
     it 'should return blank when no errors exist' do

data/spec/helpers/tb_core/application_helper_spec.rb

@@ -1,39 +1,4 @@
 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/lib/spud_core/configuration_spec.rb

@@ -1,9 +1,9 @@
 require 'rails_helper'
 
-describe Spud::Core do
+describe TbCore do
 
   before :each do
-    Spud::Core.configure do |config|
+    TbCore.configure do |config|
       config.site_id = 0
       config.site_name = 'Default Site'
       config.short_name = 'default'

data/spec/lib/tb_core/belongs_to_app_spec.rb

@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 class DummyController < ActionController::Base
+  include TbCore::BelongsToApp
   attr_accessor :current_user
 end
 
@@ -23,7 +24,7 @@ describe TbCore::BelongsToApp do
 
   describe '#acts_as_app' do
     it 'should configure the app' do
-      controller.current_user = FactoryGirl.create(:spud_user, super_admin: true)
+      controller.current_user = FactoryBot.create(:spud_user, super_admin: true)
       controller.send(:act_as_app, :users)
       expect(controller.instance_variable_get('@page_application')).to be_a(Hash)
     end
@@ -35,10 +36,10 @@ describe TbCore::BelongsToApp do
     end
 
     it 'should raise an error if the user does not have access' do
-      controller.current_user = FactoryGirl.create(:spud_user, super_admin: false)
+      controller.current_user = FactoryBot.create(:spud_user, super_admin: false)
       expect{
         controller.send(:act_as_app, :users)
-      }.to raise_error(Spud::AccessDeniedError)
+      }.to raise_error(TbCore::AccessDeniedError)
     end
   end
 

data/spec/models/spud_role_spec.rb

@@ -3,10 +3,10 @@ require 'rails_helper'
 describe SpudRole, type: :model do
 
 	before :each do
-		@role = FactoryGirl.build(:spud_role)
+		@role = FactoryBot.build(:spud_role)
 		@full_access = SpudPermission.new('Test Full Access', 'admin.test.full_access')
 		@partial_access = SpudPermission.new('Test Partial Access', 'admin.test.partial_access')
-		Spud::Core.permissions += [@full_access, @partial_access]
+		TbCore.permissions += [@full_access, @partial_access]
 		@role.permissions = [@partial_access]
 		@role.save()
 	end

data/spec/models/spud_user_spec.rb

@@ -4,8 +4,8 @@ describe SpudUser, type: :model do
 
   describe '.where_name_like' do
     it 'matches on the concatenated first and last name' do
-      2.times { FactoryGirl.create(:spud_user) }
-      user = FactoryGirl.create(:spud_user, first_name: 'Some', last_name: 'User')
+      2.times { FactoryBot.create(:spud_user) }
+      user = FactoryBot.create(:spud_user, first_name: 'Some', last_name: 'User')
       result = SpudUser.where_name_like('Some User')
       expect(result.length).to eq(1)
       expect(result.first).to eq(user)
@@ -14,12 +14,12 @@ describe SpudUser, type: :model do
 
   describe '.with_permission' do
     before :each do
-      role = FactoryGirl.create(:spud_role,
+      role = FactoryBot.create(:spud_role,
         permission_tags: ['hello']
       )
-      @super_user = FactoryGirl.create(:spud_user, super_admin: true)
-      @admin_user = FactoryGirl.create(:spud_user, super_admin: false, role: role)
-      @normal_user = FactoryGirl.create(:spud_user, super_admin: false)
+      @super_user = FactoryBot.create(:spud_user, super_admin: true)
+      @admin_user = FactoryBot.create(:spud_user, super_admin: false, role: role)
+      @normal_user = FactoryBot.create(:spud_user, super_admin: false)
     end
 
     it 'should include the admin user' do
@@ -37,41 +37,41 @@ describe SpudUser, type: :model do
 
   describe '#full_name' do
     it 'should return the full name if the first and last name are not blank' do
-      u = FactoryGirl.build(:spud_user)
+      u = FactoryBot.build(:spud_user)
       expect(u.full_name).to  eq("#{u.first_name} #{u.last_name}")
     end
 
     it 'should return only the last name if the first name is blank' do
-      u = FactoryGirl.build(:spud_user, first_name: nil)
+      u = FactoryBot.build(:spud_user, first_name: nil)
       expect(u.full_name).to  eq(u.last_name)
     end
 
     it 'should return only the first name if the last name is blank' do
-      u = FactoryGirl.build(:spud_user, last_name: nil)
+      u = FactoryBot.build(:spud_user, last_name: nil)
       expect(u.full_name).to  eq(u.first_name)
     end
 
     it 'should return the login if the first and last name are blank' do
-      u = FactoryGirl.build(:spud_user, first_name: nil, last_name: nil)
+      u = FactoryBot.build(:spud_user, first_name: nil, last_name: nil)
       expect(u.full_name).to  eq(u.login)
     end
   end
 
   it 'must match password confirmation before saving a new user' do
-    u = FactoryGirl.build(:spud_user, password_confirmation: '')
+    u = FactoryBot.build(:spud_user, password_confirmation: '')
     expect(u.save).to eq(false)
   end
 
   describe '#unset_requires_password_change' do
     it 'should not unset the requires_password_change flag' do
-      u = FactoryGirl.create(:spud_user, requires_password_change: true)
+      u = FactoryBot.create(:spud_user, requires_password_change: true)
       expect{
         u.update_attributes(first_name: 'updated')
       }.to_not change(u, :requires_password_change)
     end
 
     it 'should unset the requires_password_change flag' do
-      u = FactoryGirl.create(:spud_user, requires_password_change: true)
+      u = FactoryBot.create(:spud_user, requires_password_change: true)
       expect{
         u.update_attributes(password: 'new password', password_confirmation: 'new password')
         u.reload

data/spec/rails_helper.rb

@@ -10,7 +10,7 @@ require 'tb_core/test_helper'
 require 'rails-controller-testing'
 require 'rspec/rails'
 require 'database_cleaner'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 
 # Add additional requires below this line. Rails is not loaded until this point!
 

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.3.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
-  name: responders
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: authlogic
+  name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: scrypt
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rails-ujs
   requirement: !ruby/object:Gem::Requirement
@@ -95,105 +95,105 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: breadcrumbs_on_rails
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate-bootstrap
+  name: scrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: sortable_by
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,21 +207,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -299,11 +299,7 @@ files:
 - app/assets/javascripts/admin/core/preinit.js
 - app/assets/javascripts/admin/core/roles.js
 - app/assets/javascripts/admin/core/users.js
-- app/assets/javascripts/tb_core.js.erb
-- app/assets/javascripts/tb_core/configuration.js.erb
-- app/assets/javascripts/tb_core/console.js
-- app/assets/javascripts/tb_core/remote.js
-- app/assets/javascripts/tb_core/utility.js
+- app/assets/javascripts/tb_core.js
 - app/assets/libs/datepicker/css/datepicker.css
 - app/assets/libs/datepicker/js/bootstrap-datepicker.js
 - app/assets/libs/datepicker/less/datepicker.less
@@ -322,16 +318,15 @@ files:
 - 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/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/tb_core/application_helper.rb
 - app/mailers/tb_core_mailer.rb
+- app/models/concerns/tb_core/user_model.rb
 - app/models/spud/spud_user_model.rb
 - app/models/spud_permission.rb
 - app/models/spud_role.rb
@@ -397,7 +392,6 @@ files:
 - lib/generators/spud/templates/assets/admin/module.js.erb
 - lib/generators/spud/templates/assets/application.js
 - lib/generators/spud/templates/assets/application.scss
-- lib/generators/spud/templates/assets/bootstrap.js
 - lib/generators/spud/templates/assets/module.js.erb
 - lib/generators/spud/templates/controller.rb.erb
 - lib/generators/spud/templates/controller_spec.rb.erb
@@ -410,20 +404,20 @@ files:
 - lib/generators/spud/templates/views/frontend/show.html.erb
 - lib/generators/spud/templates/views/layouts/application.html.erb
 - lib/generators/spud/templates/views/layouts/error_page.html.erb
-- lib/spud_core/catch_all_route.rb
-- lib/spud_core/configuration.rb
-- lib/spud_core/engine.rb
-- lib/spud_core/errors.rb
-- lib/spud_core/searchable.rb
-- lib/spud_core/test_files.rb
-- 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/catch_all_route.rb
+- lib/tb_core/configuration.rb
+- lib/tb_core/engine.rb
+- lib/tb_core/errors.rb
 - lib/tb_core/form_builder.rb
 - lib/tb_core/responder.rb
-- lib/tb_core/table_header.rb
+- lib/tb_core/searchable.rb
+- lib/tb_core/spud_core.rb
+- lib/tb_core/test_files.rb
 - lib/tb_core/test_helper.rb
+- lib/tb_core/version.rb
 - spec/controllers/admin/application_controller_spec.rb
 - spec/controllers/admin/dashboard_controller_spec.rb
 - spec/controllers/admin/password_reset_controller_spec.rb
@@ -432,7 +426,6 @@ files:
 - spec/controllers/admin/user_sessions_controller_spec.rb
 - spec/controllers/admin/users_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
@@ -494,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Twice Baked Core Engine
@@ -545,7 +538,6 @@ test_files:
 - spec/controllers/admin/setup_controller_spec.rb
 - spec/controllers/admin/settings_controller_spec.rb
 - spec/controllers/admin/application_controller_spec.rb
-- spec/controllers/tb_core/sortable_params_spec.rb
 - spec/controllers/tb_core/application_controller_spec.rb
 - spec/rails_helper.rb
 - spec/helpers/tb_core/application_helper_spec.rb