georgia 0.7.8 → 0.8.0

data/app/models/georgia/concerns/searchable.rb

@@ -0,0 +1,32 @@
+require 'active_support/concern'
+
+module Georgia
+  module Concerns
+    module Searchable
+      extend ActiveSupport::Concern
+
+      included do
+
+        include Elasticsearch::Model
+        include Elasticsearch::Model::Callbacks
+
+        def as_indexed_json options={}
+          self.as_json(
+            only: [:id, :updated_at, :slug, :type, :template],
+            methods: [:title, :text, :excerpt, :keyword_list, :tag_list]
+            )
+        end
+
+      end
+
+      module ClassMethods
+
+        def search_conditions params
+          Georgia::PageSearch.new(params.merge(type: self.to_s)).definition
+        end
+
+      end
+
+    end
+  end
+end

data/app/models/georgia/concerns/taggable.rb

@@ -7,8 +7,8 @@ module Georgia
 
       included do
 
-        acts_as_taggable_on :tags
-        attr_accessible :tag_list
+        # acts_as_taggable_on :tags
+        # attr_accessible :tag_list if needs_attr_accessible?
 
       end
 

data/app/models/georgia/concerns/treeable.rb

@@ -8,7 +8,6 @@ module Georgia
       included do
 
         has_ancestry orphan_strategy: :rootify
-        attr_accessible :parent_id
 
       end
 

data/app/models/georgia/content.rb

@@ -2,11 +2,9 @@ module Georgia
   class Content < ActiveRecord::Base
 
     acts_as_taggable_on :keywords
-    attr_accessible :keyword_list
-
-    attr_accessible :title, :text, :excerpt, :keywords, :locale, :image_id
 
     validates :title, length: {maximum: 255}
+    validates :locale, presence: true
 
     belongs_to :contentable, polymorphic: true
     belongs_to :image, class_name: Ckeditor::Picture

data/app/models/georgia/dashboard.rb

@@ -0,0 +1,7 @@
+module Georgia
+  class Dashboard
+    def self.policy_class
+      Georgia::DashboardPolicy
+    end
+  end
+end

data/app/models/georgia/link.rb

@@ -5,11 +5,10 @@ module Georgia
 
     belongs_to :menu, class_name: Georgia::Menu, touch: true
 
-    acts_as_list scope: :menu
+    # acts_as_list scope: :menu
     has_ancestry orphan_strategy: :adopt
-    attr_accessible :parent_id, :menu_id
 
-    scope :ordered, order('position ASC')
+    scope :ordered, -> { order('position ASC') }
 
     before_validation :ensure_forward_slash, on: :create
 
@@ -23,5 +22,13 @@ module Georgia
     def slug
       @slug ||= text.match(/([\w-]*)$/)[0]
     end
+
+    def url
+      @url ||= self.text
+    end
+
+    def self.policy_class
+      Georgia::NavigationPolicy
+    end
   end
 end

data/app/models/georgia/menu.rb

@@ -1,13 +1,13 @@
 module Georgia
   class Menu < ActiveRecord::Base
 
-    attr_accessible :name
-
     validates :name, presence: true
 
-    has_many :links, dependent: :destroy
+    has_many :links, -> { order(position: :asc) }, dependent: :destroy
     accepts_nested_attributes_for :links, allow_destroy: true
-    attr_accessible :links_attributes
 
+    def self.policy_class
+      Georgia::NavigationPolicy
+    end
   end
 end

data/app/models/georgia/page.rb

@@ -1,20 +1,85 @@
 module Georgia
   class Page < ActiveRecord::Base
 
-    include Georgia::Indexer::Adapter
-    include Georgia::Concerns::Taggable
-    include Georgia::Concerns::Orderable
-    include Georgia::Concerns::Slugable
-    include Georgia::Concerns::Revisionable
-    include Georgia::Concerns::Publishable
-    include Georgia::Concerns::Treeable
-    include Georgia::Concerns::Cacheable
+    include PublicActivity::Common
+    include Concerns::Treeable
+    include Concerns::Searchable
+    index_name "georgia-pages-#{Rails.env}"
 
-    acts_as_list scope: :parent #override Concerns::Orderable to include scope
+    # acts_as_list scope: :parent #override Concerns::Orderable to include scope
+    acts_as_taggable_on :tags
 
     paginates_per 20
 
