tb_core 1.4.3.1 → 1.4.4

data/lib/tb_core/catch_all_route.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  match '*any' => 'tb_core/application#not_found', via: :all
+end

data/lib/tb_core/configuration.rb

@@ -0,0 +1,28 @@
+module TbCore
+  include ActiveSupport::Configurable
+  config_accessor :site_name, :admin_applications, :from_address, :site_id, :short_name,
+    :javascripts, :stylesheets, :admin_javascripts, :admin_stylesheets,
+    :permissions, :production_alert_domain, :use_email_as_login
+  self.admin_applications = []
+  self.site_name = 'Company Name'
+  self.site_id = 0
+  self.short_name = 'default'
+  self.javascripts = []
+  self.stylesheets = []
+  self.from_address = 'no-reply@companyname.com'
+  self.permissions = []
+  self.admin_javascripts = ['admin/core/application', 'admin/application']
+  self.admin_stylesheets = ['admin/core/application', 'admin/application']
+  self.production_alert_domain = nil
+  self.use_email_as_login = false
+
+  def self.append_admin_javascripts(*args)
+    args = args[0] if args[0].is_a?(Array)
+    TbCore.config.admin_javascripts += args
+  end
+
+  def self.append_admin_stylesheets(*args)
+    args = args[0] if args[0].is_a?(Array)
+    TbCore.config.admin_stylesheets += args
+  end
+end

data/lib/tb_core/engine.rb

@@ -0,0 +1,61 @@
+require 'responders'
+require 'jquery-rails'
+require 'authlogic'
+require 'bootstrap-sass'
+require 'will_paginate'
+require 'will_paginate-bootstrap'
+require 'breadcrumbs_on_rails'
+require 'rails-ujs'
+require 'sortable_by'
+
+module Spud
+end
+
+module TbCore
+  class Engine < ::Rails::Engine
+    require "#{root}/lib/tb_core/errors"
+    require "#{root}/lib/tb_core/form_builder"
+    require "#{root}/lib/tb_core/searchable"
+    require "#{root}/lib/tb_core/spud_core"
+
+    engine_name :tb_core
+    config.autoload_paths << "#{root}/lib"
+
+    initializer 'tb_core.admin', after: :admin do
+      # Translate Hash configured permissions into SpudPermission objects
+      TbCore.permissions.collect! do |p|
+        if p.is_a? Hash
+          SpudPermission.new(p[:tag], p[:name], p[:apps])
+        else
+          p
+        end
+      end
+
+      # Append Users admin module
+      TbCore.config.admin_applications.unshift(name: 'Users',
+                                               thumbnail: 'admin/users_thumb.png',
+                                               url: '/admin/users',
+                                               order: 100)
+
+      # Create default permissions for modules
+      TbCore.admin_applications.each do |admin_application|
+        admin_application[:key] ||= admin_application[:name].tr(' ', '_').downcase.to_sym
+        tag = "admin.#{admin_application[:key]}.full_access"
+        name = "#{admin_application[:name]} admin"
+        apps = [admin_application[:key]]
+        TbCore.permissions.push(SpudPermission.new(tag, name, apps))
+      end
+    end
+
+    initializer 'tb_core.catch_all_route' do |config|
+      # Handle 404 errors if Spud::Cms is not installed
+      unless defined?(Spud::Cms)
+        config.routes_reloader.paths << File.expand_path('../catch_all_route.rb', __FILE__)
+      end
+    end
+
+    initializer 'tb_core.assets' do
+      Rails.application.config.assets.precompile += ['admin/users_thumb.png', 'admin/module_icon.png']
+    end
+  end
+end

data/lib/tb_core/errors.rb

@@ -0,0 +1,50 @@
+module TbCore
+
+  class RequestError < StandardError
+    attr_accessor :request_url, :item, :template
+    attr_reader :code, :title
+
+    # For compatability reasons, this method accepts multiple styles of inputs
+    # Going forward the expected input will be:
+    #
+    # * item: The item that could not be found. String. (default = page)
+    # * template (named): ERB template you wish to render
+    #
+    def initialize(item_or_opts='page', opts={})
+      if item_or_opts.is_a?(Hash)
+        @item = item_or_opts[:item]
+        @template = item_or_opts[:template]
+      else
+        @item = item_or_opts
+        @template = opts[:template]
+      end
+      @template ||= 'layouts/error_page'
+      @title = I18n.t(:title, scope: [:tb_core, :errors, @i18n])
+      super(I18n.t(:message, scope: [:tb_core, :errors, @i18n], item: @item))
+    end
+  end
+
+  class AccessDeniedError < RequestError
+    def initialize(item_or_opts='page', opts={})
+      @code = 403
+      @i18n = 'access_denied'
+      super(item_or_opts, opts)
+    end
+  end
+
+  class NotFoundError < RequestError
+    def initialize(item_or_opts='page', opts={})
+      @code = 404
+      @i18n = 'not_found'
+      super(item_or_opts, opts)
+    end
+  end
+
+  class UnauthorizedError < RequestError
+    def initialize(item_or_opts='page', opts={})
+      @code = 401
+      @i18n = 'unauthorized'
+      super(item_or_opts, opts)
+    end
+  end
+end

