pages_core 3.5.1 → 3.6.0

data/app/models/page_path.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class PagePath < ActiveRecord::Base
   class PageNotSavedError < StandardError; end
   class NoPathError < StandardError; end

data/app/models/password_reset_token.rb

@@ -16,10 +16,6 @@ class PasswordResetToken < ActiveRecord::Base
     def expire!
       expired.delete_all
     end
-
-    def find_by_token(token)
-      active.find_by(token: token)
-    end
   end
 
   def expired?

data/app/models/role.rb

@@ -1,5 +1,5 @@
 class Role < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user, touch: true
   validates :name,
             presence:   true,
             uniqueness: { scope: :user_id },
@@ -20,7 +20,7 @@ class Role < ActiveRecord::Base
     end
 
     def roles
-      @roles ||= default_roles
+      @roles ||= default_roles + config_roles
     end
 
     def names
@@ -29,6 +29,19 @@ class Role < ActiveRecord::Base
 
     protected
 
+    def config_file
+      Rails.root.join("config", "roles.yml")
+    end
+
+    def config_roles
+      return [] unless File.exist?(config_file)
+      YAML.load_file(config_file).map do |key, opts|
+        OpenStruct.new(name: key.to_s,
+                       description: opts["description"],
+                       default: opts["default"])
+      end
+    end
+
     def default_roles
       [
         OpenStruct.new(

data/app/models/tag.rb

@@ -1,8 +1,6 @@
-# encoding: utf-8
-
 class Tag < ActiveRecord::Base
   include PagesCore::HumanizableParam
-  has_many :taggings
+  has_many :taggings, dependent: :destroy
 
   scope :pinned, -> { where(pinned: true) }
   scope :sorted, -> { order("pinned DESC, name ASC") }
@@ -13,7 +11,7 @@ class Tag < ActiveRecord::Base
       tags = (taggable.tags.sorted + pinned.sorted).uniq
 
       return tags unless tags.count < limit
-      tags + suggestions(tags, limit)[0...(limit - tags.length)]
+      tags + suggestions(taggable, tags, limit)[0...(limit - tags.length)]
     end
 
     def parse(*tags)
@@ -26,13 +24,24 @@ class Tag < ActiveRecord::Base
 
     private
 
-    def suggestions(tags, limit)
+    def suggestions(taggable, tags, limit)
+      suggestions = taggable_suggestions(taggable, limit).to_a
+      if suggestions.length < limit
+        suggestions += all_suggestions(limit)
+      end
+      suggestions.reject { |t| tags.include?(t) }.uniq[0...(limit)]
+    end
+
+    def taggable_suggestions(taggable, limit)
+      all_suggestions(limit).where("taggings.taggable_type = ?", taggable.class)
+    end
+
+    def all_suggestions(limit)
       Tag.joins(:taggings)
          .select("tags.*, COUNT(tags.id) AS counter")
          .group("tags.id")
          .order("counter DESC")
          .limit(limit)
-         .reject { |t| tags.include?(t) }
     end
 
     def default_options

data/app/models/tagging.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Tagging < ActiveRecord::Base
   belongs_to :tag
   belongs_to :taggable, polymorphic: true
@@ -8,7 +6,7 @@ class Tagging < ActiveRecord::Base
   validates :taggable_type, presence: true
   validates :tag_id,
             presence: true,
-            uniqueness: { scope: [:taggable_type, :taggable_id] }
+            uniqueness: { scope: %i[taggable_type taggable_id] }
 
   def self.tagged_class(taggable)
     ActiveRecord::Base.send(

data/app/models/user.rb

@@ -1,17 +1,23 @@
-# encoding: utf-8
-
 class User < ActiveRecord::Base
   include PagesCore::HasRoles
 
   attr_accessor :password, :confirm_password
 
-  belongs_to :creator, class_name: "User", foreign_key: "created_by"
-  has_many :created_users, class_name: "User", foreign_key: "created_by"
-  has_many :pages
+  belongs_to(:creator,
+             class_name: "User",
+             foreign_key: "created_by",
+             optional: true,
+             inverse_of: :created_users)
+  has_many(:created_users,
+           class_name: "User",
+           foreign_key: "created_by",
+           dependent: :nullify,
+           inverse_of: :creator)
+  has_many :pages, dependent: :nullify
   has_many :password_reset_tokens, dependent: :destroy
   has_many :roles, dependent: :destroy
   has_many :invites, dependent: :destroy
-  belongs_to_image :image, foreign_key: :image_id
+  belongs_to_image :image, foreign_key: :image_id, optional: true
 
   serialize :persistent_data
 
@@ -19,8 +25,7 @@ class User < ActiveRecord::Base
             presence: true,
             uniqueness: { case_sensitive: false }
 
-  validates :name,
-            presence: true
+  validates :name, presence: true
 
   validates :email,
             presence: true,
@@ -36,32 +41,30 @@ class User < ActiveRecord::Base
   before_validation :hash_password
   before_create :ensure_first_user_has_all_roles
 
-  after_save ThinkingSphinx::RealTime.callback_for(:user)
-
   scope :by_name,     -> { order("name ASC") }
   scope :activated,   -> { by_name.includes(:roles).where(activated: true) }
   scope :deactivated, -> { by_name.includes(:roles).where(activated: false) }
 
   class << self
     def authenticate(email, password:)
-      user = User.find_by_username_or_email(email)
+      user = User.login_name(email)
       user if user.try { |u| u.authenticate!(password) }
     end
 
+    def find_by_email(str)
+      find_by("LOWER(email) = ?", str.to_s.downcase)
+    end
+
     # Finds a user by either username or email address.
-    def find_by_username_or_email(string)
-      find_by(username: string.to_s) ||
-        find_by(email: string.to_s)
+    def login_name(string)
+      find_by(username: string.to_s) || find_by_email(string)
     end
   end
 
   def authenticate!(password)
-    if can_login? && valid_password?(password)
-      rehash_password!(password) if password_needs_rehash?
-      true
-    else
-      false
-    end
+    return false unless can_login? && valid_password?(password)
+    rehash_password!(password) if password_needs_rehash?
+    true
   end
 
   def can_login?
@@ -70,7 +73,7 @@ class User < ActiveRecord::Base
 
   def mark_active!
     return if last_login_at && last_login_at > 10.minutes.ago
-    update_columns(last_login_at: Time.now.utc)
+    update(last_login_at: Time.now.utc)
   end
 
   def name_and_email
@@ -78,7 +81,7 @@ class User < ActiveRecord::Base
   end
 
   def online?
-    (last_login_at && last_login_at > 15.minutes.ago) ? true : false
+    last_login_at && last_login_at > 15.minutes.ago ? true : false
   end
 
   def realname
@@ -102,14 +105,15 @@ class User < ActiveRecord::Base
 
   def ensure_first_user_has_all_roles
     return if User.any?
+
     self.activated = true
-    Role.roles.each do |role|
-      roles.new(name: role.name)
+    Role.roles.each do |r|
+      roles.new(name: r.name) unless role?(r.name)
     end
   end
 
   def hash_password
-    self.hashed_password = encrypt_password(password) unless password.blank?
+    self.hashed_password = encrypt_password(password) if password.present?
   end
 
   def password_needs_rehash?

data/app/policies/page_file_policy.rb

@@ -1,25 +1,21 @@
 class PageFilePolicy < Policy
-  module Collection
-    def index?
-      true
-    end
+  def index?
+    true
+  end
 
-    def reorder?
-      user.role?(:pages)
-    end
+  def reorder?
+    user.role?(:pages)
+  end
 
-    def new?
-      user.role?(:pages)
-    end
+  def new?
+    user.role?(:pages)
   end
 
-  module Member
-    def show?
-      true
-    end
+  def show?
+    true
+  end
 
-    def edit?
-      user.role?(:pages)
-    end
+  def edit?
+    user.role?(:pages)
   end
 end

data/app/policies/page_image_policy.rb

@@ -1,25 +1,21 @@
 class PageImagePolicy < Policy
-  module Collection
-    def index?
-      true
-    end
+  def index?
+    true
+  end
 
-    def reorder?
-      user.role?(:pages)
-    end
+  def reorder?
+    user.role?(:pages)
+  end
 
-    def new?
-      user.role?(:pages)
-    end
+  def new?
+    user.role?(:pages)
   end
 
-  module Member
-    def show?
-      true
-    end
+  def show?
+    true
+  end
 
-    def edit?
-      user.role?(:pages)
-    end
+  def edit?
+    user.role?(:pages)
   end
 end

data/app/policies/page_policy.rb

@@ -1,37 +1,37 @@
 class PagePolicy < Policy
-  module Collection
-    def index?
-      true
-    end
+  def index?
+    true
+  end
+
+  def news?
+    true
+  end
 
-    def news?
-      true
-    end
+  def deleted?
+    index?
+  end
 
-    def new?
-      user.role?(:pages)
-    end
+  def new?
+    user.role?(:pages)
+  end
 
-    def new_news?
-      create?
-    end
+  def new_news?
+    create?
   end
 
-  module Member
-    def show?
-      true
-    end
+  def show?
+    true
+  end
 
-    def edit?
-      user.role?(:pages)
-    end
+  def edit?
+    user.role?(:pages)
+  end
 
-    def move?
-      edit?
-    end
+  def move?
+    edit?
+  end
 
-    def delete_meta_image?
-      edit?
-    end
+  def delete_meta_image?
+    edit?
   end
 end

data/app/policies/policy.rb

@@ -48,17 +48,11 @@ class Policy
     end
 
     def collection(user)
-      policy = new(user)
-      const_defined?(:Collection) &&
-        policy.extend(const_get(:Collection))
-      policy
+      new(user)
     end
 
     def member(user, record)
-      policy = new(user, record)
-      const_defined?(:Member) &&
-        policy.extend(const_get(:Member))
-      policy
+      new(user, record)
     end
   end
 end

data/app/policies/user_policy.rb

@@ -1,46 +1,46 @@
 class UserPolicy < Policy
-  module Collection
-    def index?
-      true
-    end
+  def index?
+    true
+  end
 
-    def deactivated?
-      index?
-    end
+  def deactivated?
+    index?
+  end
 
-    def new?
-      !User.any? || user.role?(:users)
-    end
+  def new?
+    User.none? || user.role?(:users)
+  end
+
+  def create?
+    new?
+  end
 
-    def create?
-      new?
-    end
+  def login?
+    true
+  end
 
-    def manage?
-      new?
-    end
+  def manage?
+    new?
   end
 
-  module Member
-    def edit?
-      user == record || user.role?(:users)
-    end
+  def edit?
+    user == record || user.role?(:users)
+  end
 
-    def show?
-      edit?
-    end
+  def show?
+    edit?
+  end
 
-    def delete_image?
-      edit?
-    end
+  def delete_image?
+    edit?
+  end
 
-    def policies?
-      user.role?(:users)
-    end
+  def policies?
+    user.role?(:users)
+  end
 
-    def destroy?
-      user.role?(:users)
-    end
+  def destroy?
+    user.role?(:users)
   end
 
   def change_password?