georgia 0.7.8 → 0.8.0

data/app/controllers/georgia/ui_associations_controller.rb

@@ -4,6 +4,7 @@ module Georgia
     # Renders new portlet for revisions#edit
     def new
       @ui_association = UiAssociation.new(widget_id: params[:widget_id], page_id: params[:revision_id], ui_section_id: params[:ui_section_id])
+      authorize @ui_association
       render layout: false
     end
 

data/app/controllers/georgia/users_controller.rb

@@ -1,49 +1,69 @@
 module Georgia
   class UsersController < ApplicationController
 
-    load_and_authorize_resource class: Georgia::User
-
     def index
+      authorize Georgia::User
       @users = User.order(:created_at).page(params[:page])
     end
 
     def show
-      redirect_to edit_user_path(params[:id])
+      @user = User.find(params[:id])
+      authorize @user
+      redirect_to [:edit, @user]
     end
 
     def new
       @user = User.new
+      authorize @user
     end
 
     def edit
-      @user = User.find(params[:id])
+      begin
+        @user = User.find(params[:id])
+        authorize @user
+      rescue ActiveRecord::RecordNotFound => ex
+        redirect_to users_path, alert: "This user doesn't exist anymore."
+      end
     end
 
     def create
-      @user = User.new(params[:user])
+      @user = User.new(user_params)
+      authorize @user
 
       if @user.save
-        redirect_to users_url, notice: "User was successfully created."
+        redirect_to users_path, notice: "User was successfully created."
       else
-        render 'new'
+        render :new
       end
     end
 
     def update
       @user = User.find(params[:id])
+      authorize @user
       params[:user].delete(:password) if params[:user][:password].blank?
       params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
-      if @user.update_attributes(params[:user])
-        redirect_to users_url, notice: "User was successfully updated."
+      if @user.update(user_params)
+        redirect_to users_path, notice: "User was successfully updated."
       else
-        render 'edit'
+        render :edit
       end
     end
 
     def destroy
       @user = User.find(params[:id])
+      authorize @user
       @user.destroy
-      redirect_to users_url, notice: "User was successfully deleted."
+      redirect_to users_path, notice: "User was successfully deleted."
+    end
+
+    def permissions
+      authorize Georgia::User
+    end
+
+    private
+
+    def user_params
+      params.require(:user).permit(:first_name, :last_name, :email, :password, :password_confirmation, :receives_notifications, role_ids: [])
     end
 
   end

data/app/controllers/georgia/widgets_controller.rb

@@ -1,9 +1,8 @@
 module Georgia
   class WidgetsController < ApplicationController
 
-    load_and_authorize_resource class: Georgia::Widget
-
     def index
+      authorize Widget
       @widgets = Widget.order(:created_at).page(params[:page]).in_groups_of(4, false)
       @widget = Widget.new
       @widget.contents.build(locale: current_locale)
@@ -11,10 +10,12 @@ module Georgia
 
     def edit
       @widget = Widget.find(params[:id])
+      authorize @widget
     end
 
     def create
-      @widget = Widget.new(params[:widget])
+      @widget = Widget.new(widget_params)
+      authorize @widget
 
       if @widget.save
         respond_to do |format|
@@ -32,7 +33,9 @@ module Georgia
 
     def update
       @widget = Widget.find(params[:id])
-      if @widget.update_attributes(params[:widget])
+      authorize @widget
+
+      if @widget.update(widget_params)
         respond_to do |format|
           format.html { redirect_to widgets_url, notice: "Widget was successfully updated." }
           format.js { head :ok }
@@ -47,6 +50,8 @@ module Georgia
 
     def destroy
       @widget = Widget.find(params[:id])
+      authorize @widget
+
       if @widget.destroy
         respond_to do |format|
           format.html { redirect_to widgets_url, notice: "Widget was successfully deleted." }
@@ -58,8 +63,12 @@ module Georgia
           format.js { head :internal_server_error }
         end
       end
+    end
 
+    private
 
+    def widget_params
+      params.require(:widget).permit(:id, :_destroy, contents_attributes: [:locale, :title, :text])
     end
 
   end

data/app/helpers/georgia/application_helper.rb

@@ -0,0 +1,4 @@
+module Georgia
+  module ApplicationHelper
+  end
+end

data/app/helpers/georgia/forms_helper.rb

@@ -50,11 +50,11 @@ module Georgia
     end
 
     def extra_fields?
-      lookup_context.exists?('extra-fields', ["#{klass_folder}/fields"], true)
+      lookup_context.exists?('extra_fields', ["#{klass_folder}/fields"], true)
     end
 
     def extra_fields_path
-      "#{klass_folder}/fields/extra-fields"
+      "#{klass_folder}/fields/extra_fields"
     end
 
     private

data/app/helpers/georgia/ui_helper.rb

@@ -1,25 +1,47 @@
 module Georgia
   module UiHelper
 
-    def avatar_url(email, options={})
-      gravatar_id = Digest::MD5.hexdigest(email.try(:downcase))
+    def avatar_url(email='', options={})
+      gravatar_id = Digest::MD5.hexdigest(email.downcase) if email
       size = options.fetch(:size, '32')