data/lib/tb_core/responder.rb

@@ -8,30 +8,4 @@ class TbCore::Responder < ActionController::Responder
       @options[:location] = nil
     end
   end
-
-  # Override the common behavior for formats associated with APIs, such as :xml and :json.
-  #
-  def api_behavior
-    raise MissingRenderer.new(format) unless has_renderer?
-    if get?
-      display resource
-    elsif post? || patch?
-      display resource, status: :created, location: api_location
-    else
-      head :no_content
-    end
-  end
-
-  # Default responder only sends the basic errors array
-  # This override also sends the translated labels for convenience
-  #
-  def json_resource_errors
-    return Hash[resource.errors.messages.map do |attribute, messages|
-      [attribute, {
-        label: resource.class.human_attribute_name(attribute),
-        messages: messages
-      }]
-    end]
-  end
-
 end

data/lib/{spud_core → tb_core}/searchable.rb

@@ -5,7 +5,10 @@ module Spud::Searchable
   end
   module ClassMethods
     def spud_searchable
-      # puts "Place Holder For #{self.name}"
+      ActiveSupport::Deprecation.warn(
+        'Spud::Searchable is deprecated and will be removed from future releases.',
+        caller
+      )
     end
   end
 end

data/lib/tb_core/spud_core.rb

@@ -0,0 +1,23 @@
+module Spud
+  module Core
+    module ClassMethods
+
+      def method_missing(method_signature, *args, &block)
+        if TbCore.respond_to?(method_signature)
+          ActiveSupport::Deprecation.warn(
+            'The Spud::Core namespace is being replaced by TbCore. Please update your app code accordingly.',
+            caller
+          )
+          TbCore.__send__(method_signature, *args, &block)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method_signature)
+        TbCore.respond_to?(method_signature) || super
+      end
+    end
+    extend ClassMethods
+  end
+end

data/lib/tb_core/test_helper.rb

@@ -15,7 +15,7 @@ module TbCore::SessionHelper
     else
       role = nil
     end
-    @user = FactoryGirl.create(:spud_user, super_admin: admin, role: role)
+    @user = FactoryBot.create(:spud_user, super_admin: admin, role: role)
     SpudUserSession.create(@user)
     return @user
   end
@@ -35,8 +35,8 @@ if defined?(RSpec)
   end
 end
 
-# Auto load the spud_user factory if FactoryGirl is in use
+# Auto load the spud_user factory if FactoryBot is in use
 #
-if defined?(FactoryGirl)
+if defined?(FactoryBot)
   Dir[TbCore::Engine.root.join('spec/factories/spud_user_factories.rb')].each{ |f| require f }
 end

data/lib/tb_core/version.rb

@@ -0,0 +1,3 @@
+module TbCore
+  VERSION = '1.4.4'.freeze
+end

data/spec/controllers/admin/application_controller_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Admin::ApplicationController, type: :controller do
 
   before :each do
     activate_authlogic
-    @user = FactoryGirl.create(:spud_user)
-    @role = FactoryGirl.create(:spud_role)
+    @user = FactoryBot.create(:spud_user)
+    @role = FactoryBot.create(:spud_role)
     @session = SpudUserSession.create(@user)
   end
 
@@ -15,6 +15,7 @@ RSpec.describe Admin::ApplicationController, type: :controller do
         head :ok
       end
     end
+
     it 'should respond successfully if the current user is a super admin' do
       @user.update_attributes(super_admin: true)
       get :index
@@ -23,9 +24,9 @@ RSpec.describe Admin::ApplicationController, type: :controller do
 
     it 'should respond successfully if the current user has admin permissions' do
       @role.permission_tags = ['admin.users.full_access']
-      @role.save()
+      @role.save
       @user.role = @role
-      @user.save()
+      @user.save
       get :index
       expect(response).to be_success
     end
@@ -44,6 +45,5 @@ RSpec.describe Admin::ApplicationController, type: :controller do
       expect(response.code).to eq('403')
       expect(response).to render_template('layouts/admin/error_page')
     end
-
   end
 end

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Admin::DashboardController, type: :controller do
 
   before(:all) do
