georgia 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6ad208668a7070cb8265fbac2fd21e2216df43
-  data.tar.gz: e003d41f4e19d141fcfcb5629335744a5b9eb205
+  metadata.gz: e2c023563b6dd7111d22f5caf701b495c27bbeaf
+  data.tar.gz: 2bebca43c34b00820ce9ec89ddcb25bc088c9aff
 SHA512:
-  metadata.gz: 4c54848250467dc0896fe3be6077a8082e586c4f69bd262f40891d3eb08a811674fff7bb879407895f4baddb0999ae9e63215c0b99977429ca574030b6d03ab3
-  data.tar.gz: 15734547e9bfa5631ef996570349ce563b2fe70c36ff6ad31fc1770403c614a0b7cb7532649905e977ca52809a5659c13d11d686194b52c32c846554f1f95234
+  metadata.gz: 14d7799b3912e204652a67a1f53b9c75ad63c3d8303927d0a0d272ba8abd858d2c82649beb6e3ac44023a07bc71ef8077bce9a7ac320fea651c637191d10e8c8
+  data.tar.gz: 64a18a2521039fb0ee834dc89781f8d104a92833c0322f7baeb96b0d7d3e7011478f7613edd4911fc3fecfd8eef8ce440e379b9440d1c046127be4d25a39d9c9

data/app/assets/javascripts/georgia/components/portlets/slide.js.coffee

@@ -18,6 +18,8 @@ class @SlidePortlet
     event.preventDefault()
     $.ajax(
       url: "/admin/slides/new"
+      data:
+        locale: $('[data-locale]').data('locale')
     ).done( (data) => @slideList.append(data) )
 
   removeSlide: (event) =>

data/app/controllers/georgia/api/media_controller.rb

@@ -3,13 +3,8 @@ module Georgia
     class MediaController < Georgia::ApplicationController
 
       def pictures
-        @search = Ckeditor::Picture.search do
-          fulltext params[:query] do
-            fields(:filename, :tags)
-          end
-          paginate(page: params[:page], per_page: (params[:per] || 12))
-        end
-        @pictures = @search.results
+        @pictures = Georgia::Indexer.search(Ckeditor::Picture, params.merge(per: 12))
+        @pictures = Ckeditor::PictureDecorator.decorate_collection(@pictures)
         render layout: false
       end
 

data/app/controllers/georgia/api/tags_controller.rb

@@ -6,14 +6,10 @@ module Georgia
       respond_to :json
 
       def search
-        @search = ActsAsTaggableOn::Tag.search do
-          fulltext params[:q] do
-            fields(:name)
-          end
-          paginate(page: 1, per_page: 10)
-        end
+        @tags = Georgia::Indexer.search(ActsAsTaggableOn::Tag, params)
+
         # Format for select2
-        @tags = @search.results.map{|t| {id: t.id, text: t.name}}
+        @tags = @tags.map{|t| {id: t.id, text: t.name}}
 
         respond_with(results: @tags)
       end

data/app/controllers/georgia/application_controller.rb

@@ -11,7 +11,7 @@ module Georgia
     end
 
     def current_locale
-      I18n.locale
+      @current_locale ||= params.fetch(:locale, I18n.locale.to_s)
     end
     helper_method :current_locale
 

data/app/controllers/georgia/concerns/frontendable.rb

@@ -13,21 +13,29 @@ module Georgia
         # Loads the page according to request url
         # Restore the latest published revision of the given page
         def show
-          @page = Georgia::Page.where(url: "/#{params[:request_path]}").includes(current_revision: :contents).published.first || not_found
-          @page = Georgia::PageDecorator.decorate(@page)
+          if preview?
+            prepare_preview
+          else
+            @page = Georgia::Page.from_url(params[:request_path]).published.first || not_found
+            @page = Georgia::PageDecorator.decorate(@page)
+          end
+        end
+
+        protected
+
+        def preview?
+          params[:r].present?
         end
 
         # Loads the page according to given id
         # Temporarily set the given revision to preview as the 'current_revision'
