tb_core 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dd467d0438cc596f8c289d040049e2e1d41d8d1c03cf2f643fca5bb8a2999ec
-  data.tar.gz: 374cea46337ada9623d5365024e4bf914f70a25b0c6e2f83997e319000ea342e
+  metadata.gz: cd6c66dcf54d5da5213a63e533eb04b5f64e726919654ece63a4565333c8a6d7
+  data.tar.gz: 224a045cc261e598c21677bcf28ee60dc82d0ea0f82392dcc9801eb86117aaf8
 SHA512:
-  metadata.gz: 94358f3622e59b5f638be9ed1ba51add44a014ddf1748dff548b8f717f9aee662d37b4a7cd9011fb8c46b9423e9b9b9b01bb621e316df41d6390be21650df119
-  data.tar.gz: ab751288247246638a04c5d779f166e3cb0c426551ec3eac4cbb59ba19ce1c489ea12f1a264c0f424f354e365a8b031e77b7c12ff7b0a367157fb0cc4558064c
+  metadata.gz: 5dbc377a0b2723d633ff97989a57b41fd5e797247d442e14f7ad6c63ea5f3f402b82ea244d9eee072301dffbfcfb62896e5ffee978fb88c33858f4e8cb39558f
+  data.tar.gz: 4e85b15b625862b800ccb12e1490822d907ee696e6434cf7d08699ca5e0fac0412f032d2153b2d2137c66f87b7f6de10c11fc78c187496ae0bb123c0df691a2e

data/app/controllers/admin/password_resets_controller.rb

@@ -43,6 +43,7 @@ private
   def load_user_using_perishable_token
     @user = SpudUser.find_using_perishable_token(params[:id])
     return if @user
+
     flash[:notice] = "We're sorry, but we could not locate your account. " +
     'If you are having issues try copying and pasting the URL ' +
     'from your email into your browser or restarting the ' +

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

@@ -14,6 +14,7 @@ module TbCore
       if params[:return_to]
         uri = URI.parse(params[:return_to].to_s)
         return "#{uri.path}?#{uri.query}" if uri.query
+
         return uri.path
       end
       default

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

@@ -10,27 +10,32 @@ module TbCore
 
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
+
       @current_user_session = SpudUserSession.find
     end
 
     def current_user
       return @current_user if defined?(@current_user)
+
       @current_user = current_user_session&.spud_user
     end
 
     def current_user_id
       return 0 unless @current_user
+
       @current_user.id
     end
 
     def require_user
       raise UnauthorizedError.new unless current_user
+
       true
     end
 
     def require_admin_user
       raise UnauthorizedError.new unless current_user
       raise AccessDeniedError.new unless current_user.admin_rights?
+
       true
     end
 

data/app/helpers/forgot_password_mailer_helper.rb

@@ -1,6 +1,7 @@
 module ForgotPasswordMailerHelper
   def perishable_token_link_expiration_time_text(user)
     return if user.class.perishable_token_valid_for.blank?
+
     expiration_time = user.updated_at + user.class.perishable_token_valid_for
 
     "This link will expire in #{distance_of_time_in_words(Time.current, expiration_time)}."

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

@@ -16,7 +16,7 @@ module TbCore
       end
 
       belongs_to :role,
-        class_name: SpudRole.to_s, foreign_key: :spud_role_id, required: false
+        class_name: SpudRole.to_s, foreign_key: :spud_role_id, optional: true
       has_many :spud_user_settings,
         dependent: :destroy, foreign_key: :spud_user_id
 
@@ -69,6 +69,7 @@ module TbCore
 
     def full_name
       return login if first_name.blank? && last_name.blank?
+
       [first_name, last_name].reject(&:blank?).join(' ')
     end
 
@@ -79,12 +80,14 @@ module TbCore
     # Returns true if user can view at least one dashboard app
     def admin_rights?
       return true if super_admin
+
       TbCore.admin_applications.find { |app| can_view_app?(app) }.present?
     end
 
     # Returns true if the user can view a spud app based on it's key
     def can_view_app?(admin_application)
       return true if super_admin?
+
       key = admin_application[:key]
       permissions.find { |p| p.apps.include?(key) }.present?
     end
@@ -95,6 +98,7 @@ module TbCore
     # * if multiple tags are supplied, return true if ALL tags match
     def permission?(*tags)
       return true if super_admin?
+
       my_tags = permissions.collect(&:tag)
       tags.find { |tag| !my_tags.include?(tag) }.blank?
     end
@@ -105,12 +109,14 @@ module TbCore
     # * if multiple tags are supplied, return true if ANY tag matches
     def any_permission?(*tags)
       return true if super_admin?
+
       permissions.find { |p| tags.include?(p.tag) }.present?
     end
 
     # Return a list of SpudPermission objects for the user's SpudRole
     def permissions
       return [] if role.blank?
+
       role.permissions
     end
 

data/app/models/spud_role.rb

@@ -14,14 +14,9 @@ class SpudRole < ActiveRecord::Base
   end
 
   def permission_tags=(tags)
-    self.spud_role_permissions.each do |role_permission|
-      if role_permission.permission.nil? || !tags.include?(role_permission.permission.tag)
-        role_permission.destroy()
-      else
-        tags.delete(role_permission.permission.tag)
-      end
+    self.spud_role_permissions = tags.map do |tag|
+      SpudRolePermission.new(spud_permission_tag: tag)
     end