-    Spud::Core.admin_applications += [{
+    TbCore.admin_applications += [{
       name: 'Test App',
       url: '/test/app',
       permissions: ['admin.test_app.full_access']
@@ -22,7 +22,7 @@ RSpec.describe Admin::DashboardController, type: :controller do
   describe 'index' do
     it 'should display applications the current user has access to given that the current user is not a super admin' do
       @user.super_admin = false
-      @user.role = FactoryGirl.create(:spud_role, permission_tags: ['admin.users.full_access'])
+      @user.role = FactoryBot.create(:spud_role, permission_tags: ['admin.users.full_access'])
       @user.save()
       get :index
 
@@ -32,7 +32,7 @@ RSpec.describe Admin::DashboardController, type: :controller do
     it 'should not display applications the current user does not have access
       to given that the current user is not a super admin' do
       @user.super_admin = false
-      @user.role = FactoryGirl.create(:spud_role, permission_tags: ['admin.users.full_access'])
+      @user.role = FactoryBot.create(:spud_role, permission_tags: ['admin.users.full_access'])
       @user.save()
       get :index
 
@@ -46,7 +46,7 @@ RSpec.describe Admin::DashboardController, type: :controller do
       @user.save
       get :index
 
-      excectation = Spud::Core.admin_applications.collect{|app| app[:name] }
+      excectation = TbCore.admin_applications.collect{|app| app[:name] }
       expect(assigns(:admin_applications).collect{|app| app[:name] }).to eq(excectation)
     end
   end
@@ -54,7 +54,7 @@ RSpec.describe Admin::DashboardController, type: :controller do
   describe 'badges' do
     before(:each) do
       request.accept = 'application/json'
-      Spud::Core.configure do |config|
+      TbCore.configure do |config|
         config.site_name = 'Test Site'
       end
       @user.super_admin = true

data/spec/controllers/admin/password_reset_controller_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe Admin::PasswordResetsController, type: :controller do
 
-  let(:user) { FactoryGirl.build(:spud_user, id: 1, perishable_token: 'jfdlsafhbkvabuadfbds') }
+  let(:user) { FactoryBot.build(:spud_user, id: 1, perishable_token: 'jfdlsafhbkvabuadfbds') }
 
   context 'get' do
     describe 'index' do

data/spec/controllers/admin/settings_controller_spec.rb

@@ -14,7 +14,7 @@ describe Admin::SettingsController, type: :controller do
 
   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 = FactoryBot.build(:spud_user)
       u.password = 'test'
       put :update, params: { spud_user: {first_name: 'Mike', password: 'Imapassword', current_password: 'ImaTest'} }
       expect(response).to have_http_status(401)

data/spec/controllers/admin/setup_controller_spec.rb

@@ -20,12 +20,12 @@ describe Admin::SetupController, type: :controller do
   describe 'create' do
     it 'should create a new user' do
       expect{
-        post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user) }
+        post :create, params: { spud_user: FactoryBot.attributes_for(:spud_user) }
       }.to change(SpudUser, :count).by(1)
     end
 
     it 'should redirect to the admin dashboard when first admin user has been created' do
-      post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user) }
+      post :create, params: { spud_user: FactoryBot.attributes_for(:spud_user) }
       expect(response).to redirect_to(admin_root_path)
     end
   end

data/spec/controllers/admin/user_sessions_controller_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe Admin::UserSessionsController, type: :controller do
   before(:each) do
     # activate_authlogic
-    # SpudUserSession.create(FactoryGirl.build(:spud_user))
+    # SpudUserSession.create(FactoryBot.build(:spud_user))
   end
 
   describe 'new' do
@@ -13,7 +13,7 @@ describe Admin::UserSessionsController, type: :controller do
     end
 
     it 'should render login form if users do exist' do
-      u = FactoryGirl.create(:spud_user)
+      u = FactoryBot.create(:spud_user)
       u.save
       get :new
       expect(response).to be_success

data/spec/controllers/admin/users_controller_spec.rb

@@ -4,14 +4,14 @@ describe Admin::UsersController, type: :controller do
 
   before(:each) do
     activate_session(admin: true)
-    @role = FactoryGirl.create(:spud_role)
-    Spud::Core.admin_applications += [{name: 'Test', key: :test}]
-    Spud::Core.permissions.push(SpudPermission.new('admin.test.full_access', 'Test', [:test]))
+    @role = FactoryBot.create(:spud_role)
+    TbCore.admin_applications += [{name: 'Test', key: :test}]
+    TbCore.permissions.push(SpudPermission.new('admin.test.full_access', 'Test', [:test]))
   end
 
   describe 'index' do
     it 'should return an array of users' do
-      2.times {|x| FactoryGirl.create(:spud_user) }
+      2.times {|x| FactoryBot.create(:spud_user) }
       get :index
 
       expect(assigns(:spud_users).count).to be > 1
@@ -24,7 +24,7 @@ describe Admin::UsersController, type: :controller do
     end
 
     it 'should not allow access to users with NO permissions' do
