georgia 0.7.8 → 0.8.0

data/app/views/public_activity/georgia_page/_publish.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has published <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_page/_unpublish.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has unpublished <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_page/_update.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has updated settings for <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_revision/_approve.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has approved a review for <em><%= link_to activity.trackable.title, [activity.trackable.revisionable, activity.trackable] rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_revision/_decline.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has decline a review for <em><%= link_to activity.trackable.title, [activity.trackable.revisionable, activity.trackable] rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_revision/_draft.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has drafted <em><%= link_to activity.trackable.title, activity.trackable rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_revision/_restore.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has restored a past revision for <em><%= link_to activity.trackable.title, [activity.trackable.revisionable, activity.trackable] rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_revision/_review.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has requested a review for <em><%= link_to activity.trackable.title, [activity.trackable.revisionable, activity.trackable] rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/app/views/public_activity/georgia_revision/_update.html.erb

@@ -0,0 +1,15 @@
+<div id='activity_<%= activity.id %>' class="activity media">
+  <%= image_tag(avatar_url(activity.owner.try(:email)), alt: '', class: 'media-object pull-left') %>
+  <div class="media-body">
+    <h4 class="media-heading">
+      <%= activity.owner.try(:name) || unknown_user_name %> has updated <em><%= link_to activity.trackable.title, [activity.trackable.revisionable, activity.trackable] rescue '[deleted]' %></em>
+    </h4>
+    <p>
+      <small>
+        <time class='text-muted js-time-ago' datetime="<%= activity.created_at %>">
+          About <%= time_ago_in_words(activity.created_at) %> ago
+        </time>
+      </small>
+    </p>
+  </div>
+</div>

data/config/initializers/acts_as_taggable_on.rb

@@ -1,13 +1,14 @@
-# If you would like to remove unused tag objects after removing taggings, add
 ActsAsTaggableOn.remove_unused_tags = true
-
-# ActsAsTaggableOn.delimiter = ','
-
-# If you want force tags to be saved downcased:
-# ActsAsTaggableOn.force_lowercase = true
-
-# If you want tags to be saved parametrized (you can redefine to_param as well):
-# ActsAsTaggableOn.force_parameterize = true
-
-# If you would like tags to be case-sensitive and not use LIKE queries for creation:
-# ActsAsTaggableOn.strict_case_match = true
+ActsAsTaggableOn::Tag.send(:include, Elasticsearch::Model)
+ActsAsTaggableOn::Tag.send(:include, Elasticsearch::Model::Callbacks)
+ActsAsTaggableOn::Tag.class_eval do
+  def self.policy_class
+    Georgia::ApiPolicy
+  end
+end
+ActsAsTaggableOn::Tagging.class_eval do
+  after_save :touch_taggable
+  def touch_taggable
+    taggable.touch if taggable.present?
+  end
+end

data/config/initializers/ckeditor.rb

@@ -1,18 +1,38 @@
 # Use this hook to configure ckeditor
-if Object.const_defined?("Ckeditor")
-  Ckeditor.setup do |config|
-    # ==> ORM configuration
-    # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
-    # :mongoid (bson_ext recommended) by default. Other ORMs may be
-    # available as additional gems.
-    require "ckeditor/orm/active_record"
-
-    # Allowed image file types for upload.
-    # Set to nil or [] (empty array) for all file types
-    # config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
-
-    # Allowed attachment file types for upload.
-    # Set to nil or [] (empty array) for all file types
-    # config.attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "swf"]
-  end
+Ckeditor.setup do |config|
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default), :mongo_mapper and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require "ckeditor/orm/active_record"
+
+  config.assets_languages = ['en', 'fr']
+
+  # Allowed image file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # By default: %w(jpg jpeg png gif tiff)
+  # config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
+
+  # Allowed attachment file types for upload.
+  # Set to nil or [] (empty array) for all file types
+  # By default: %w(doc docx xls odt ods pdf rar zip tar tar.gz swf)
+  # config.attachment_file_types = ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "swf"]
+
+  # Setup authorization to be run as a before filter
+  # By default: there is no authorization.
+  # config.authorize_with :cancan
+
+  # Asset model classes
+  # config.picture_model { Ckeditor::Picture }
+  # config.attachment_file_model { Ckeditor::AttachmentFile }
+
+  # Paginate assets
+  # By default: 24
+  # config.default_per_page = 24
+
+  # Customize ckeditor assets path
+  # By default: nil
+  # config.asset_path = "http://www.example.com/assets/ckeditor/"
 end
+
+Rails.application.config.assets.precompile += %w( ckeditor/* )

data/config/initializers/devise.rb

@@ -4,13 +4,13 @@ Devise.setup do |config|
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.
-  config.secret_key = '48b4b40aeed8b1b4f11fa07ce0f75684e2a6a7ce0820506e7c58149879eff83d64ccc336b75039a0f9f8fcc8ede0429af92c784a28db9132a5399fb7878475f0'
+  # config.secret_key = '46abeebc2b3664faeb421514a3b7c92faee7e571c80e4192bf5365f9e4a6ce349d5273ff9ee3d900a8e861e8dcd909906843a894b67fb8578e547a1a7916deb4'
 
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+  config.mailer_sender = 'no-reply@georgiacms.org'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'
@@ -76,7 +76,7 @@ Devise.setup do |config|
   # particular strategies by setting this option.
   # Notice that if you are skipping storage for all authentication paths, you
   # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
   config.skip_session_storage = [:http_auth]
 
   # By default, Devise cleans up the CSRF token on authentication to
@@ -91,18 +91,20 @@ Devise.setup do |config|
   #
   # Limiting the stretches to just one in testing will increase the performance of
   # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # encryptor), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
   config.stretches = Rails.env.test? ? 1 : 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = 'd89feba32ca1e861e6cb7af3fd87f2d8ce319377c12c39fff66f937f941524392bd5d42a6867682527e89641ae31e7c8e1c90429fc70dac3b6efb21d6019cc9e'
+  # config.pepper = '45253a3ee9b5c7ca3ee0d674bece4cec6c97b4953cd7f2aa860221a79faa2f45a3cb2ac46da3969e1ef34081d5625e9db61d923030e3b421708524c87bd44cb1'
 
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
   # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
+  # the user cannot access the website without confirming their account.
   # config.allow_unconfirmed_access_for = 2.days
 
   # A period that the user is allowed to confirm their account before their
@@ -115,8 +117,8 @@ Devise.setup do |config|
 
   # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
   config.reconfirmable = true
 
   # Defines which key will be used when confirming an account
@@ -130,11 +132,11 @@ Devise.setup do |config|
   # config.extend_remember_period = false
 
   # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
+  # secure: true in order to force SSL only cookies.
   # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
-  # Range for password length. Default is 8..128.
+  # Range for password length.
   config.password_length = 8..128
 
   # Email regex used to validate email formats. It simply asserts that
@@ -227,7 +229,7 @@ Devise.setup do |config|
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
@@ -235,7 +237,7 @@ Devise.setup do |config|
   #
   # config.warden do |manager|
   #   manager.intercept_401 = false
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
   # end
 
   # ==> Mountable engine configurations
@@ -246,7 +248,7 @@ Devise.setup do |config|
   #     mount MyEngine, at: '/my_engine'
   #
   # The router that invoked `devise_for`, in the example above, would be:
-  # config.router_name = :my_engine
+  config.router_name = :georgia
   #
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:

data/config/initializers/elasticsearch.rb

@@ -0,0 +1,44 @@
+class MultipleModels < Array
+  def client
+    Elasticsearch::Model.client
+  end
+
+  def ancestors
+    []
+  end
+
+  def default_per_page
+    10
+  end
+
+  def inspect
+    "MultipleModels: #{super}"
+  end
+end
+
+module Elasticsearch::Model
+  # Search multiple models
+  #
+  def search(query_or_payload, models=[], options={})
+    if models.empty?
+      models = Object.constants
+      .select { |c| Kernel.const_get(c).respond_to?(:__elasticsearch__) }
+      .map    { |c| c.is_a?(Class) ? c : Kernel.const_get(c) }
+    end
+
+    models = MultipleModels.new(models)
+
+    index_names    = models.map { |c| c.index_name }
+    document_types = models.map { |c| c.document_type }
+
+    search = Searching::SearchRequest.new(
+                 models,
+                 query_or_payload,
+                 {index: index_names, type: document_types}.merge(options)
+               )
+
+    Response::Response.new(models, search)
+  end
+
+  module_function :search
+end

data/config/initializers/inflections.rb

@@ -1,3 +1,3 @@
 ActiveSupport::Inflector.inflections do |inflect|
-	inflect.uncountable %w( media )
+  inflect.uncountable %w( media )
 end

data/config/routes.rb

@@ -1,6 +1,7 @@
 Georgia::Engine.routes.draw do
 
-  devise_for :users, class_name: "Georgia::User", path: '/', module: 'georgia/users', path_names: {sign_in: '/login', sign_out: '/logout'}
+  mount Ckeditor::Engine => '/ckeditor'
+  devise_for :users, class_name: "Georgia::User", path: '', module: 'georgia/users', path_names: {sign_in: 'login', sign_out: 'logout'}
 
   namespace :api do
     resources :media, only: [] do
@@ -8,38 +9,12 @@ Georgia::Engine.routes.draw do
         get :pictures
       end
     end
-    resources :tags, only: [] do
+    resources :tags, only: [:index] do
       get :search, on: :collection
     end
   end
 
-  concern :pageable do
-
-    collection do
-      get :search
-      post :sort
-      post :publish
-      post :unpublish
-      post 'flush-cache', to: :flush_cache, as: :flush_cache
-      delete '/', to: :destroy
-    end
-
-    member do
-      get :copy
-      get :settings
-    end
-
-    resources :revisions do
-      member do
-        get :preview
-        get :review
-        get :approve
-        get :store
-        get :decline
-        get :restore
-      end
-    end
-  end
+  Georgia::PageableRouteConcern.included(self)
 
   resources :pages, concerns: [:pageable]
 
@@ -50,18 +25,20 @@ Georgia::Engine.routes.draw do
       delete '/', to: :destroy
     end
   end
-  resources :users
+  resources :users do
+    get 'permissions', on: :collection
+  end
   resources :menus, path: 'navigation'
   resources :links, only: [:create, :show]
   resources :widgets
   resources :ui_associations, path: 'ui-associations', only: [:new]
   resources :slides, only: [:new]
 
-  unauthenticated do
-    as :user do
-      root :to => 'users/sessions#new'
-    end
-  end
-  root :to => "dashboard#show"
+  # unauthenticated do
+  #   as :user do
+  #     root to: 'users/sessions#new'
+  #   end
+  # end
+  root to: "dashboard#show"
 
 end