tb_core 1.4.beta2 → 1.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e651f6ff813c429d0d61895739a668b1962417
-  data.tar.gz: 9d4675ce88f2341883c9e07634f8896ff0b871e0
+  metadata.gz: 94d2db866f51de6c90377e7b45b255deb84e1c2e
+  data.tar.gz: 281c43074a1a1de7098a84e5bbd3ba5cc71239e6
 SHA512:
-  metadata.gz: 7fbe679221366bfeb8aa9050fc32ff06922ee0e394c1c0be637bd9da5cf424d7ea8947e1ba2b075b1c61b3931249f18fad04a60056e435565fe712f9e5a80a3e
-  data.tar.gz: 20240e4966b8ac2446d36629b60a8b01b641493d01bec75b81c5699bae3332c10ea2acce680392049ee19bfb22be712f0d440add299517f9b779b2eb9a277753
+  metadata.gz: ae37cc5ceeefdd1a0001af643b2059e56cb3b82dbd968ab5708c3990fbc57b0fbbae0a088d537fea50fd9fd413f4b0622ac8d3430023a824e5532543b40acd10
+  data.tar.gz: e863b1df22a455f397d6d586c86b7a6dddbe1149a2b1db802cc52c9849f27273373cb4ae06fc9c0b754262448d7e001bc079b7a5b2b1f45f05abfa4c2f446618

data/app/models/spud/spud_user_model.rb

@@ -95,20 +95,24 @@ class Spud::SpudUserModel < ActiveRecord::Base
 
   # Returns an ActiveRecord::Relation performing a LIKE query against name columns
   def self.where_name_like(string)
-    like = '%' + string + '%'
-    return self.where('login like ? or concat(`first_name`, " ", `last_name`) like ?', like, like)
+    full_name = Arel::Nodes::NamedFunction.new(
+      'concat',
+      [arel_table[:first_name], Arel::Nodes.build_quoted(' '), arel_table[:last_name]]
+    )
+    search = '%' + string + '%'
+    where(full_name.matches(search))
   end
 
   # Return an array of users who have the requested permission
   #
   # * tag - Desired permission tag string (required)
   # * include_supers - Whether to include super user (default: true)
-  def self.with_permission(tag, include_supers:true)
+  def self.with_permission(tag, include_supers: true)
     role_ids = SpudRolePermission.where(spud_permission_tag: tag).pluck(:spud_role_id).uniq()
     if include_supers
-      return SpudUser.where('super_admin = 1 OR spud_role_id IN (?)', role_ids)
+      where(super_admin: true).or(where(spud_role_id: role_ids))
     else
-      return SpudUser.where(spud_role_id: role_ids)
+      where(spud_role_id: role_ids)
     end
   end
 

data/app/views/admin/users/index.html.erb

@@ -15,7 +15,7 @@
         <th>&nbsp;</th>
       </thead>
       <tbody>
-        <% cache [:admin, @spud_users] do %>
+        <% cache @spud_users.to_a do %>
           <% @spud_users.each do |spud_user| %>
             <tr>
               <td><%= spud_user.full_name %></td>

data/app/views/tb_core_mailer/forgot_password_notification.html.erb

@@ -1,6 +1,6 @@
 <h1>Hello <%= @user.full_name %>,</h1>
 
-<p>A password reset has recently been requested for your user account on <strong><%= Spud::Core.config.site_name %></strong>. Please the link below to set your new password.</p>
+<p>A password reset has recently been requested for your user account on <strong><%= Spud::Core.config.site_name %></strong>. Click the link below to set your new password.</p>
 
 <p><%= link_to @url, @url %></p>
 

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = '1.4.beta2'
+    VERSION = '1.4.0.1'
   end
 end

data/spec/models/spud_user_spec.rb

@@ -2,7 +2,40 @@ require 'rails_helper'
 
 describe SpudUser, type: :model do
 
-  describe '.full_name' 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')
+      result = SpudUser.where_name_like('Some User')
+      expect(result.length).to eq(1)
+      expect(result.first).to eq(user)
+    end
+  end
+
+  describe '.with_permission' do
+    before :each do
+      role = FactoryGirl.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)
+    end
+
+    it 'should include the admin user' do
+      result = SpudUser.with_permission('hello', include_supers: false)
+      expect(result.length).to eq(1)
+      expect(result.first).to eq(@admin_user)
+    end
+
+    it 'should include the admin and the super user' do
+      result = SpudUser.with_permission('hello')
+      expect(result.length).to eq(2)
+      expect(result).to_not include(@normal_user)
+    end
+  end
+
+  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)
       expect(u.full_name).to  eq("#{u.first_name} #{u.last_name}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.4.beta2
+  version: 1.4.0.1
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -485,9 +485,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1