-    self.spud_role_permissions += tags.collect{ |tag| SpudRolePermission.new(spud_permission_tag: tag) }
   end
 
   def permission_tags

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

@@ -49,7 +49,7 @@
         <h3 class="modal-title"></h3>
       </div>
       <div class="modal-body">
-        <p>One fine body&hellip;</p>
+        <p>...</p>
       </div>
       <div class="modal-footer modal-footer-default">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

data/lib/generators/spud/module_generator.rb

@@ -79,7 +79,7 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
           resources :#{module_name_formatted}
         end
         resources :#{module_name_formatted}, :only => [:index, :show]
-RUBY
+    RUBY
   end
 
   def create_specs
@@ -136,7 +136,7 @@ RUBY
     inject_into_file "app/models/#{module_name.singularize.underscore}.rb", after: "ApplicationRecord\n" do <<-RUBY
   scope :ordered, -> { order(#{sort_field}: :desc) }
   scope :search, ->(term) { where('#{search_field} LIKE ?', "%\#{term}%") }
-RUBY
+    RUBY
     end
   end
 
@@ -156,7 +156,7 @@ RUBY
 
   validates #{string_attrs_as_symbols}, :length => {:maximum => 255}
 
-  RUBY
+      RUBY
       end
     end
   end

data/lib/generators/spud/setup_generator.rb

@@ -47,7 +47,7 @@ private
             config.site_name = "#{site_name}"
             config.from_address = "no-reply@#{domain_name}.com"
           end
-RUBY
+    RUBY
   end
 
   def application_name

data/lib/tb_core/belongs_to_app.rb

@@ -38,6 +38,7 @@ module TbCore
       elsif !current_user.can_view_app?(@page_application)
         raise 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)
     end

data/lib/tb_core/version.rb

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

data/spec/controllers/admin/application_controller_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Admin::ApplicationController, type: :controller do
     it 'should respond successfully if the current user is a super admin' do
       @user.update(super_admin: true)
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should respond successfully if the current user has admin permissions' do
@@ -28,7 +28,7 @@ RSpec.describe Admin::ApplicationController, type: :controller do
       @user.role = @role
       @user.save
       get :index
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should redirect to the login if the current user is not logged in' do

data/spec/controllers/admin/password_reset_controller_spec.rb

@@ -8,7 +8,7 @@ describe Admin::PasswordResetsController, type: :controller do
     describe 'index' do
       it 'should return success' do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 
@@ -17,7 +17,7 @@ describe Admin::PasswordResetsController, type: :controller do
         it 'should render the edit form' do
           allow(SpudUser).to receive(:find_using_perishable_token).and_return(user)
           get :show, params: { id: 1 }
-          expect(response).to be_success
+          expect(response).to be_successful
         end
       end
 

data/spec/controllers/admin/settings_controller_spec.rb

@@ -8,7 +8,7 @@ describe Admin::SettingsController, type: :controller do
   describe 'edit' do
     it 'should respond with success' do
       get :edit
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/controllers/admin/setup_controller_spec.rb

@@ -6,7 +6,7 @@ describe Admin::SetupController, type: :controller do
     it 'should be successful' do
       get :new
 
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should redirect to the admin login form when there is already a user' do

data/spec/controllers/admin/user_sessions_controller_spec.rb

@@ -16,7 +16,7 @@ describe Admin::UserSessionsController, type: :controller do
       u = FactoryBot.create(:spud_user)
       u.save
       get :new
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/controllers/admin/users_controller_spec.rb

@@ -39,7 +39,7 @@ describe Admin::UsersController, type: :controller do
       SpudUserSession.create(u)
       get :index
 
-      expect(response).to be_success
+      expect(response).to be_successful
     end
 
     it 'should not allow access to users without a role,
@@ -82,14 +82,14 @@ describe Admin::UsersController, type: :controller do
     it 'should respond successfully' do
       user = FactoryBot.create(:spud_user)
       get :show, params: { id: user.id }
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 
   describe 'new' do
     it 'should render the form' do
       get :new, format: :html
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,5 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'f89bbe176924c011473e15af21c4e8b72c3fd12f887f26014c24ea32e1e3d2bf0250a671a30232047d5c5431e67c7361aca07b10d847405b99fce4543589e117'
 Dummy::Application.config.secret_key_base = 'b43711419c807b9c9efe9365dd79f87ebe31e9f72e1aa6744c1ecac68aace664c0a3a4f791d92bd2fa324fce1d6d09701a54b88453f131b7c460eeb9c530bd72'

data/spec/factories/spud_admin_permission_factories.rb

@@ -5,6 +5,6 @@ FactoryBot.define do
   
   factory :spud_admin_permission do
     name { FactoryBot.generate(:permission_name) }
-    access true
+    access { true }
   end
 end

data/spec/factories/spud_user_factories.rb

@@ -24,8 +24,8 @@ FactoryBot.define do
     last_name { FactoryBot.generate(:last_name) }
     login { FactoryBot.generate(:login) }
     email { FactoryBot.generate(:email) }
-    password 'password'
-    password_confirmation 'password'
+    password { 'password' }
+    password_confirmation { 'password' }
     single_access_token { FactoryBot.generate(:single_access_token) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: authlogic
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement