adva 0.1.4 → 0.2.1

data/app/controllers/articles_controller.rb

@@ -1,79 +1,52 @@
 class ArticlesController < BaseController
-  before_action :set_section
-  before_action :adjust_action
-  before_action :set_category, :only => :index
-  before_action :set_tags,     :only => :index
-  before_action :set_articles, :only => :index
-  before_action :set_article,  :only => :show
-
-  authenticates_anonymous_user
-
   def index
-    @article = @articles.first
+    @article = articles.first
     if !@article
       raise ActiveRecord::RecordNotFound
-    elsif @article.is_a?(Link)
-      redirect_to @article.body
     else
       show
     end
   end
 
   def show
-    if stale?(etag: [@article, @section, @site], last_modified: [@article, @section, @site].map(&:updated_at).compact.max, public: true)
-      render template: "#{@section.type.tableize}/articles/show"
+    @article ||= section.articles.find_by_permalink!(params[:permalink])
+    if @article.draft?
+      raise ActiveRecord::RecordNotFound unless current_user.admin?
     end
-  end
-
-  protected
+    return redirect_to @article.body if @article.is_a?(Link)
 
-    def current_resource
-      @section.try(:single_article_mode) ? @section : @article || @section
-    end
-
-    # adjusts the action from :index to :show when the current section is in single-article mode ...
-    def adjust_action
-      if params[:action] == 'index' and @section.try(:single_article_mode)
-        # ... but only if there is one published article
-        unless @section.contents.blank? || (@section.contents.first.draft? && current_user.admin?)
-          @action_name = @_params[:action] = request.parameters['action'] = 'show'
-        end
-      end
+    if stale?([*@article.cells, @article, section, site], public: true)
+      render template: "#{section.type.tableize}/articles/show"
     end
+  end
 
-    def set_article
-      @article = if params[:permalink]
-        @section.contents.includes(:author).find_by_permalink!(params[:permalink])
-      elsif @section.try(:single_article_mode)
-        @section.contents.first
-      end
-    end
+  private
 
-    def set_articles
-      scope = @category ? @category.all_contents : @section.contents
-      scope = scope.tagged(@tags) if @tags.present?
+  helper_method def articles
+    @articles ||= begin
+      scope = category ? category.all_contents : section.contents
+      scope = scope.tagged(tags) if tags.any?
       scope = scope.published
-      @articles = scope.paginate(page: current_page).limit(@section.contents_per_page)
+      scope.paginate(page: current_page).limit(section.contents_per_page.to_i)
     end
+  end
 
-    def set_category
-      if params[:category_id]
-        @category = @section.categories.find(params[:category_id])
-        raise ActiveRecord::RecordNotFound unless @category
-      end
+  helper_method def category
+    if !defined?(@category)
+      @category = params[:category_id] ? section.categories.find(params[:category_id]) : nil
     end
+    @category
+  end
 
-    def set_tags
-      if params[:tags]
-        names = params[:tags].split('+')
-        @tags = Tag.where(name: names).pluck(:name)
-        raise ActiveRecord::RecordNotFound unless @tags.size == names.size
-      end
-    end
+  helper_method def tags
+    return @tags if defined?(@tags)
+    names = params[:tags].to_s.split('+')
+    @tags = Tag.where(name: names).pluck(:name)
+    raise ActiveRecord::RecordNotFound if @tags.size != names.size
+    @tags
+  end
 
-    def guard_view_permissions
-      if @article && @article.draft?
-        raise ActiveRecord::RecordNotFound unless current_user.admin?
-      end
-    end
+  helper_method def current_resource
+    section.try(:single_article_mode) ? section : @article || section
+  end
 end

data/app/controllers/base_controller.rb

@@ -1,18 +1,19 @@
+require "adva/authenticate_user"
+
 class BaseController < ApplicationController
   class SectionRoutingError < ActionController::RoutingError; end
-  helper :base, :resource, :content, :meta_tags
-  helper HasFilter::Helper
+  helper :base, :resource, :content
   helper TableBuilder
 
   include CacheableFlash
   include ContentHelper
   include ResourceHelper
 
+  include Adva::AuthenticateUser
+
   before_action :set_site, :set_timezone
   attr_accessor :site, :section
 
-  layout 'default'
-
   def site
     @site ||= Site.find_by_host!(request.host)
   end
@@ -21,12 +22,11 @@ class BaseController < ApplicationController
 
     alias :set_site :site
 
-    def sections
+    helper_method def sections
       @sections ||= site.sections
     end
-    helper_method :sections
 
-    def set_section
+    helper_method def section
       @section ||= begin
         if params.key?(:section_permalink)
           sections.find_by_permalink!(params[:section_permalink])
@@ -37,7 +37,7 @@ class BaseController < ApplicationController
       raise ActiveRecord::RecordNotFound unless @section.published?(true) || current_user.admin?
       @section
     end
-    alias :section :set_section
+    alias :set_section :section
 
     def set_timezone
       Time.zone = @site.timezone if @site

data/app/controllers/password_controller.rb

@@ -6,12 +6,11 @@ class PasswordController < BaseController
   end
 
   def create
-    flash[:notice] = t(:'adva.passwords.flash.create.notification')
     if user = User.find_by_email(params[:user][:email])
       token = user.assign_token 'password'
       user.save!
       trigger_event user, :password_reset_requested, :token => "#{user.id};#{token}"
-      redirect_to edit_password_url
+      redirect_to edit_password_url, notice: "If the given email address exists in our system, we have just sent you an email with information on how to reset your password."
     else
       render :action => :new
     end
@@ -23,12 +22,11 @@ class PasswordController < BaseController
   def update
     if current_user && current_user.update(params[:user].slice(:password))
       trigger_event current_user, :password_updated
-      flash[:notice] = t(:'adva.passwords.flash.update.success')
       authenticate_user(:email => current_user.email, :password => params[:user][:password])
-      redirect_to "/"
+      redirect_to "/", notice: "Your password was changed successfully."
     else
       params[:token] = nil # ugh
-      flash[:error] = t(:'adva.passwords.flash.update.failure')
+      flash.now.alert = "Your password could not be changed."
       render :action => :edit
     end
   end

data/app/controllers/session_controller.rb

@@ -12,19 +12,17 @@ class SessionController < BaseController
   def create
     if authenticate_user(params[:user])
       remember_me! if params[:user][:remember_me]
-      flash[:notice] = t(:'adva.session.flash.create.success')
-      redirect_to return_from(:login)
+      redirect_to return_from(:login), notice: "Logged in successfully."
     else
       @user = User.new(:email => params[:user][:email])
       @remember_me = params[:user][:remember_me]
-      flash.now[:error] = t(:'adva.session.flash.create.failure')
+      flash.now.alert = "Could not login with this email and password."
       render :action => 'new'
     end
   end
 
   def destroy
     logout
-    flash[:notice] = t(:'adva.session.flash.destroy.success')
-    redirect_to return_from(:logout)
+    redirect_to return_from(:logout), notice: "Logged out successfully."
   end
 end

data/app/helpers/activities_helper.rb

@@ -6,7 +6,7 @@ module ActivitiesHelper
                :locals => { :activity => activity, :recent => recent }
       end.join
     else