-      "http://gravatar.com/avatar/#{gravatar_id}.png?s=#{size}&d=mm"
-    end
-
-    def icon_tag icon_name, options={}
-      options[:class] ||= ''
-      options[:class] << "fa fa-#{icon_name}"
-      content_tag :i, nil, options
+      "//gravatar.com/avatar/#{gravatar_id}.png?s=#{size}&d=mm"
     end
 
     def caret_tag
       content_tag :span, nil, class: 'caret'
     end
 
-    def spinner_tag options={}
-      options[:class] = options.fetch(:class, 'spinner')
-      content_tag :div, icon_tag('spinner fa-spin fa-4x'), options
+    # FIXME: Turn into a Hash
+    def asset_icon_tag extension
+      icon_name = case extension.downcase
+        when 'avi' then 'file-movie-o'
+        when 'css' then 'file-text-o'
+        when 'csv' then 'file-excel-o'
+        when 'doc' then 'file-word-o'
+        when 'docx' then 'file-word-o'
+        when 'eps' then 'file-powerpoint-o'
+        when 'gif' then 'file-image-o'
+        when 'gz' then 'file-archive-o'
+        when 'html' then 'file-code-o'
+        when 'jpeg' then 'file-image-o'
+        when 'jpg' then 'file-image'
+        when 'mp3' then 'file-audio-o'
+        when 'ods' then 'file-excel-o'
+        when 'odt' then 'file-word-o'
+        when 'pdf' then 'file-pdf-o'
+        when 'png' then 'file-image-o'
+        when 'ppt' then 'file-powerpoint-o'
+        when 'pptx' then 'file-powerpoint-o'
+        when 'rar' then 'file-archive-o'
+        when 'tar' then 'file-archive-o'
+        when 'txt' then 'file-text-o'
+        when 'wav' then 'file-audio-o'
+        when 'xls' then 'file-excel-o'
+        when 'zip' then 'file-archive-o'
+        else
+          'file'
+        end
+      icon_tag(icon_name)
     end
 
     def link_to_back url=:back
@@ -44,5 +66,49 @@ module Georgia
       session[:welcomed] || !(session[:welcomed] = true)
     end
 
+    def button_to_settings
+      return unless policy(@page).settings?
+      link_to "#{icon_tag('cogs')} Settings".html_safe, [:settings, @page], class: 'btn btn-info'
+    end
+
+    def button_to_edit
+      return unless policy(@page).update?
+      link_to "#{icon_tag('pencil')} Edit".html_safe, [:edit, @page], class: 'btn btn-info'
+    end
+
+    def page_actions_tag page, revision=nil, options={}
+      revision ||= page.current_revision
+      Georgia::PageActionsPresenter.new(self, page, revision, options)
+    end
+
+    def page_url_minus_slug
+      @page_full_url ||= (Georgia.url + @page.url).gsub(@page.slug, '')
+    end
+
+    def revision_status_message page, revision, options={}
+      Georgia::RevisionStatusMessage.new(self, page, revision, options)
+    end
+
+    def picture_tag picture, options={}
+      return unless picture and picture.url.present?
+      format = options.fetch(:format, :tiny)
+      link_to picture.url_content, class: 'media-link bg-transparent', rel: 'shadowbox[gallery]' do
+        image_tag(picture.url(format), title: picture.data_file_name, class: 'media-image')
+      end
+    end
+
+    def link_to_available_locales
+      return unless I18n.available_locales.length > 1
+      links = I18n.available_locales.map do |locale|
+        content_tag(:li, link_to(t("georgia.#{locale}"), params.merge(locale: locale) ))
+      end
+      content_tag(:p, class: 'hint') do
+        content_tag(:div, class: 'dropdown') do
+          link_to("Change language <span class='caret'></span>".html_safe, '#', class: 'btn btn-warning', data: {toggle: 'dropdown'}, role: :button) +
+          content_tag(:ul, links.join('').html_safe, class: 'dropdown-menu', role: 'menu')
+        end
+      end
+    end
+
   end
 end

data/app/helpers/georgia/users_helper.rb

@@ -0,0 +1,21 @@
+module Georgia
+  module UsersHelper
+
+    def permissions_view
+      Georgia.permissions.map{|section, actions| permission_table_tag(section, actions)}.join().html_safe
+    end
+
+    def permission_table_tag section, actions
+      PermissionTablePresenter.new(self, section, actions).to_s
+    end
+
+    def georgia_roles_collection
+      @georgia_role_collection ||= Georgia::Role.pluck(:name, :id).map{|name, id| [name.titleize, id]}
+    end
+
+    def unknown_user_name
+      content_tag(:span, 'Unknown', class: 'text-muted')
+    end
+
+  end
+end

data/app/mailers/georgia/notifier.rb

@@ -4,10 +4,10 @@ module Georgia
     def notify_admins(message, url)
       @message = message
       @url = url
