tb_core 1.3.10 → 1.4.beta1

data/lib/spud_core/configuration.rb

@@ -5,12 +5,12 @@ module Spud
       :javascripts, :stylesheets, :admin_javascripts, :admin_stylesheets,
       :permissions, :production_alert_domain, :use_email_as_login
     self.admin_applications = []
-    self.site_name = "Company Name"
+    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.from_address = 'no-reply@companyname.com'
     self.permissions = []
     self.admin_javascripts = ['admin/core/application', 'admin/application']
     self.admin_stylesheets = ['admin/core/application', 'admin/application']
@@ -29,7 +29,11 @@ module Spud
 
     def self.default_site_config
       ActiveSupport::Deprecation.warn 'Spud::Core.default_site_config is deprecated and will be removed in the future'
-      return {:site_id => Spud::Core.config.site_id, :site_name => Spud::Core.config.site_name, :short_name => Spud::Core.config.short_name}
+      return {
+        site_id: Spud::Core.config.site_id,
+        site_name: Spud::Core.config.site_name,
+        short_name: Spud::Core.config.short_name
+      }
     end
 
     def self.append_admin_javascripts(*args)

data/lib/spud_core/engine.rb

@@ -17,7 +17,6 @@ module Spud
     class Engine < ::Rails::Engine
       require "#{root}/lib/spud_core/errors"
       require "#{root}/lib/spud_core/searchable"
-      require "#{root}/lib/responds_to_parent"
 
       engine_name :tb_core
       config.autoload_paths << "#{root}/lib"
@@ -34,7 +33,7 @@ module Spud
         end
       end
 
-      initializer 'tb_core.admin', :after => :admin do |config|
+      initializer 'tb_core.admin', after: :admin do |config|
         # Translate Hash configured permissions into SpudPermission objects
         Spud::Core.permissions.collect! do |p|
           if p.class == Hash
@@ -43,12 +42,10 @@ module Spud
           p
         end
         # Append Users admin module
-        Spud::Core.config.admin_applications.unshift({
-          :name => "Users",
-          :thumbnail => "admin/users_thumb.png",
-          :url => '/admin/users',
-          :order => 100
-        })
+        Spud::Core.config.admin_applications.unshift(name: 'Users',
+                                                     thumbnail: 'admin/users_thumb.png',
+                                                     url: '/admin/users',
+                                                     order: 100)
         # Create default permissions for modules
         Spud::Core.admin_applications.each do |admin_application|
           admin_application[:key] ||= admin_application[:name].gsub(' ', '_').downcase.to_sym
@@ -66,16 +63,6 @@ module Spud
         end
       end
 
-      initializer 'tb_core.mysql2_extensions' do
-        ActiveSupport.on_load(:active_record) do
-          if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
-            ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
-              include TbCore::Mysql2Extensions
-            end
-          end
-        end
-      end
-
       initializer 'tb_core.assets' do
         Rails.application.config.assets.precompile += ['admin/users_thumb.png', 'admin/module_icon.png']
       end

data/lib/spud_core/errors.rb

@@ -4,13 +4,12 @@ class Spud::RequestError < StandardError
 
   # 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)
-      # ActiveSupport::Deprecation.warn("Passing the :item as a key/value pair to #{self.class.to_s} is deprecated; Pass it as the first argument instead.")
       @item = item_or_opts[:item]
       @template = item_or_opts[:template]
     else
@@ -18,8 +17,8 @@ class Spud::RequestError < StandardError
       @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))
+    @title = I18n.t(:title, scope: [:tb_core, :errors, @i18n])
+    super(I18n.t(:message, scope: [:tb_core, :errors, @i18n], item: @item))
   end
 end
 

data/lib/spud_core/test_files.rb

@@ -9,15 +9,15 @@ module Spud
         end
         
         def load_specs
-          Dir[File.join(File.expand_path('../../../', __FILE__), "spec/**/*_spec.rb")].each {|f| require f}
+          Dir[File.join(File.expand_path('../../../', __FILE__), 'spec/**/*_spec.rb')].each {|f| require f}
         end
           
         def load_factories
-          Dir[File.join(File.expand_path('../../../', __FILE__), "factories/*")].each {|f| require f}
+          Dir[File.join(File.expand_path('../../../', __FILE__), 'factories/*')].each {|f| require f}
         end
         
         def load_support
-          Dir[File.join(File.expand_path('../../../', __FILE__), "spec/support/**/*.rb")].each {|f| require f}
+          Dir[File.join(File.expand_path('../../../', __FILE__), 'spec/support/**/*.rb')].each {|f| require f}
         end
       end
     end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.10"
+    VERSION = '1.4.beta1'
   end
 end

data/lib/tb_core/belongs_to_app.rb

@@ -3,7 +3,10 @@ module TbCore::BelongsToApp
 
   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
+      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
 
@@ -16,7 +19,7 @@ module TbCore::BelongsToApp
     def belongs_to_app(name, page_title: nil, only: nil)
       before_action ->(){
         act_as_app(name, page_title: page_title)
-      }, :only => only
+      }, only: only
     end
   end
 
@@ -32,7 +35,7 @@ private
     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')
+      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)

data/lib/tb_core/form_builder.rb

@@ -9,7 +9,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   # Build a form group
   #
   def tb_form_group(content=nil, options={})
-    content_tag :div, options.merge(:class => 'form-group') do
+    content_tag :div, options.merge(class: 'form-group') do
       if block_given?
         yield
       else
@@ -24,15 +24,15 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
     if options[:label_text] != nil
       text = options[:label_text]
     else
-      text = @object.class.human_attribute_name(attribute)  
+      text = @object.class.human_attribute_name(attribute)
     end
-    label(attribute, text, :class => 'col-sm-2 control-label')
+    label(attribute, text, class: 'col-sm-2 control-label')
   end
 
   # Builds an input field with error message
   #
   def tb_input_field_tag(attribute, input_type=nil, options={})
-    content_tag(:div, :class => 'col-sm-10') do
+    content_tag(:div, class: 'col-sm-10') do
       if block_given?
         concat(yield(attribute))
       else
@@ -42,10 +42,10 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
       end
       error_message = @object.errors[attribute].first
       if options[:help_text]
-        concat content_tag(:p, @template.raw(options[:help_text]), :class => 'help-block')
+        concat content_tag(:p, @template.raw(options[:help_text]), class: 'help-block')
       end
       if error_message
-        concat content_tag(:p, error_message, :class => 'form-error form-error-inline')
+        concat content_tag(:p, error_message, class: 'form-error form-error-inline')
       end
     end
   end
@@ -84,7 +84,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   #
   def tb_select_tag(attribute, option_tags, options={}, html_options={})
     tb_input_field_tag(attribute) do
-      select(attribute, option_tags, objectify_options(options), html_options.merge(:class => 'form-control'))
+      select(attribute, option_tags, objectify_options(options), html_options.merge(class: 'form-control'))
     end
   end
 
@@ -93,16 +93,16 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   def tb_date_select_tag(attribute, options={}, html_options={})
     options[:with_css_classes] = true
     tb_input_field_tag(attribute) do
-      date_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control date-select'))
+      date_select(attribute, objectify_options(options), html_options.merge(class: 'form-control date-select'))
     end
-  end  
+  end
 
   # Builds a date select tag
   #
   def tb_datetime_select_tag(attribute, options={}, html_options={})
     options[:with_css_classes] = true
     tb_input_field_tag(attribute) do
-      datetime_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+      datetime_select(attribute, objectify_options(options), html_options.merge(class: 'form-control datetime-select'))
     end
   end
 
@@ -111,21 +111,26 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   def tb_time_select_tag(attribute, options={}, html_options={})
     options[:with_css_classes] = true
     tb_input_field_tag(attribute) do
-      time_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+      time_select(attribute, objectify_options(options), html_options.merge(class: 'form-control datetime-select'))
     end
-  end 
+  end
 
   # Builds a row of save/cancel buttons
   #
   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!'}
+    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}
+        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
+          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
@@ -139,9 +144,9 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   #
 
   def tb_sub_title(text)
-    content_tag :div, options.merge(:class => 'form-group') do
-      content_tag :div, :class => 'col-sm-offset-2 col-sm-10' do
-        content_tag :h4, text, :class => 'form-sub-title'
+    content_tag :div, options.merge(class: 'form-group') do
+      content_tag :div, class: 'col-sm-offset-2 col-sm-10' do
+        content_tag :h4, text, class: 'form-sub-title'
       end
     end
   end
@@ -223,7 +228,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   #
   def tb_select(attribute, option_tags, options={}, html_options={})
     tb_input_field(attribute) do
-      select(attribute, option_tags, objectify_options(options), html_options.merge(:class => 'form-control'))
+      select(attribute, option_tags, objectify_options(options), html_options.merge(class: 'form-control'))
     end
   end
 
@@ -232,7 +237,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   def tb_date_select(attribute, options={}, html_options={})
     options[:with_css_classes] = true
     tb_input_field(attribute) do
-      date_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control date-select'))
+      date_select(attribute, objectify_options(options), html_options.merge(class: 'form-control date-select'))
     end
   end
 
@@ -241,7 +246,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   def tb_datetime_select(attribute, options={}, html_options={})
     options[:with_css_classes] = true
     tb_input_field(attribute) do
-      datetime_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+      datetime_select(attribute, objectify_options(options), html_options.merge(class: 'form-control datetime-select'))
     end
   end
 
@@ -250,15 +255,15 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   def tb_time_select(attribute, options={}, html_options={})
     options[:with_css_classes] = true
     tb_input_field(attribute) do
-      time_select(attribute, objectify_options(options), html_options.merge(:class => 'form-control datetime-select'))
+      time_select(attribute, objectify_options(options), html_options.merge(class: 'form-control datetime-select'))
     end
-  end 
+  end
 
   # Builds a time zone select group
   #
   def tb_time_zone_select(attribute, priority_zones, options={}, html_options={})
     tb_input_field(attribute) do
-      time_zone_select(attribute, priority_zones, objectify_options(options), html_options.merge(:class => 'form-control'))
+      time_zone_select(attribute, priority_zones, objectify_options(options), html_options.merge(class: 'form-control'))
     end
   end
 
@@ -271,17 +276,19 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   #
   def tb_user_select(attribute = :spud_user_id, users: SpudUser.ordered, selected: nil, default_text: 'Select User')
     selected = @object[attribute] if selected.nil?