-        def preview
-          @page = Georgia::Page.find(params[:id]).decorate
-          @page.current_revision = Georgia::Revision.find(params[:revision_id])
+        def prepare_preview
+          @page = Georgia::Page.from_url(params[:request_path]).first || not_found
+          @page = Georgia::PageDecorator.decorate(@page)
+          @page.current_revision = Georgia::Revision.find(params[:r])
           authorize! :preview, @page
-          render :show
         end
 
-        protected
-
         # Triggers a 404 page not found
         # Use when provided url doesn't match any the Georgia::Pages
         def not_found

data/app/controllers/georgia/media_controller.rb

@@ -11,7 +11,7 @@ module Georgia
 
     def search
       @asset = Ckeditor::Asset.new
-      @results = Georgia::Indexer.adapter.search(Ckeditor::Asset, params)
+      @results = Georgia::Indexer.search(Ckeditor::Asset, params)
       @assets = Ckeditor::AssetDecorator.decorate_collection(@results)
     end
 

data/app/controllers/georgia/revisions_controller.rb

@@ -38,7 +38,7 @@ module Georgia
     # Sends revision to main_app router
     # FIXME: bypass this once Georgia will be loaded on root
     def preview
-      redirect_to main_app.preview_page_path(id: @page.id, revision_id: @revision.id)
+      redirect_to preview_url
     end
 
     def review
@@ -81,11 +81,16 @@ module Georgia
       else
         @content = @revision.content
       end
+      @content = Georgia::ContentDecorator.decorate(@content)
     end
 
     def notify(message, url)
       Notifier.notify_admins(message, url).deliver
     end
 
+    def preview_url
+      "#{@page.decorate.url}?r=#{@revision.id}"
+    end
+
   end
 end

data/app/controllers/georgia/slides_controller.rb

@@ -4,7 +4,7 @@ module Georgia
     # Renders new portlet for revisions#edit
     def new
       @slide = Slide.new()
-      @slide.contents.build(locale: current_locale)
+      @content = @slide.contents.build(locale: current_locale)
       render layout: false
     end
 

data/app/decorators/georgia/content_decorator.rb

@@ -0,0 +1,9 @@
+module Georgia
+  class ContentDecorator < Georgia::ApplicationDecorator
+
+    def title_or_none
+      title.present? ? title : h.content_tag(:span, 'No title', class: 'muted')
+    end
+
+  end
+end

data/app/helpers/georgia/internationalization_helper.rb

@@ -13,6 +13,19 @@ module Georgia
       end
     end
 