-      html = %(<li class="empty shade">#{I18n.t(:'adva.activity.none')}.</li>)
+      html = %(<li class="empty shade">Nothing happened.</li>)
     end
     raw %(<ul class="activities">#{html}</ul>)
   end
@@ -19,34 +19,22 @@ module ActivitiesHelper
 
   def activity_datetime(activity, short = false)
     if activity.from and short
-      from = activity.from.to_s(:time_only)
-      to = activity.to.to_s(:time_only)
+      from = activity.from.to_fs(:time_only)
+      to = activity.to.to_fs(:time_only)
       "#{from} - #{to}"
     elsif activity.from and activity.from.to_date != activity.to.to_date
-      from = activity.from.to_ordinalized_s(:plain)
-      to = activity.to.to_ordinalized_s(:plain)
+      from = activity.from.to_fs(:long_ordinalized)
+      to = activity.to.to_fs(:long_ordinal)
       "#{from} - #{to}"
     elsif activity.from
-      from = activity.from.to_ordinalized_s(:plain)
-      to = activity.to.to_ordinalized_s(:time_only)
+      from = activity.from.to_fs(:long_ordinal)
+      to = activity.to.to_fs(:time_only)
       "#{from} - #{to}"
     else
-      activity.created_at.send *(short ? [:to_s, :time_only] :  [:to_ordinalized_s, :plain])
+      activity.created_at.to_fs(short ? :time_only :  :long_ordinal)
     end
   end
 
-  # def activity_datetime(activity, short = false)
-  #   from, to = if activity.from && short
-  #     [l(activity.from, :format => :time), l(activity.to, :format => :time)]
-  #   elsif activity.from && activity.from.to_date != activity.to.to_date
-  #     [l(activity.from, :format => :short), l(activity.to, :format => :short)]
-  #   elsif activity.from
-  #     [l(activity.from, :format => :short), l(activity.to, :format => :time)]
-  #   end
-
-  #   t(:'adva.activity.from_to', :from => from, :to => to)
-  # end
-
   def activity_object_edit_url(activity)
     type = activity.object_attributes['type'] || activity.object_type
     send "edit_admin_#{type}_path".downcase, activity.site_id, activity.section_id, activity.object_id
@@ -71,3 +59,4 @@ module ActivitiesHelper
     end
   end
 end
+

data/app/helpers/admin/base_helper.rb

@@ -1,8 +1,8 @@
 module Admin::BaseHelper
   def save_or_cancel_links(builder, options = {})
-    save_text   = options.delete(:save_text)   || t(:'adva.common.save')
-    or_text     = options.delete(:or_text)     || t(:'adva.common.connector.or')
-    cancel_text = options.delete(:cancel_text) || t(:'adva.common.cancel')
+    save_text   = options.delete(:save_text)   || "Save"
+    or_text     = options.delete(:or_text)     || "or"
+    cancel_text = options.delete(:cancel_text) || "Cancel"
     cancel_url  = options.delete(:cancel_url)
 
     save_options = options.delete(:save) || {}
@@ -18,29 +18,11 @@ module Admin::BaseHelper
   end
 
   def link_to_profile(options = {})
-    name = options[:name].nil? ? t(:'adva.links.profile') : options[:name]
+    name = options[:name].nil? ? "Profile" : options[:name]
     path = admin_user_path(current_user)
     link_to(name, path)
   end
 
-  def links_to_content_translations(content, &block)
-    return '' if content.new_record?
-    block = Proc.new { |locale| link_to_edit(locale, content, :cl => locale) } unless block
-    locales = content.translated_locales.map { |locale| block.call(locale.to_s) }
-    content_tag(:span, :class => 'content_translations') do
-      t(:"adva.#{content[:type].tableize}.translation_links", :locales => locales.join(', ')) +
-      "<p class=\"hint\" for=\"content_translations\">#{t(:'adva.hints.content_translations')}</p>"
-    end
-  end
-
-  def link_to_clear_cached_pages(site)
-    link_to(t(:'adva.cached_pages.links.clear_all'), admin_cached_pages_path(site), :method => :delete)
-  end
-
-  def link_to_restore_plugin_defaults(site, plugin)
-    link_to(t(:'adva.titles.restore_defaults'), admin_plugin_path(site, plugin), :data => { :confirm => t(:'adva.plugins.confirm_reset') })
-  end
-
   # FIXME: translations
   def page_cached_at(page)
     if Date.today == page.updated_at.to_date

data/app/helpers/base_helper.rb

@@ -34,7 +34,7 @@ module BaseHelper
   def filter_options
     FilteredColumn.filters.keys.inject([]) do |arr, key|
       arr << [FilteredColumn.filters[key].filter_name, key.to_s]
-    end.unshift [t(:'adva.settings.filter_options.plain_html'), '']
+    end.unshift ["Plain HTML", '']
   end
 
   def author_options(users)

data/app/helpers/content_helper.rb

@@ -31,7 +31,7 @@ module ContentHelper
   def content_status(content)
     return "<span>&nbsp;</span>" unless content.respond_to?(:published?)
     klass = content.published? ? 'published' : 'pending'
-    text  = content.published? ? t(:'adva.titles.published') : t(:'adva.titles.pending')
+    text  = content.published? ? "Published" : "Pending"
 
     "<span title='#{text}' alt='#{text}' class='status #{klass}'>#{text}</span>"
   end
@@ -40,7 +40,7 @@ module ContentHelper
     options = args.extract_options!
     content, text = *args.reverse
 
-    text ||= :"adva.#{content.class.name.tableize}.links.preview"
+    text ||= "Preview"
     url = show_path(content, :cl => content.class.locale, :namespace => nil)
 
     options.reverse_merge!(:url => url, :class => "preview #{content.class.name.underscore}")
@@ -64,8 +64,10 @@ module ContentHelper
 
   def links_to_content_categories(content, key = nil)
     return if content.categories.empty?
-    links = content.categories.map { |category| link_to_category content.section, category }
-    key ? t(key, :links => links.join(', ')) : links
+    links = content.categories.map do |category|
+      link_to_category content.section, category
+    end
+    raw "in: #{links.join(', ')}"
   end
 
   def link_to_tag(*args, &block)
@@ -84,7 +86,7 @@ module ContentHelper
   def links_to_content_tags(content, key = nil)
     return if content.tags.empty?
     links = content.tags.map { |tag| link_to_tag content.section, tag }
-    key ? t(key, links: links.join(', ')).html_safe : links
+    raw "tagged: #{links.join(', ')}"
   end
 
   def content_category_checkbox(content, category)

data/app/helpers/resource_helper.rb

@@ -73,7 +73,7 @@ module ResourceHelper
 
   def resource_link_id(action, type, resource)
     id = [action, type]
-    id << resource.id if resource.is_a?(ActiveRecord::Base) && !action.in?(:index, :new)
+    id << resource.id if resource.is_a?(ActiveRecord::Base) && !%i[index name].include?(action)
     id.join('_')
   end
 
@@ -103,14 +103,14 @@ module ResourceHelper
   def normalize_resource_link_options(options, action, type, resource)
     options[:class] ||= "#{action} #{type}"
     options[:id] ||= resource_link_id(action, type, resource)
-    options[:title] ||= t(:"adva.titles.#{action}")
+    options[:title] ||= action.to_s.titleize
     options.reverse_merge!(resource_delete_options(type, options)) if action == :delete
     options
   end
 
   def normalize_resource_link_text(text, action, type)
     type = type.to_s.gsub('/', '_').pluralize
-    text ||= t(:"adva.#{type}.links.#{action}", :default => :"adva.resources.links.#{action}")
+    text ||= action.capitalize
     text = t(text) if text.is_a?(Symbol)
     text
   end
@@ -118,8 +118,7 @@ module ResourceHelper
   def resource_delete_options(type, options)
     type = type.to_s.gsub('/', '_').pluralize
     message = options.delete(:confirm)
-    message ||= t(:"adva.#{type}.confirm_delete", :default => :"adva.resources.confirm_delete")
-    message = t(message) if message.is_a?(Symbol)
+    message ||= "Are you sure you want to delete this #{type}?"
     { :data => { :confirm => message }, :method => :delete }
   end
 end

data/app/helpers/users_helper.rb

@@ -1,7 +1,7 @@
 module UsersHelper
   def who(name)
     name = name.name if name.is_a? User
-    return current_user.name == name ? t(:'adva.common.you') : name
+    return current_user.name == name ? "You" : name
   end
 
   def gravatar_img(user, options = {})

data/app/models/activity.rb

@@ -1,3 +1,5 @@
+require "adva/belongs_to_author"
+
 class Activity < ActiveRecord::Base
   belongs_to :site
   belongs_to :section
@@ -11,6 +13,7 @@ class Activity < ActiveRecord::Base
     end
   }
 
+  include Adva::BelongsToAuthor
   belongs_to_author
 
   serialize :actions

data/app/models/article.rb

@@ -1,13 +1,9 @@
 class Article < Content
   # default_scope :order => "#{self.table_name}.published_at DESC"
 
-  filters_attributes :except => [:excerpt, :excerpt_html, :body, :body_html, :cached_tag_list]
-
   validates_presence_of :title, :body
   validates_uniqueness_of :permalink, scope: :section_id, case_sensitive: true
 
-  class_attribute :meta_fields, default: %w(keywords description author copyright geourl)
-
   class << self
     def locale
       "en"
@@ -39,11 +35,4 @@ class Article < Content
     date = [:year, :month, :day].map { |key| [key, (published? ? published_at : created_at).send(key)] }.flatten
     Hash[:permalink, permalink, *date]
   end
-
-  def default_meta_description
-    sanitizer = defined?(Rails::Html::FullSanitizer) ? Rails::Html::FullSanitizer.new : HTML::FullSanitizer.new
-    sanitized_excerpt = sanitizer.sanitize(excerpt || "").gsub(/\s+/, " ").strip.truncate(160)
-    sanitized_body = sanitizer.sanitize(body || "").gsub(/\s+/, " ").strip.truncate(160)
-    sanitized_excerpt.present? ? sanitized_excerpt : sanitized_body
-  end
 end

data/app/models/category.rb

@@ -1,10 +1,10 @@
 require "awesome_nested_set"
-require "has_permalink"
+require "adva/has_permalink"
 
 class Category < ActiveRecord::Base
   acts_as_nested_set :scope => :section_id
 
-  include HasPermalink
+  include Adva::HasPermalink
   has_permalink :title, :url_attribute => :permalink, :sync_url => true, :only_when_blank => true, :scope => :section_id
 
   belongs_to :section, :foreign_key => 'section_id'
@@ -26,7 +26,7 @@ class Category < ActiveRecord::Base
   end
 
   def all_contents
-    Content.by_category(self)
+    Content.by_category(self).order(published_at: :desc)
   end
 
   protected

data/app/models/content.rb

@@ -1,23 +1,22 @@
+require "adva/has_permalink"
+require "adva/belongs_to_author"
+
 class Content < ActiveRecord::Base
   acts_as_nested_set :scope => :section_id
 
-  # TODO is this needed?
-  class Version < ActiveRecord::Base
-    filters_attributes :none => true
-  end
-
-  has_filter :tagged, :categorized,
-             :text  => { :attributes => [:title, :body, :excerpt] },
-             :state => { :states => [:published, :unpublished] }
-
   acts_as_taggable
 
-  instantiates_with_sti
+  include Adva::HasPermalink
   has_permalink :title, :url_attribute => :permalink, :sync_url => true, :only_when_blank => true, :scope => :section_id
-  filtered_column :body, :excerpt
+
+  filtered_column :body, :excerpt # TODO rm all of this and the associated _html columns
+
+  has_cells :body, :excerpt if respond_to?(:has_cells)
 
   belongs_to :site
   belongs_to :section, :touch => true
+
+  include Adva::BelongsToAuthor
   belongs_to_author :validate => true
 
   has_many :asset_assignments # TODO :dependent => :delete_all?
@@ -63,34 +62,6 @@ class Content < ActiveRecord::Base
     permalink
   end
 
-  def cache_key(*timestamp_names)
-    if new_record?
-      "#{model_name.cache_key}/new"
-    else
-      timestamp_names = [:updated_at, :cells_updated_at] if timestamp_names.none?
-      timestamp = timestamp_names.map { |attr| send(attr) }.compact.map(&:to_time).max
-      timestamp = timestamp.utc.to_s(cache_timestamp_format)
-      "#{model_name.cache_key}/#{id}-#{timestamp}"
-    end
-  end
-
-  def cells_updated_at
-    if defined?(OutputFilter::Cells)
-      OutputFilter::Cells.new(nil).send(:cells, body_html).values.map do |name, state, attrs|
-        attrs = HashWithIndifferentAccess.new(attrs)
-        cell = "#{name.camelize}Cell".constantize.new
-        args = [state]
-        attrs.delete "class" # ignore styling class
-        attrs[:format] = :timestamp
-        args << attrs unless attrs.empty?
-        begin
-          cell.render_state *args
-        rescue ArgumentError
-        end
-      end.select { |response| response.is_a?(Time) }.max
-    end
-  end
-
   def owners
     owner.owners << owner
   end

data/app/models/link.rb

@@ -1,4 +1,3 @@
 class Link < Content
-  filters_attributes :except => [:excerpt, :excerpt_html, :body, :body_html, :cached_tag_list]
   validates_presence_of :title, :body
 end

data/app/models/password_mailer.rb

@@ -1,8 +1,4 @@
-require "login/mail_config"
-
 class PasswordMailer < ActionMailer::Base
-  include Login::MailConfig
-
   class << self
     def handle_user_password_reset_requested!(event)
       reset_password_email(
@@ -22,9 +18,9 @@ class PasswordMailer < ActionMailer::Base
 
     private
 
-      def password_reset_link(controller, token)
-        controller.send(:url_for, :action => 'edit', :token => token)
-      end
+    def password_reset_link(controller, token)
+      controller.send(:url_for, :action => 'edit', :token => token)
+    end
   end
   
   def reset_password_email(attributes = {})
@@ -34,7 +30,7 @@ class PasswordMailer < ActionMailer::Base
     mail({
       to: attributes[:user].email,
       from: attributes[:from],
-      subject: I18n.t(:'adva.passwords.notifications.reset_password.subject'),
+      subject: "Forgotten Password",
     })
   end
 
@@ -43,7 +39,8 @@ class PasswordMailer < ActionMailer::Base
     mail({
       to: attributes[:user].email,
       from: attributes[:from],
-      subject: I18n.t(:'adva.passwords.notifications.password_updated.subject'),
+      subject: "Password Updated",
     })
   end
 end
+

data/app/models/section.rb

@@ -1,12 +1,8 @@
-require "has_options"
-require "has_permalink"
+require "adva/has_options"
+require "adva/has_permalink"
 require "awesome_nested_set"
-require "rails_ext/active_record/sti_instantiation"
 
 class Section < ActiveRecord::Base
-  include HasOptions
-  include HasPermalink
-
   default_scope -> { order(:lft) }
 
   class_attribute :types, default: ["Page"]
@@ -16,11 +12,14 @@ class Section < ActiveRecord::Base
 
   serialize :permissions
 
+  include Adva::HasOptions
   has_option :contents_per_page, :default => 15
+
+  include Adva::HasPermalink
   has_permalink :title, :url_attribute => :permalink, :sync_url => true,
     :only_when_blank => true, :scope => [ :site_id, :parent_id ]
+
   acts_as_nested_set :scope => :site_id
-  instantiates_with_sti
 
   belongs_to :site, :touch => true
   has_many :categories, -> { order(:lft) }, dependent: :destroy do

data/app/models/site.rb

@@ -28,8 +28,6 @@ class Site < ActiveRecord::Base
 
   cattr_accessor :multi_sites_enabled, :cache_sweeper_logging
 
-  class_attribute :meta_fields, default: %w(keywords description author copyright geourl)
-
   class << self
     def find_by_host!(host)
       return Site.first if count == 1 && !multi_sites_enabled

data/app/models/user.rb

@@ -7,12 +7,11 @@ class User < ActiveRecord::Base
 
   scope :verified, -> { where.not(verified_at: nil) }
 
-  belongs_to :account
   has_many :memberships, :dependent => :delete_all
   has_many :sites, :through => :memberships
 
   validates_presence_of     :first_name, :email
-  validates_uniqueness_of   :email, case_sensitive: false # i.e. account attributes are unique per application, not per site
+  validates_uniqueness_of   :email, case_sensitive: false
   validates_length_of       :first_name, :within => 1..40
   validates_length_of       :last_name, :allow_nil => true, :within => 0..40
   validates_format_of       :email, :allow_nil => true,

data/app/views/activity_notifier/new_content_notification.html.erb

@@ -1,5 +1,5 @@
-<%=t :'adva.activity.view.new', :name     => @activity.author_name, 
-                                :email    => @activity.author_email, 
-                                :activity => @activity.object.class, 
-                                :site     => @activity.site.name, 
-                                :section  => @activity.section.title %>
+<%= @activity.author_name %>
+<%= @activity.author_email %>
+just posted a new <%= @activity.object.class %>
+on <%= @activity.site.name %>
+in section <%= @activity.section.title %>