-      emails_to = Georgia::User.admins.map(&:email)
+      emails_to = Georgia::User.where(roles: ['admin', 'editor']).where(receives_notifications: true).pluck(:email)
       unless emails_to.empty?
         mail(
-          from: "georgia@motioneleven.com",
+          from: "notify@georgiacms.org",
           to: emails_to,
           subject: @message
           )
@@ -17,10 +17,10 @@ module Georgia
     def notify_editors(message, url)
       @message = message
       @url = url
-      emails_to = Georgia::User.editors.map(&:email)
+      emails_to = Georgia::User.where(roles: ['admin', 'editor']).where(receives_notifications: true).pluck(:email)
       unless emails_to.empty?
         mail(
-          from: "georgia@motioneleven.com",
+          from: "notify@georgiacms.org",
           to: emails_to,
           subject: @message
           )

data/app/models/ckeditor/asset.rb

@@ -1,23 +1,27 @@
 class Ckeditor::Asset < ActiveRecord::Base
 
-  include Georgia::Indexer::Adapter
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+  index_name 'ckeditor-assets'
+  document_type 'asset'
+  include Ckeditor::AssetSearch
 
   # to allow media_path in to_jq_upload
   include Georgia::Engine.routes.url_helpers
 
   include Ckeditor::Orm::ActiveRecord::AssetBase
-  include Georgia::Concerns::Taggable
+
+  acts_as_taggable_on :tags
 
   delegate :url, :current_path, :content_type, to: :data
 
   mount_uploader :data, Ckeditor::AttachmentFileUploader, mount_on: :data_file_name
 
   validates :data, presence: true
-  attr_accessible :data
 
   paginates_per 15
 
-  scope :latest, order('created_at DESC')
+  scope :latest, -> { order(created_at: :desc) }
 
   def to_jq_upload
     {
@@ -38,6 +42,14 @@ class Ckeditor::Asset < ActiveRecord::Base
     @extension ||= data_content_type.gsub(/.*\/(.*)/, '\1')
   end
 
+  def self.policy_class
+    Georgia::MediaPolicy
+  end
+
+  def image?
+    false
+  end
+
   SIZE_RANGE = {
     '< 25 KB' => 0..25,
     '25 KB to 100 KB' => 25..100,

data/app/models/ckeditor/asset_search.rb

@@ -0,0 +1,15 @@
+require 'active_support/concern'
+module Ckeditor
+  module AssetSearch
+    extend ActiveSupport::Concern
+
+    included do
+      def as_indexed_json options={}
+        self.as_json(
+          only: [:id, :data_file_name, :updated_at],
+          methods: [:tag_list, :image?]
+        )
+      end
+    end
+  end
+end

data/app/models/ckeditor/attachment_file.rb

@@ -1,4 +1,11 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
+
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+  index_name 'ckeditor-assets'
+  document_type 'asset'
+  include Ckeditor::AssetSearch
+
   mount_uploader :data, Ckeditor::AttachmentFileUploader, :mount_on => :data_file_name
 
   def url_thumb

data/app/models/ckeditor/picture.rb

@@ -1,5 +1,11 @@
 class Ckeditor::Picture < Ckeditor::Asset
 
+  include Elasticsearch::Model
+  include Elasticsearch::Model::Callbacks
+  index_name 'ckeditor-assets'
+  document_type 'asset'
+  include Ckeditor::AssetSearch
+
   mount_uploader :data, Ckeditor::PictureUploader, mount_on: :data_file_name
 
   has_many :contents, foreign_key: :image_id, class_name: Georgia::Content
@@ -21,4 +27,8 @@ class Ckeditor::Picture < Ckeditor::Asset
       end
   end
 
+  def image?
+    true
+  end
+
 end

data/app/models/georgia/clone.rb

@@ -13,7 +13,9 @@ module Georgia
     # The resulting instance has a '(Copy)' title and '-copy' slug
     def copy
       copy_page
-      duplicate.current_revision = clone_current_revision
+      revision = Georgia::CloneRevision.new(instance.current_revision, status: 'draft')
+      revision.revisionable = duplicate
+      duplicate.current_revision = revision
       alter_slug
       alter_title
       duplicate.save!

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

@@ -8,16 +8,15 @@ module Georgia
       included do
         has_many :contents, as: :contentable, dependent: :destroy, class_name: Georgia::Content
         accepts_nested_attributes_for :contents
-        attr_accessible :contents_attributes
 
-        scope :with_locale, lambda {|locale| joins(:contents).where(georgia_contents: {locale: locale}).uniq}
+        scope :with_locale, -> (locale) { joins(:contents).where(georgia_contents: {locale: locale}).uniq }
 
         def content(locale=nil)
           locale ||= I18n.locale.to_s
           @content ||= contents.select{|c| c.locale == locale}.first || Georgia::Content.new(locale: locale)
         end
 
-				delegate :title, :text, :excerpt, :keywords, :keyword_list, :image, :locale, to: :content
+        delegate :title, :text, :excerpt, :keywords, :keyword_list, :image, :locale, to: :content
       end
 
     end