refinerycms 0.9.8 → 0.9.8.1

data/vendor/refinerycms/images/config/locales/pt-BR.yml

@@ -1,23 +1,20 @@
 pt-BR:
   plugins:
-    images:
-      title: Imagens
     refinery_images:
       title: Imagens
-  no_file_chosen: Você deve escolher um arquivo para enviar
-  image_should_be_smaller_than_max_image_size: Arquivos devem possuir menos de %{max_image_size} de tamanho
-  image_must_be_these_formats: Sua imagem deve ser uma JPG, PNG ou GIF
+      description: Gerenciar imagens
+  image_specify_for_upload: Você deve escolher uma imagem para enviar
+  image_should_be_smaller_than_max_image_size: "Imagem deve possuir menos de %{max_image_size} de tamanho"
+  image_must_be_these_formats: 'Sua imagem deve ser uma JPG, PNG ou GIF'
   admin:
     images:
-      image:
-        delete:
-          message: Você tem certeza que quer remover '%{title}'?
-          title: Remover esta imagem para sempre
+      delete: Remover esta imagem para sempre
+      edit: Editar esta imagem
       form:
         image: Imagem
         use_current_image: Usar imagem atual
         or: ou
-        replace_image: Substituir por esta...
+        replace_image: " substituir por esta..."
         current_image: Imagem atual
         maximum_image_size: "O tamanho máximo permitido é de %{megabytes} megabytes."
       index:
@@ -27,22 +24,15 @@ pt-BR:
           switch_to: Trocar para visão em %{view_name}
           list: lista
           grid: grade
-        search:
-          results_for: Resultados da busca por %{query}
       grid_view:
-        edit: Editar esta imagem
-        view_live: "Clique para ver a imagem<br/><em>Abre em uma nova janela</em>"
-      list_view_image:
-        edit_this_image: Editar esta imagem
+        view_live: "Ver esta imagem<br/><em>Abre em uma nova janela</em>"
       existing_image:
-        submit_insert: Inserir
-        resize_image: "Redimencionar a imagem? <em>(Recomendado)</em>"
+        button_text: Inserir
+        resize_image: "Redimencionar a imagem?"
         size: Tamanho
       insert:
         existing_image: Do Arquivo
         new_image: Nova Imagem
-        previous: Anterior
-        next: Próxima
-        submit_insert: Inserir
-        or: ou
-        cancel: Cancelar
+  activerecord:
+    models:
+      image: Imagem

data/vendor/refinerycms/images/features/manage_images.feature

@@ -0,0 +1,48 @@
+@images @images-manage
+Feature: Manage Images
+  In order to control the content on my website
+  As an administrator
+  I want to create and manage images
+
+  Background:
+    Given I am a logged in refinery user
+    And I have no images
+
+  @images-create
+  Scenario: Create Valid Image
+    When I go to the list of images
+    And I follow "Create New Image"
+    And I attach the image at "beach.jpeg"
+    And I press "Save"
+    Then the image "beach.jpeg" should have uploaded successfully
+    And I should have 1 image
+    And the image should have size "254718"
+    And the image should have width "500"
+    And the image should have height "375"
+    And the image should have mime_type "image/jpeg"
+
+  Scenario: Create Invalid Image (format)
+    When I go to the list of images
+    And I follow "Create New Image"
+    And I attach the image at "refinery_is_awesome.txt"
+    And I press "Save"
+    Then I should not see "successfully created"
+    And I should have 0 images
+
+  @images-edit
+  Scenario: Edit Existing Image
+    When I upload the image at "beach.jpeg"
+    And I go to the list of images
+    And I follow "Edit this image"
+    And I attach the image at "id-rather-be-here.jpg"
+    And I press "Save"
+    Then I should see "'Id Rather Be Here' was successfully updated."
+    And I should have 1 image
+
+  @images-delete
+  Scenario: Delete Image
+    When I upload the image at "beach.jpeg"
+    When I go to the list of images
+    And I follow "Remove this image forever"
+    Then I should see "'Beach' was successfully destroyed. "
+    And I should have 0 images