-    scope :not_self, ->(page) {where('georgia_pages.id != ?', page.id)}
+    scope :published, -> { where(public: true) }
+    scope :ordered,   -> { order(:position) }
+    scope :not_self,  -> (page) {where('georgia_pages.id != ?', page.id)}
+    scope :from_url,  -> (path) { where(url: "/#{path}").includes(current_revision: :contents) }
+
+    validates :slug, format: {with: /\A[a-zA-Z0-9_-]+\z/,
+      message: 'can only consist of letters, numbers, dash (-) and underscore (_)'}
+      #, uniqueness: {scope: [:ancestry, :type], message: 'has already been taken'}
+
+    has_many :revisions, as: :revisionable, dependent: :destroy
+    belongs_to :current_revision, class_name: Georgia::Revision, foreign_key: :revision_id
+
+    before_validation :sanitize_slug
+    after_save :update_url
+
+    delegate :title, :text, :excerpt, :keywords, :keyword_list, :image, to: :current_revision, allow_nil: true
+    delegate :template, :content, :slides, :widgets, to: :current_revision, allow_nil: true
+    delegate :draft?, :review?, :revision?, :published?, to: :current_revision, allow_nil: true
+
+    # FIXME: Should not be part of this model
+    def approve_revision revision
+      current_revision.store if current_revision
+      self.update_attribute(:revision_id, revision.id)
+    end
+
+    def publish
+      self.update_attribute(:public, true)
+    end
+
+    def unpublish
+      self.update_attribute(:public, false)
+    end
+
+    def public?
+      self.public
+    end
+    alias_method :published?, :public?
+
+    def publish_state
+      public? ? 'public' : 'private'
+    end
+    alias_method :visibility, :publish_state
+
+    def cache_key
+      [self.url, self.updated_at.to_i].join('/')
+    end
+
+    # Must stay public for #update_url on descendants
+    def set_url
+      self.update_column(:url, '/' + self.ancestry_url)
+    end
+
+    protected
+
+    def sanitize_slug
+      self.slug ||= ''
+      self.slug.to_s.gsub!(/^\/*/, '').gsub!(/\/*$/, '')
+    end
+
+    def update_url
+      if slug_changed? or ancestry_changed?
+        self.set_url
+        self.descendants.each(&:set_url) if !self.new_record? and self.has_children?
+      end
+    end
+
+    def ancestry_url
+      (ancestors + [self]).map(&:slug).join('/')
+    end
 
   end
 end

data/app/models/georgia/revision.rb

@@ -1,22 +1,27 @@
 module Georgia
   class Revision < ActiveRecord::Base
 
-    include Georgia::Concerns::Contentable
-    include Georgia::Concerns::Templatable
-    include Georgia::Concerns::Statable
+    include PublicActivity::Common
+    include Concerns::Contentable
+
+    enum status: [ :draft, :review, :published, :revision ]
+
+    belongs_to :user, foreign_key: :revised_by_id
 
     has_one :page, foreign_key: :revision_id
     belongs_to :revisionable, polymorphic: true, touch: true
 
     has_many :slides, dependent: :destroy, foreign_key: :page_id
     accepts_nested_attributes_for :slides, allow_destroy: true
-    attr_accessible :slides_attributes
 
     has_many :ui_associations, dependent: :destroy, foreign_key: :page_id
     accepts_nested_attributes_for :ui_associations, allow_destroy: true
-    attr_accessible :ui_associations_attributes
 
     has_many :widgets, through: :ui_associations
 
+    validates :template, inclusion: {in: Georgia.templates, message: "%{value} is not a valid template" }
+
+    delegate :visibility, to: :revisionable, prefix: false
+
   end
 end

data/app/models/georgia/role.rb

@@ -1,10 +1,10 @@
 module Georgia
-	class Role < ActiveRecord::Base
+  class Role < ActiveRecord::Base
 
-		attr_accessible :name
+    has_many :role_assignments, dependent: :destroy
+    has_many :users, through: :role_assignments
 
-		has_and_belongs_to_many :users
+    validates :name, presence: true, uniqueness: { case_sensitive: false }
 
-		validates :name, presence: true, uniqueness: true
-	end
+  end
 end

data/app/models/georgia/role_assignment.rb

@@ -0,0 +1,8 @@
+module Georgia
+  class RoleAssignment < ActiveRecord::Base
+
+    belongs_to :role
+    belongs_to :user
+
+  end
+end

data/app/models/georgia/slide.rb

@@ -1,14 +1,14 @@
 module Georgia
   class Slide < ActiveRecord::Base
 
-    include Georgia::Concerns::Contentable
-    include Georgia::Concerns::Orderable
+    include Concerns::Contentable
 
-    acts_as_list scope: :page
-    attr_accessible :page_id
+    # acts_as_list scope: :page
     belongs_to :revision, foreign_key: :page_id
     validates :page_id, presence: true
 
+    scope :ordered, -> { order(:position) }
+
     # Returns a page if revision is a `current_revision` for a Georgia::Page
     def page
       @page ||= revision.try(:page)

data/app/models/georgia/status.rb

@@ -7,13 +7,11 @@ module Georgia
 
     has_many :pages
 
-    attr_accessible :name, :label, :icon
-
     validates :name, presence: true
 
-    scope :published, where(name: PUBLISHED)
-    scope :draft, where(name: DRAFT)
-    scope :pending_review, where(name: PENDING_REVIEW)
+    scope :published, -> { where(name: PUBLISHED) }
+    scope :draft, -> { where(name: DRAFT) }
+    scope :pending_review, -> { where(name: PENDING_REVIEW) }
 
     def published?
       self.name == PUBLISHED

data/app/models/georgia/ui_association.rb

@@ -1,16 +1,14 @@
 module Georgia
   class UiAssociation < ActiveRecord::Base
 
-    include Georgia::Concerns::Orderable
-    acts_as_list scope: :page
+    # acts_as_list scope: :page
 
     belongs_to :revision, class_name: Georgia::Revision, foreign_key: :page_id
     belongs_to :widget
     belongs_to :ui_section
 
-    attr_accessible :position, :widget_id, :ui_section_id, :page_id
-
-    scope :for_revision, lambda {|revision| where(page_id: revision.id)}
+    scope :for_revision, -> (revision) { where(page_id: revision.id) }
+    scope :ordered, -> { order(:position) }
 
     validate :associations
 

data/app/models/georgia/ui_section.rb

@@ -1,6 +1,5 @@
 module Georgia
   class UiSection < ActiveRecord::Base
-    attr_accessible :name
 
     has_many :ui_associations, dependent: :destroy
     has_many :widgets, through: :ui_associations
@@ -8,5 +7,6 @@ module Georgia
     has_many :pages, through: :revisions
 
     validates :name, presence: true, uniqueness: true
+
   end
 end

data/app/models/georgia/user.rb

@@ -2,26 +2,17 @@ module Georgia
   class User < ActiveRecord::Base
     devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
 
-    attr_accessible :first_name, :last_name, :email, :password, :password_confirmation, :remember_me, :role_ids
+    has_many :role_assignments, dependent: :destroy
+    has_many :roles, through: :role_assignments
+    has_many :revisions, foreign_key: :revised_by_id
 
-    has_and_belongs_to_many :roles, class_name: Georgia::Role
-
-    def has_role? role
-      return false unless role
-      @role_names ||= roles.map(&:name)
-      @role_names.include? role.to_s.titleize
+    def role_names
+      @role_names ||= roles.pluck(:name)
     end
 
-    scope :admins, includes(:roles).where(georgia_roles: {name: 'Admin'})
-    scope :editors, includes(:roles).where(georgia_roles: {name: 'Editor'})
-
     def name
       [first_name, last_name].join(' ')
     end
 
-    def roles_names
-      roles.map(&:name).join(', ')
-    end
-
   end
 end

data/app/models/georgia/widget.rb

@@ -8,9 +8,9 @@ module Georgia
     has_many :revisions, through: :ui_associations
     has_many :pages, through: :revisions
 
-    scope :footer, joins(:ui_sections).where(georgia_ui_sections: {name: 'Footer'}).uniq
-    scope :submenu, joins(:ui_sections).where(georgia_ui_sections: {name: 'Submenu'}).uniq
-    scope :sidebar, joins(:ui_sections).where(georgia_ui_sections: {name: 'Sidebar'}).uniq
+    scope :footer,  -> { joins(:ui_sections).where(georgia_ui_sections: {name: 'Footer'}).uniq }
+    scope :submenu, -> { joins(:ui_sections).where(georgia_ui_sections: {name: 'Submenu'}).uniq }
+    scope :sidebar, -> { joins(:ui_sections).where(georgia_ui_sections: {name: 'Sidebar'}).uniq }
 
     validate :content_presence
 

data/app/policies/georgia/api_policy.rb

@@ -0,0 +1,13 @@
+module Georgia
+  class ApiPolicy < ApplicationPolicy
+
+    def index?
+      true
+    end
+
+    def search?
+      index?
+    end
+
+  end
+end

data/app/policies/georgia/application_policy.rb

@@ -0,0 +1,30 @@
+module Georgia
+  class ApplicationPolicy
+    attr_reader :user,  :record
+
+    def initialize(user, record)
+      raise Pundit::NotAuthorizedError, "Must be signed in." unless user
+      @user   = user
+      @record = record
+    end
+
+    def scope
+      Pundit.policy_scope!(user, record.class)
+    end
+
+    def search?
+      index?
+    end
+
+    private
+
+    def user_roles
+      @user_roles ||= @user.role_names.map(&:downcase)
+    end
+
+    def user_permissions permissions, action
+      user_roles.map{|r| permissions[action].fetch(r, false)}
+    end
+
+  end
+end

data/app/policies/georgia/concerns/content_policy.rb

@@ -0,0 +1,56 @@
+require 'active_support/concern'
+
+module Georgia
+  module Concerns
+    module ContentPolicy
+      extend ActiveSupport::Concern
+
+      included do
+
+        def search?
+          index?
+        end
+
+        def preview?
+          content_user_permissions(:preview_pages).include?(true)
+        end
+
+        def copy?
+          content_user_permissions(:copy_pages).include?(true)
+        end
+
+        def show?
+          edit?
+        end
+
+        def new?
+          create?
+        end
+
+        def edit?
+          update?
+        end
+
+        def update?
+          content_user_permissions(:update_pages).include?(true)
+        end
+
+        def destroy?
+          content_user_permissions(:delete_pages).include?(true)
+        end
+
+        private
+
+        def content_permissions
+          Georgia.permissions[:content]
+        end
+
+        def content_user_permissions action
+          user_permissions(content_permissions, action)
+        end
+
+      end
+
+    end
+  end
+end