+    def link_to_available_locales
+      return unless I18n.available_locales.any?
+      links = I18n.available_locales.map do |locale|
+        content_tag(:li, link_to(t("georgia.#{locale}"), 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
+
     protected
 
     def link_to_locale_list html_options

data/app/helpers/georgia/pages_helper.rb

@@ -18,5 +18,13 @@ module Georgia
       Georgia::WarningMessage.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
+
   end
 end

data/app/helpers/georgia/ui_helper.rb

@@ -22,14 +22,6 @@ module Georgia
       content_tag :div, icon_tag('spinner fa-spin fa-4x'), 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_back url=:back
       link_to icon_tag('level-up fa-rotate-270'), url, class: 'btn btn-back'
     end

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

@@ -10,11 +10,11 @@ module Georgia
         accepts_nested_attributes_for :contents
         attr_accessible :contents_attributes
 
-        scope :with_locale, lambda {|locale| joins(:contents).where(georgia_contents: {locale: locale})}
+        scope :with_locale, lambda {|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
+          @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

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

@@ -14,6 +14,8 @@ module Georgia
         before_validation :sanitize_slug
         after_save :update_url
 
+        scope :from_url, -> (path) { where(url: "/#{path}").includes(current_revision: :contents) }
+
         # Must stay public for #update_url on descendants
         def set_url
           self.update_column(:url, '/' + self.ancestry_url)

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'})
-    scope :submenu, joins(:ui_sections).where(georgia_ui_sections: {name: 'Submenu'})
-    scope :sidebar, joins(:ui_sections).where(georgia_ui_sections: {name: 'Sidebar'})
+    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/presenters/georgia/page_actions_presenter.rb

@@ -23,10 +23,8 @@ module Georgia
       # html << content_tag(:li, link_to_settings) if can?(:settings, page)
       html << content_tag(:li, link_to_preview) if can?(:preview, page)
       html << content_tag(:li, link_to_copy) if can?(:copy, page)
-      if page.current_revision and page.current_revision.published?
-        html << content_tag(:li, link_to_publish) if can?(:publish, page) and !page.published?
-        html << content_tag(:li, link_to_unpublish) if can?(:unpublish, page) and page.published?
-      end
+      html << content_tag(:li, link_to_publish) if can?(:publish, page) and !page.published?
+      html << content_tag(:li, link_to_unpublish) if can?(:unpublish, page) and page.published?
       html << content_tag(:li, link_to_flush_cache) if can?(:flush_cache, page)
       html << content_tag(:li, link_to_revisions) if can?(:index, Revision)
       html

data/app/views/georgia/ckeditor/pictures/_picture.html.erb

@@ -21,6 +21,6 @@
     <span class="badge" title="Featured in <%= pluralize(picture.pages.length, 'page') %>"><%= picture.pages.length %></span>
   </td>
   <td class='timestamp'>
-    <em><%= picture.updated_at.strftime('%F') %></em>
+    <em><%= picture.pretty_updated_at %></em>
   </td>
 </tr>

data/app/views/georgia/revisions/edit.html.erb

@@ -1,13 +1,13 @@
 <%= simple_form_for @revision, as: :revision, url: [@page.becomes(Georgia::Page), @revision], html: {class: 'form-with-helpers js-spin-and-roll js-revision-form'}, defaults: { input_html: { class: "form-control" } } do |f| %>
   <%= f.simple_fields_for :contents, @content do |c| %>
-    <%= c.hidden_field :locale %>
+    <%= c.hidden_field :locale, data: {locale: current_locale} %>
     <header class='header-main'>
       <div class="header-gutter">
         <%= link_to_back search_pages_path %>
       </div>
       <div class="header-title">
         <h1>
-          <%= link_to (@content.title || content_tag(:span, 'No title', class: 'muted')), '#', class: 'title-truncated' %>
+          <%= link_to @content.title_or_none, '#', class: 'title-truncated' %>
           <%= icon_tag 'pencil' %>
         </h1>
         <%= c.input_field :title, class: 'input-lg form-control', placeholder: 'Title' %>

data/app/views/georgia/revisions/fields/_content.html.erb

@@ -1,20 +1,7 @@
 <fieldset>
   <div class="fieldset-help">
     <legend>Content</legend>
-    <% if I18n.available_locales.any? %>
-      <p class="hint">
-        <div class='dropdown'>
-          <%= link_to '#', class: 'btn btn-warning', data: {toggle: 'dropdown'}, role: :button do %>
-            Change language <span class="caret"></span>
-          <% end -%>
-          <ul class="dropdown-menu" role="menu">
-            <% I18n.available_locales.each do |locale| %>
-              <li><%= link_to t("georgia.#{locale}"), edit_page_revision_path(@page, @revision, locale: locale) %></li>
-            <% end -%>
-          </ul>
-        </div>
-      </p>
-    <% end -%>
+    <%= link_to_available_locales %>
   </div>
   <div class="fieldset-fields">
     <%= warning_message(@page, @revision) %>

data/app/views/georgia/slides/new.html.erb

@@ -1 +1 @@
-<%= slide_portlet_tag(@slide, content: @slide.content(params[:locale])) %>
+<%= slide_portlet_tag(@slide, content: @content) %>

data/app/views/georgia/widgets/_widget.html.erb

@@ -1,8 +1,8 @@
 <div class="col-md-3 js-widget">
   <div class="widget">
     <div class="widget-show">
-      <div class="widget-header"><h4 class='widget-title--ellipsed'><%= widget.title %></h4></div>
-      <div class="widget-content"><%= widget.text %></div>
+      <div class="widget-header"><h4 class='widget-title--ellipsed'><%= widget.content(current_locale).title %></h4></div>
+      <div class="widget-content"><%= widget.content(current_locale).text %></div>
       <div class="widget-footer">
         <% if widget.featured? %>
           <div class="widget-featured">
@@ -15,7 +15,8 @@
     </div>
     <div class="widget-form hide">
       <%= simple_form_for widget, remote: true, html: {class: 'js-spin-and-roll'} do |f| %>
-        <%= f.simple_fields_for :contents, widget.content do |c| %>
+        <%= f.simple_fields_for :contents, widget.content(current_locale) do |c| %>
+          <%= c.input :locale, as: :hidden %>
           <div class="widget-header">
             <div class="widget-title">
               <%= c.input_field :title, class: 'form-control' %>

data/app/views/georgia/widgets/index.html.erb

@@ -13,6 +13,8 @@
 
 <section class="body-main">
 
+  <%= link_to_available_locales %>
+
   <% if @widgets and @widgets.any? %>
     <% @widgets.each do |widget_row| %>
       <div class="row">

data/lib/georgia.rb

@@ -1,7 +1,6 @@
 require "georgia/version"
 require "georgia/paths"
 require "georgia/engine"
-require "georgia/assets"
 require "georgia/indexer"
 
 module Georgia

data/lib/georgia/engine.rb

@@ -35,6 +35,8 @@ module Georgia
         helper Georgia::MetaTagsHelper
         helper Georgia::InternationalizationHelper
         helper Georgia::MenusHelper
+        helper Georgia::UiHelper
+        helper Georgia::PagesHelper
       end
     end
 

data/lib/georgia/indexer.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'georgia/indexer/adapter'
 
 module Georgia
   module Indexer
@@ -14,50 +15,19 @@ module Georgia
       adapter.search model, params
     end
 
+    def self.register_extension indexer, klass
+      return unless indexer == Georgia.indexer
+      Adapter.load_extension(klass)
+    end
+
     private
 
     def self.adapter_lookup
       @adapter_lookup ||= (case Georgia.indexer
         when :solr then SolrAdapter
         when :tire then TireAdapter
-        else
-          TireAdapter
         end)
     end
 
-    module Adapter
-
-      class << self
-        def included(klass)
-          extension = Extension.new(klass)
-          begin
-            require extension.path
-            klass.send(:include, extension.name)
-          rescue => ex
-            raise "No extension for the #{Georgia.indexer} indexer: #{ex.message}"
-          end
-        end
-
-        class Extension
-          def initialize klass
-            @klass = klass
-          end
-
-          def name
-            name = @klass.to_s.gsub('::', '') + 'Extension'
-            "#{Georgia::Indexer.adapter}::#{name}".constantize
-          end
-
-          def path
-            "georgia/indexer/extensions/#{Georgia.indexer}_adapter/#{filename}"
-          end
-
-          def filename
-            @klass.to_s.underscore
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/georgia/indexer/adapter.rb

@@ -0,0 +1,44 @@
+module Georgia
+  module Indexer
+    module Adapter
+
+      class << self
+
+        def included(klass)
+          load_extension(klass)
+        end
+
+        def load_extension(klass)
+          extension = Extension.new(klass)
+          begin
+            require extension.path
+            klass.send(:include, extension.name)
+          rescue => ex
+            raise "No extension for the #{Georgia.indexer} indexer: #{ex.message}"
+          end
+        end
+
+        class Extension
+
+          def initialize klass
+            @klass = klass
+          end
+
+          def name
+            name = @klass.to_s.gsub('::', '') + 'Extension'
+            "#{Georgia::Indexer.adapter}::#{name}".constantize
+          end
+
+          def path
+            "georgia/indexer/extensions/#{Georgia.indexer}_adapter/#{filename}"
+          end
+
+          def filename
+            @klass.to_s.underscore
+          end
+
+        end
+      end
+    end
+  end
+end