data/vendor/refinerycms/images/features/step_definitions/image_steps.rb

@@ -0,0 +1,37 @@
+Given /^I have no images$/ do
+  Image.delete_all
+end
+
+When /^I attach the image at "([^"]*)"$/ do |file_path|
+  attach_file('image[image]', File.join(File.expand_path('../../uploads/', __FILE__), file_path))
+end
+
+Then /^the image "([^"]*)" should have uploaded successfully$/ do |file_name|
+  Image.find_by_image_name(file_name).nil?.should == false
+end
+
+Then /^the image should have size "([^"]*)"$/ do |size|
+  Image.first.size.should == size.to_i
+end
+
+Then /^the image should have width "([^"]*)"$/ do |width|
+  Image.first.width.should == width.to_i
+end
+
+Then /^the image should have height "([^"]*)"$/ do |height|
+  Image.first.height.should == height.to_i
+end
+
+Then /^the image should have mime_type "([^"]*)"$/ do |mime_type|
+  Image.first.mime_type.should == mime_type.to_s
+end
+
+Then /^I should have ([0-9]+) images?$/ do |number|
+  Image.count.should == number.to_i
+end
+
+When /^I upload the image at "([^"]*)"$/ do |file_path|
+  visit new_admin_image_path
+  attach_file('image[image]', File.join(File.expand_path('../../uploads/', __FILE__), file_path))
+  click_button 'Save'
+end

data/vendor/refinerycms/images/features/support/paths.rb

@@ -0,0 +1,17 @@
+module NavigationHelpers
+  module Refinery
+    module Images
+      def path_to(page_name)
+        case page_name
+        when /the list of images/
+          admin_images_path
+
+         when /the new image form/
+          new_admin_image_path
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/vendor/refinerycms/images/features/uploads/refinery_is_awesome.txt

@@ -0,0 +1 @@
+http://www.refineryhq.com/

data/vendor/refinerycms/images/lib/images.rb

@@ -22,6 +22,12 @@ module Refinery
         app_images.analyser.register(Dragonfly::Analysis::RMagickAnalyser)
         app_images.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
 