-      SpudUserSession.create(FactoryGirl.build(:spud_user, super_admin: false))
+      SpudUserSession.create(FactoryBot.build(:spud_user, super_admin: false))
       get :index
 
       expect(response.code).to eq('403')
@@ -32,7 +32,7 @@ describe Admin::UsersController, type: :controller do
     end
 
     it 'should allow access to users with the correct permissions' do
-      u = FactoryGirl.create(:spud_user, super_admin: false)
+      u = FactoryBot.create(:spud_user, super_admin: false)
       @role.permission_tags = ['admin.users.full_access']
       @role.save()
       u.role = @role
@@ -44,7 +44,7 @@ describe Admin::UsersController, type: :controller do
 
     it 'should not allow access to users without a role,
       and redirect to render error page if the user has no permissions' do
-      u = FactoryGirl.create(:spud_user, super_admin: false)
+      u = FactoryBot.create(:spud_user, super_admin: false)
       u.role = nil
       SpudUserSession.create(u)
       get :index
@@ -55,7 +55,7 @@ describe Admin::UsersController, type: :controller do
 
     it 'should not allow access to users with a role that contains no permissions,
       and render error page if the users has no other admin modules' do
-      u = FactoryGirl.create(:spud_user, super_admin: false)
+      u = FactoryBot.create(:spud_user, super_admin: false)
       u.role = @role
       @role.spud_role_permissions = []
       SpudUserSession.create(u)
@@ -67,7 +67,7 @@ describe Admin::UsersController, type: :controller do
 
     it 'should not allow access to users without permission
       and render error page if the users has other admin modules' do
-      u = FactoryGirl.create(:spud_user, super_admin: false)
+      u = FactoryBot.create(:spud_user, super_admin: false)
       @role.permission_tags = ['admin.test.full_access']
       u.role = @role
       SpudUserSession.create(u)
@@ -80,7 +80,7 @@ describe Admin::UsersController, type: :controller do
 
   describe 'show' do
     it 'should respond successfully' do
-      user = FactoryGirl.create(:spud_user)
+      user = FactoryBot.create(:spud_user)
       get :show, params: { id: user.id }
       expect(response).to be_success
     end
@@ -97,13 +97,13 @@ describe Admin::UsersController, type: :controller do
     context 'HTML format' do
       it 'should create a new user with a valid form submission' do
         expect {
-          post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user) }
+          post :create, params: { spud_user: FactoryBot.attributes_for(:spud_user) }
         }.to change(SpudUser, :count).by(1)
       end
 
       it 'should not create a user with an invalid form entry' do
         expect {
-          post :create, params: { spud_user: FactoryGirl.attributes_for(:spud_user, email: nil) }
+          post :create, params: { spud_user: FactoryBot.attributes_for(:spud_user, email: nil) }
         }.to_not change(SpudUser, :count)
       end
     end
@@ -112,7 +112,7 @@ describe Admin::UsersController, type: :controller do
   describe 'edit' do
     context 'HTML format' do
       it 'should load the correct user for the edit form' do
-        user = FactoryGirl.create(:spud_user)
+        user = FactoryBot.create(:spud_user)
         get :edit, params: { id: user.id }
 
         expect(assigns(:user).id).to eq(user.id)
@@ -122,7 +122,7 @@ describe Admin::UsersController, type: :controller do
 
   describe 'update' do
     it 'should update the email when the first name attribute is changed' do
-      user = FactoryGirl.create(:spud_user)
+      user = FactoryBot.create(:spud_user)
       new_name = 'Adam'
       expect {
         put :update, params: { id: user.id, spud_user: { first_name: new_name } }
@@ -131,7 +131,7 @@ describe Admin::UsersController, type: :controller do
     end
 
     it 'should redirect to the admin users show view after a successful update' do
-      user = FactoryGirl.create(:spud_user)
+      user = FactoryBot.create(:spud_user)
       put :update, params: { id: user.id, spud_user: user.attributes.merge!(first_name: 'Adam') }
 
       expect(response).to redirect_to(admin_user_path(user))
@@ -140,7 +140,7 @@ describe Admin::UsersController, type: :controller do
 
   describe 'destroy' do
     it 'should destroy the user' do
-      user = FactoryGirl.create(:spud_user)
+      user = FactoryBot.create(:spud_user)
       expect {
         delete :destroy, params: { id: user.id }
       }.to change(SpudUser, :count).by(-1)
@@ -148,7 +148,7 @@ describe Admin::UsersController, type: :controller do
     end
 
     it 'should destroy the user with the wrong id' do
-      FactoryGirl.create(:spud_user)
+      FactoryBot.create(:spud_user)
       expect {
         delete :destroy, params: { id: '23532' }
       }.to_not change(SpudUser, :count)