-    return content_tag :div, :class => 'form-group' do
-      concat label attribute, :class => 'control-label col-sm-2'
-      concat content_tag(:div, :class => 'col-sm-10'){
+    return content_tag :div, class: 'form-group' do
+      concat label attribute, class: 'control-label col-sm-2'
+      concat content_tag(:div, class: 'col-sm-10'){
         concat select(
           attribute,
           @template.options_from_collection_for_select(users, :id, :full_name_with_email, selected),
-          {:include_blank => default_text},
-          {:class => 'form-control tb-user-select'}
+          {include_blank: default_text},
+          class: 'form-control tb-user-select'
         )
-        concat @template.link_to 'Edit User', @template.edit_admin_user_path(':id'), :class => 'btn btn-default tb-user-select-btn tb-user-select-edit'
-        concat @template.link_to 'New User', @template.new_admin_user_path, :class => 'btn btn-default tb-user-select-btn tb-user-select-add'
+        concat @template.link_to 'Edit User', @template.edit_admin_user_path(':id'),
+          class: 'btn btn-default tb-user-select-btn tb-user-select-edit'
+        concat @template.link_to 'New User', @template.new_admin_user_path,
+          class: 'btn btn-default tb-user-select-btn tb-user-select-add'
       }
     end
   end

data/lib/tb_core/responder.rb

@@ -4,7 +4,7 @@ class TbCore::Responder < ActionController::Responder
     super
 
     # Don't require a :location parameter for redirecting
-    if !@options.has_key?(:location)
+    if !@options.key?(:location)
       @options[:location] = nil
     end
   end
@@ -16,7 +16,7 @@ class TbCore::Responder < ActionController::Responder
     if get?
       display resource
     elsif post? || patch?
-      display resource, :status => :created, :location => api_location
+      display resource, status: :created, location: api_location
     else
       head :no_content
     end

data/lib/tb_core/test_helper.rb

@@ -11,11 +11,11 @@ module TbCore::SessionHelper
     activate_authlogic()
     if permissions
       permissions = [permissions] unless permissions.is_a?(Array)
-      role = SpudRole.create(:name => 'New Role', :permission_tags => permissions)
+      role = SpudRole.create(name: 'New Role', permission_tags: permissions)
     else
       role = nil
     end
-    @user = FactoryGirl.create(:spud_user, {super_admin: admin, role: role})
+    @user = FactoryGirl.create(:spud_user, super_admin: admin, role: role)
     SpudUserSession.create(@user)
     return @user
   end

data/spec/controllers/admin/application_controller_spec.rb

@@ -1,27 +1,27 @@
 require 'rails_helper'
 
-RSpec.describe Admin::ApplicationController, :type => :controller do
-  
+RSpec.describe Admin::ApplicationController, type: :controller do
+
   before :each do
     activate_authlogic
     @user = FactoryGirl.create(:spud_user)
     @role = FactoryGirl.create(:spud_role)
     @session = SpudUserSession.create(@user)
   end
-  
+
   describe 'require_user' do
     controller(Admin::ApplicationController) do
       def index
-        render :nothing => true
+        head :ok
       end
     end
-    it "should respond successfully if the current user is a super admin" do
+    it 'should respond successfully if the current user is a super admin' do
       @user.update_attribute(:super_admin, true)
       get :index
       expect(response).to be_success
     end
-    
-    it "should respond successfully if the current user has admin permissions" do
+
+    it 'should respond successfully if the current user has admin permissions' do
       @role.permission_tags = ['admin.users.full_access']
       @role.save()
       @user.role = @role
@@ -29,14 +29,14 @@ RSpec.describe Admin::ApplicationController, :type => :controller do
       get :index
       expect(response).to be_success
     end
-    
-    it "should redirect to the login if the current user is not logged in" do
+
+    it 'should redirect to the login if the current user is not logged in' do
       @session.destroy
       get :index
-      expect(response).to redirect_to(admin_login_path(:return_to => '/admin/application'))
+      expect(response).to redirect_to(admin_login_path(return_to: '/admin/application'))
     end
-    
-    it "should redirect to the root for a user without administrative priviledges" do
+
+    it 'should redirect to the root for a user without administrative priviledges' do
       @user.super_admin = false
       @user.role = nil
       @user.save
@@ -44,6 +44,6 @@ 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
+end

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -1,17 +1,17 @@
 require 'rails_helper'
 
-RSpec.describe Admin::DashboardController, :type => :controller do
+RSpec.describe Admin::DashboardController, type: :controller do
 
   before(:all) do
     Spud::Core.admin_applications += [{
-      :name => 'Test App',
-      :url => '/test/app',
-      :permissions => ["admin.test_app.full_access"]
+      name: 'Test App',
+      url: '/test/app',
+      permissions: ['admin.test_app.full_access']
     },
     {
-      :name => "dash app",
-      :key => 'dash_app',
-      :badge => ->(user){ 1 }
+      name: 'dash app',
+      key: 'dash_app',
+      badge: ->(user){ 1 }
     }]
   end
 
@@ -20,67 +20,70 @@ RSpec.describe Admin::DashboardController, :type => :controller do
   end
 
   describe 'index' do
-    it "should display applications the current user has access to given that the current user is not a super admin" 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 = FactoryGirl.create(:spud_role, permission_tags: ['admin.users.full_access'])
       @user.save()
       get :index
 
       expect(assigns(:admin_applications).collect{|app| app[:name] }).to include('Users')
     end
 
-    it "should not display applications the current user does not have access to given that the current user is not a super admin" 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 = FactoryGirl.create(:spud_role, permission_tags: ['admin.users.full_access'])
       @user.save()
       get :index
 
       expect(assigns(:admin_applications).collect{|app| app[:name] }).to_not include('Test App')
     end
 
-    it "should display all the applications despite the users permissions given the current user is a super admin" do
+    it 'should display all the applications despite the users permissions given
+      the current user is a super admin' do
       @user.super_admin = true
       @user.role = nil
       @user.save
       get :index
 
-      expect(assigns(:admin_applications).collect{|app| app[:name] }).to eq(Spud::Core.admin_applications.collect{|app| app[:name] })
+      excectation = Spud::Core.admin_applications.collect{|app| app[:name] }
+      expect(assigns(:admin_applications).collect{|app| app[:name] }).to eq(excectation)
     end
   end
 
   describe 'badges' do
     before(:each) do
-      request.accept = "application/json"
+      request.accept = 'application/json'
       Spud::Core.configure do |config|
-        config.site_name = "Test Site"
+        config.site_name = 'Test Site'
       end
       @user.super_admin = true
       @user.save
     end
 
-    it "should respond with a json content type" do
+    it 'should respond with a json content type' do
       get :badges
-      
+
     end
 
-    it "should contain data array in reponse" 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.content_type).to eq('application/json')
       expect(json).to have_key('data')
     end
 
-    it "should have badge count 1 for dash app" do
+    it 'should have badge count 1 for dash app' do
       get :badges
       json = JSON.parse(response.body)
-      data = json["data"]
+      data = json['data']
       assert data.size  == 1
       app_found = false
       badge_count = 0
       data.each do |app|
-        if app["key"] == "dash_app"
+        if app['key'] == 'dash_app'
           app_found = true
-          badge_count = app["badge_count"]
+          badge_count = app['badge_count']
         end
       end
       assert app_found && badge_count == 1