+        # This little eval makes it so that dragonfly urls work in traditional
+        # situations where the filename and extension are required, e.g. lightbox.
+        # What this does is takes the url that is about to be produced e.g.
+        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
+        # and adds the filename onto the end (say the image was 'refinery_is_awesome.jpg')
+        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
         app_images.instance_eval %{
           def url_for(job, *args)
             image_url = nil

data/vendor/refinerycms/images/readme.md

@@ -4,51 +4,27 @@
 
 ## About
 
-All Refinery's images are stored in one place, the images plugin. You can customise what sized thumbnails are generated when an image is uploaded.
+All Refinery's images are stored in one place, the images plugin.
 
-Images and other file uploads are handled using [attachment_fu](http://github.com/technoweenie/attachment_fu)
-
-## Generating Thumbnails
-
-Refinery lets you generate a range of thumbnails when an image is uploaded so you can output this on a page in an appropriate size.
-
-To specify the sizes of your thumbnails edit the "Image Thumbnails" setting.
-
-This setting is stored as a serialized hash and is directly passed to [attachment_fu](http://github.com/technoweenie/attachment_fu)
-
-Here's what the default looks like
-
-    ---
-    :dialog_thumb: c106x106
-    :preview: c96x96
-    :medium: 225x255>
-    :large: 450x450>
-    :small: 110x110>
-    :grid: c135x135
-
-Refinery requires some of these, so you won't want to delete any, but add new ones to meet your design needs. Each thumbnail is not just a size guide but a [RMagick geometry string](http://www.imagemagick.org/RMagick/doc/imusage.html#geometry) that allows you to define min and max size too.
-
-Refinery also extends the [geometry string](http://www.imagemagick.org/RMagick/doc/imusage.html#geometry) support to allow cropping. Here's some examples
-
-    :grid: c135x135
-
-This will crop (_that's what the "c" stands for_) the grid thumbnail down to ``135x135`` exactly, without stretching the image.
-
-_Note: you will have to restart your web server after changing this setting for the changes to take effect._
+Images and other file uploads are handled using [Dragonfly](http://github.com/markevans/dragonfly)
 
 ## Using a Thumbnail Size in Your View
 
-Take the default thumbnails above to use the ``:large`` thumbnail I would collect that image out of the database and apply it like this in my view:
+Say I want to have a thumbnail of size 400x300 I would collect that image out of the database and apply it like this in my view:
 
-    <%= image_fu @image, :large %>
+    <%= image_fu @image, '400x300' %>
 
-``image_fu`` is a command we have created that automatically adds width and height attributes to the generated image so that web browsers render your pages more smoothly as they know in advance how big an image is going to be before it is fully downloaded.
+``image_fu`` is a command we have created that automatically adds width and height attributes to the
+generated image so that web browsers render your pages more smoothly as they know in advance how big
+an image is going to be before it is fully downloaded.
 
-If I wanted to replace all the images inside a content section without the user having to resize images in the editor then I would use the built in ``content_fu`` command like this in my view:
+If I wanted to replace all the images inside a content section without the user having to resize images
+in the editor then I would use the built in ``content_fu`` command like this in my view:
 
-    <%= content_fu @page[:body], :large %>
+    <%= content_fu @page[:body], '400x300' %>
 
-``content_fu`` is a command we have created that automatically changes all images with the url /system/images to use a particular thumbnail size. This makes it easy to protect your pages from having gigantic images inserted into them that blow out the design.
+``content_fu`` is a command we have created that automatically changes all images with the url /system/images to use a particular size.
+This makes it easy to protect your pages from having gigantic images inserted into them that blow out the design.
 
 ## Related Settings
 

data/vendor/refinerycms/pages/app/controllers/admin/pages_controller.rb

@@ -1,16 +1,15 @@
 class Admin::PagesController < Admin::BaseController
 
   crudify :page,
-          :conditions => "parent_id IS NULL",
-          :order => "position ASC",
+          :conditions => "pages.parent_id IS NULL",
+          :order => "lft ASC",
           :include => [:parts, :slugs, :children, :parent],
           :paging => false
 
-  before_filter :find_pages_for_parents_list, :only => [:new, :create, :edit, :update]
-  after_filter :expire_caching, :only => [:create, :update, :destroy, :update_positions]
-
   rescue_from FriendlyId::ReservedError, :with => :show_errors_for_reserved_slug
 
+  cache_sweeper :page_sweeper, :only => [:create, :update, :destroy, :update_positions]
+
   def new
     @page = Page.new
     Page.default_parts.each_with_index do |page_part, index|
@@ -19,43 +18,6 @@ class Admin::PagesController < Admin::BaseController
   end
 
 protected
-  def expire_caching
-    expire_menu_fragment_caching
-    expire_action_caching
-  end
-
-  def expire_menu_fragment_caching
-    Rails.cache.delete("#{Refinery.base_cache_key}_menu_pages")
-    expire_fragment %r{#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}}
-  end
-
-  def expire_action_caching
-    expire_fragment %r{.*/pages/.*}
-  end
-
-  # This finds all of the pages that could possibly be assigned as the current page's parent.
-  def find_pages_for_parents_list
-    @pages_for_parents_list = []
-    Page.find_all_by_parent_id(nil, :order => "position ASC").each do |page|
-      @pages_for_parents_list << page
-      @pages_for_parents_list += add_pages_branch_to_parents_list(page)
-    end
-    @pages_for_parents_list.flatten.compact!
-
-    # We need to remove all references to the current page or any of its decendants or we get a nightmare.
-    @pages_for_parents_list.reject! do |page|
-      page.id == @page.id or @page.descendants.include?(page)
-    end unless @page.nil? or @page.new_record?
-  end
-
-  def add_pages_branch_to_parents_list(page)
-    list = []
-    page.children.each do |child|
-      list << child
-      list += add_pages_branch_to_parents_list(child) if child.children.any?
-    end
-    list
-  end
 
   def show_errors_for_reserved_slug(exception)
     flash[:error] = "Sorry, but that title is a reserved system word."

data/vendor/refinerycms/pages/app/controllers/pages_controller.rb

@@ -1,7 +1,7 @@
 class PagesController < ApplicationController
 
   caches_action :home, :show,
-                :cache_path => Proc.new { |c| "#{c.request.host_with_port}/views/pages/#{c.params[:path]}" },
+                :cache_path => Proc.new { |c| "#{Refinery.base_cache_key}/#{c.request.host_with_port}/views/pages/#{c.params[:path]}" },
                 :if => Proc.new { |c|
                   c.send(:logged_in?) == false and
                   (!RefinerySetting.table_exists? ||

data/vendor/refinerycms/pages/app/models/page.rb

@@ -1,8 +1,7 @@
 class Page < ActiveRecord::Base
   validates :title, :presence => true
 
-  acts_as_tree :order => "position ASC",
-               :include => [:children, :slugs]
+  acts_as_nested_set
 
   # Docs for friendly_id http://github.com/norman/friendly_id
   has_friendly_id :title, :use_slug => true,
@@ -190,8 +189,8 @@ class Page < ActiveRecord::Base
     end
 
     # Returns all the top level pages, usually to render the top level navigation.
-    def top_level(include_children = false)
-      where(:show_in_menu => true, :draft => false).order('position ASC').includes(:slugs, :children, :parent, :parts)
+    def top_level
+      self.roots.where(:show_in_menu => true, :draft => false)
     end
   end
 

data/vendor/refinerycms/pages/app/sweepers/page_sweeper.rb

@@ -0,0 +1,18 @@
+class PageSweeper < ActionController::Caching::Sweeper
+  observe Page
+
+  def after_save(page)
+    expire_caching(page)
+  end
+
+  def after_destroy(page)
+    expire_caching(page)
+  end
+
+protected
+  def expire_caching(page)
+    expire_fragment %r{.*#{Refinery.base_cache_key}_?#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}.*}
+    expire_fragment %r{.*/pages/.*}
+  end
+
+end

data/vendor/refinerycms/pages/app/views/admin/pages/_form_advanced_options.html.erb

@@ -17,7 +17,7 @@
         <%= f.label :parent_id, t('.parent_page') %>
         <%= refinery_help_tag t('.parent_page_help') %>
       </span>
-      <%= f.collection_select :parent_id, @pages_for_parents_list, :id, :indented_title, {:include_blank => true}, :class => 'widest' %>
+      <%= f.select :parent_id, nested_set_options(Page, @page) {|i| "#{'-' * i.level} #{i.title}" }, :include_blank => true %>
     </div>
     <div class='field'>
       <span class='label_with_help'>

data/vendor/refinerycms/pages/app/views/admin/pages/_page.html.erb

@@ -1,14 +1,15 @@
 <%
-  branch = if (!page.parent_id.nil? and page === page.self_and_siblings.last) or (page != @pages.first and page === @pages.last)
-    "branch_end"
-  elsif page === @pages.first
+  branch = if page.parent_id.nil? and page.right_sibling.present? and page.left_sibling.nil?
     "branch_start"
+  elsif page.right_sibling.nil?
+    "branch_end"
   end
+
   title = page.title
   title << " <em>(#{t('.hidden')})</em>" unless page.show_in_menu?
   title << " <em>(#{t('.draft')})</em>" if page.draft?
 -%>
-<li class='clearfix record<%= " #{branch}" %>' id="<%= dom_id(page) -%>">
+<li class='clearfix record<%= " #{branch}" if branch.present? %>' id="<%= dom_id(page) -%>">
   <div class='clearfix'>
     <span class='title'><%= title.html_safe %></span>
 
@@ -21,7 +22,7 @@
       <%= link_to refinery_icon_tag('delete.png'), admin_page_url(page),
                   :class => "cancel confirm-delete",
                   :title => t('admin.pages.delete'),
-                  :'data-confirm' => t('shared.admin.delete.message', :title => page.title.gsub(/<\/?em>/, "")),
+                  :'data-confirm' => t('shared.admin.delete.message', :title => title.gsub(/\ ?<em>.*<\/em>/, "")),
                   :'data-method' => "delete" if page.deletable? %>
     </span>
   </div>

data/vendor/refinerycms/pages/config/locales/de.yml

@@ -2,52 +2,82 @@ de:
   plugins:
     refinery_pages:
       title: Seiten
+      description: Verwaltet Inhaltsseiten
   admin:
+    pages_dialogs:
+      page_link:
+        link_to_this_page: Link zu dieser Seite
+      link_to:
+        insert: Einfügen
+        your_page:
+          tab_name: Ihre Seite
+        web_address:
+          tab_name: Webseite
+          location: Zieladresse
+          new_window: Neues Fenster
+          new_window_label: Link in einem neuen Fenster öffnen
+          not_sure: Nicht sicher, was in das Feld oben rein soll?
+          step1: Finden Sie die Seite im Web, die Sie verlinken möchten.
+          step2: Kopieren Sie die Adresse aus der Adressleiste ihres Browsers und fügen Sie diese in das Feld oben ein.
+        email_address:
+          tab_name: E-Mail-Adresse
+          subject_line_optional: Optionaler Betreff
+          body_optional: Optionaler Inhaltstext
+          not_sure: Nicht sicher, was in Felder oben rein soll?
+          step1: Schreiben oder kopieren Sie die E-Mail-Adresse (z.B. aus Ihrem Adressbuch) die verlinkt werden soll in das Feld "E-Mail-Adresse".
+          step2: Verwenden Sie das Feld '<strong>Optionaler Betreff</strong>', wenn der Betreff schon <strong>vorher mit einer Zeile verfasst</strong> werden soll.
+          step3: Verwenden Sie das Feld '<strong>Optionaler Inhaltstext</strong>', wenn die E-Mail bereits <strong>mit einem Text verfasst</strong> werden soll.
+        your_resource:
+          tab_name: Ihre Datei
+          link_to_this_resource: Link zu dieser Datei
     pages:
-      form_advanced_options:
+      delete: Diese Seite für immer löschen
+      edit: Diese Seite bearbeiten
+      page:
+        view_live: Diese Seite live betrachten <br/><em>(öffnet sich in einem neuen Fenster)</em>
+        hidden: Versteckt
+        draft: Entwurf
+      form_new_page_parts:
         title: Titel
-        create_content_section: Inhaltsbereich erstellen
-        delete_content_section: Inhaltsbereich löschen
+      form_page_parts:
+        create_content_section: Inhaltsabschnitt anlegen
+        delete_content_section: Inhaltsabschnitt löschen
+      form_advanced_options:
+        toggle_advanced_options: Klicken Sie hier, um die erweiterten Optionen anzuzeigen
+        page_options: Seitenoptionen
+        parent_page: Übergeordnete Seite
         advanced_options: Erweiterte Optionen
-        explain_page_different_title: "Geben Sie hier einen Seitentitel ein, wenn Sie nicht möchten, dass der Menü- und Browsertitel als Seitentitel verwendet wird."
-        redirect_to_first_child: "Checken Sie diese Box, wenn der Besucher zur ersten Unterseite dieser Seite weitergeleitet werden soll, wenn diese SEite aufgerufen wird."
-        parent_id_title: Übergeordnet
-        custom_title: Eigener Titel
-        title_type: "Typ:"
+        custom_title: Angepasster Titel
         title_types:
-          none: Keiner
+          none: Keinen
           text: Text
-          image: Bild
-        custom_url: Eigene URL
-        custom_url_explanation: "Geben Sie eine URL ein, wenn diese Seite zu einer externen Seite oder einer bereits existierenden Ressource (z.B. eine Kontaktseite) verlinken soll.<br />Hinweis: Diese URL muss zu einem bereits existierenden Ort verlinken, eine neue Seite wird nicht angelegt."
-        draft: Entwurf
         show_in_menu_title: Im Menü anzeigen
-        show_in_menu_description: "Checken Sie diese Box, wenn diese Seite im Seitenmenü angezeigt werden soll."
-        draft: Entwurf
+        show_in_menu_description: Zeigt diese Seite im Seitenmenü an
+        show_in_menu_help: Entfernen Sie diesen Haken, wenn die Seite nicht im Menü erscheinen soll. Dies kann praktisch sein, wenn Sie eine Seite direkt verlinken möchten aber nicht im Menü anzeigen lassen wollen.
         save_as_draft: Als Entwurf speichern
-        save: Speichern
-        cancel: Abbrechen
+        skip_to_first_child: Überspringen der obersten Ebene
+        skip_to_first_child_label: Auf erste untergeordnete Seite weiterleiten
+        skip_to_first_child_help: Diese Option verlinkt die Seite zu der ersten untergeordneten Seite. Dies kann nützlich sein, wenn Seiten gruppiert werden.
+        link_url: Diese Seite auf eine andere Seite weiterleiten
+        link_url_help: Wenn diese Seite zu einer anderen Seite weitergeleitet werden soll, geben Sie hier eine Adresse an, sonst lassen Sie dieses Feld leer.
+        parent_page_help: Sie können eine Seite einer anderen unterordnen, indem Sie diese aus der Liste wählen. Soll die Seite auf die oberste Ebene, lassen Sie dieses Feld leer.
+        custom_title_help: Wenn die Seite einen anderen Titel haben soll als der im Menü angezeigte, wählen Sie "Text" und geben Sie ihn hier ein.
       form_advanced_options_seo:
-        seo: Suchmaschinen-Optimierung
-        seo_override_title: Browser Titel
-        seo_override_title_help: Hier können Sie den Standard-Browser-Titel überschreiben.
-        meta_keywords_title: Meta keywords
-        meta_description_help: Geben Sie 5-10 Schlüsselbegriffe mit Bezug zu dieser Seite ein. Trennen Sie Schlüsselbegriffe mit Kommas.
-        meta_description_title: Meta description
-        meta_description_help: Geben Sie zwei bis drei kurze Sätze über den Inhalt dieser Seite ein.
-        js:
-          content_section:
-            create: Inhaltsbereich erstellen.
-            already_exists: Ein Inhaltsbereich mit diesem Titel existiert bereits. Bitte wählen Sie einen anderen Titel.
-            title_empty: Sie haben keinen Titel für den Inhaltsbereich eingegeben. Bitte geben Sie einen Titel ein.
-            confirm_delete: "Der Inhaltsbereich %{section_name} und alle darin enthaltenen Inhalte werden gelöscht, wenn diese Seite gespeichert wird. Sind Sie sicher?"
+        seo: Suchmaschinenoptimierung
+        seo_override_title: Browsertitel
+        seo_override_title_help: Geben Sie einen 5-10 Wörter langen Titel an, den der Inhalt der Seite beschreibt.
+        meta_keywords_title: Meta-Schlüsselwörter
+        meta_keywords_help: Geben Sie 5-10 Schlüsselwörter für diese Seite an. Trennen Sie Schlüsselwörter mit einem Komma.
+        meta_description_title: Meta-Beschreibung
+        meta_description_help: Beschreiben Sie in knappen zwei oder drei Sätzen, um was es sich bei dieser Seite handelt.
       index:
-        create_new_page: Neue Seite erstellen
-        reorder_pages: Seiten neu anordnen
-        reorder_pages_done: Seitenanordnung speichern
-        sorry_no_results: Entschuldigung! Es wurden keine Suchergebnisse gefunden.
-        no_pages_yet: Es wurden noch keine Seiten erstellt. Klicken Sie auf "Neue Seite erstellen" um Ihre erste Seite zu erstellen..
+        create_new_page: Neue Seite anlegen
+        reorder_pages: Seiten umsortieren
+        reorder_pages_done: Umsortieren erledigt
+        no_pages_yet: Es sind noch keine Seiten vorhanden. Klicken Sie auf "Neue Seite anlegen", um Ihre erste Seite zu erzeugen.
   activerecord:
+    models:
+      page: Seite
     attributes:
       page:
-        skip_to_first_child: "Direkt zum ersten Kindes?"
+        title: Titel