refinerycms 0.9.8.9 → 0.9.9

data/changelog.md

@@ -1,4 +1,50 @@
+## 0.9.9 [Unreleased]
+
+* Better, more semantic HTML5. [Joe Sak](https://github.com/joemsak)
+* Added ``role`` selection for ``admin/users#edit``. [Hez Ronningen](https://github.com/hez)
+* Fixed WYMeditor bug regarding adding links, helped with persistent testing by [Marko Hriberšek](https://github.com/markoh). [Philip Arndt](https://github.com/parndt)
+* Better ``RSpec`` coverage [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols) and [PeRo ICT Solutions](https://github.com/pero-ict)
+* Superusers now get access to all backend tabs by default. [Philip Arndt](https://github.com/parndt)
+* Introduced LOLcat translation (yes, seriously) as an easter egg. [Steven Heidel](https://github.com/stevenheidel)
+* Fixed several missing translations. [Johan Bruning](https://github.com/GidoGeek)
+* Solved several i18n inconsistencies. [Jonas Hartmann](https://github.com/ionas)
+* Made ``UserPlugin`` dependent on ``User`` which solves a data redundancy proble.m [Maarten Hoogendoorn](https://github.com/moretea)
+* Fixed issue with finding where engines are located on the disk using ``Plugin::pathname``. [Lele](https://github.com/leleintercom)
+* Add ``rescue_not_found`` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
+* Full review of the French translations. [Jérémie Horhant](https://github.com/Titinux)
+* Now using ``mail()`` to send emails. [J. Edward Dewyea](https://github.com/commuter)
+* Refactored backend HTML & CSS, reduced complexity and added a loading animation when you click Save on forms. [Philip Arndt](https://github.com/parndt)
+* Improved the speed of the menu especially related to scaling through reusing collections rather then revisiting the database. [Amanda Wagener](https://github.com/awagener)
+* Implemented an API for the ``pages`` form's tabs. [David Jones](https://github.com/djones)
+* Use the rails naming convention for translations that contain html markup. Escaping translations not marked as ``html_safe`` in the ``refinery_help_tag`` helper. [Jérémie Horhant](https://github.com/Titinux)
+* Full review of the Italian translations. [Mirco Veltri](https://github.com/indaco)
+* Deprecated ``/admin`` in favour of ``/refinery`` and put in a message to display to the user when they use it. [Philip Arndt](https://github.com/parndt)
+* Full review of the Russian translations as well as work with articles / genders in grammar. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
+* Full review of routes and the Latvian translations. [Uģis Ozols](https://github.com/ugisozols)
+* Implemented better support for ``rails.js``, using standard ``:method`` and ``:confirm`` ``link_to`` options. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
+* Locked jQuery to 1.4.2 and jQuery UI to 1.8.5, fixed errors with dialogues and tested. [Philip Arndt](https://github.com/parndt) and [Phillip Miller](https://github.com/philmill) and [Sam Beam](https://github.com/sbeam)
+* Added multiple file upload for images and resources using HTML5. [Philip Arndt](https://github.com/parndt)
+* Deprecated ``content_for :head`` in favour of ``content_for :meta``, ``content_for :stylesheets`` and ``content_for :javascripts``. [Philip Arndt](https://github.com/parndt)
+* Improved client-side responsiveness of backend and frontend. [Philip Arndt](https://github.com/parndt)
+* No more RMagick dependency [Philip Arndt](https://github.com/parndt)
+* Added ``rake refinery:override stylesheet=somefile`` and ``rake refinery:override javascript=somefile`` commands to override stylesheets and javascripts. [Oliver Ponder](https://github.com/oponder)
+* Restructed the project to remove ``vendor/refinerycms`` and put all engines in the application root. [Kamil K. Lemański](https://github.com/kml)
+* Force no resource caching on non-writable file systems (like Heroku). [Philip Arndt](https://github.com/parndt)
+* Refinery can now attach itself to a Rails application simply by including the refinerycms gem in the ``Gemfile``. [Philip Arndt](https://github.com/parndt)
+* Added core support for ``globalize3`` so that pages can be translated into multiple languages. [Philip Arndt](https://github.com/parndt) and [Maarten Hoogendoorn](https://github.com/moretea)
+* Refactored ``group_by_date`` into a helper method which is called in the view layer and not in the controller because it is entirely presentation. [Philip Arndt](https://github.com/parndt)
+* Applied HTML5 history pagination to all core engines. [Philip Arndt](https://github.com/parndt)
+* Converted translate calls to use ``:scope``. [Uģis Ozols](https://github.com/ugisozols)
+* Fixed issues where errors would only show up in English for some models and updated Russian translations. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
+* Converted to devise for authentication, requiring password resets. [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols)
+* Sped up WYMeditor load times. [Philip Arndt](https://github.com/parndt)
+* Fixed several issues for Internet Explorer. [Pepí Šimánek](https://github.com/simi)
+* Added installation option for [Duostack](http://duostack.com) hosting service. [Philip Arndt](https://github.com/parndt) and [David E. Chen](https://github.com/dchen)
+
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.9...0.9.9)
+
 ## 0.9.8.9 [21 December 2010]
+
 * Fixed error in the inquiries engine seeds. [Philip Arndt](https://github.com/parndt)
 * Separate each error message into its own ``<li>``. [Uģis Ozols](https://github.com/ugisozols)
 * Add ``rescue_not_found`` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
@@ -6,11 +52,13 @@
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.8...0.9.8.9)
 
 ## 0.9.8.8 [16 December 2010]
+
 * Prevented RefinerySetting from accessing its database table before it is created. [Philip Arndt](https://github.com/parndt)
 * Added more options to ``bin/refinerycms`` like ability to specify database username and password. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.7...0.9.8.8)
 
 ## 0.9.8.7 [15 December 2010]
+
 * Fixed a problem with migration number clashes. [Philip Arndt](https://github.com/parndt)
 * Fixed problems with ``db:migrate`` for a new app on Postgres. [Jacob Buys](https://github.com/wjbuys)
 * Back-ported the changes made to the images dialogue which speed it up significantly. [Philip Arndt](https://github.com/parndt)
@@ -19,6 +67,7 @@
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.6...0.9.8.7)
 
 ## 0.9.8.6 [3 December 2010]
+
 * Backported lots of functionality from 0.9.9 and later like:
 * Fixed reordering for trees and non-trees [Philip Arndt](https://github.com/parndt)
 * Better ``RSpec`` coverage [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols) and [PeRo ICT Solutions](https://github.com/pero-ict)
@@ -29,6 +78,7 @@
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.5...0.9.8.6)
 
 ## 0.9.8.5 [21 September 2010](https://github.com/parndt)
+
 * Fixed an issue with the engine generator that was putting a comma in the wrong place breaking the call to ``crudify``. [Maarten Hoogendoorn](https://github.com/moretea)
 * Made the delete messages consistent. [Uģis Ozols](https://github.com/ugisozols)
 * ``zh-CN`` was overriding en locale in core locale file, fixed. [Philip Arndt](https://github.com/parndt)
@@ -38,6 +88,7 @@
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.4...0.9.8.5)
 
 ## 0.9.8.4 [17 September 2010]
+
 * Recursive deletion of page parts. [primerano](https://github.com/primerano)
 * Move around the default pages. [Philip Arndt](https://github.com/parndt)
 * Extraction of windows check to ``Refinery::WINDOWS``. [Steven Heidel](https://github.com/stevenheidel)

data/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run RefineryApp::Application

data/config/cucumber.yml

@@ -0,0 +1,15 @@
+<%
+ENV["RAILS_ENV"] ||= "test"
+require ::File.expand_path('../config/environment',  __FILE__)
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip "
+features_globs = []
+(::Refinery::Plugins.registered.pathnames << Rails.root).map{|p| p.join('features')}.reject{|d| !d.directory?}.each do |features|
+  features_globs << Dir[features.to_s].flatten.join(' ')
+end
+std_opts << features_globs.join(' ')
+%>
+default: <%= std_opts %>
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/config/database.yml.mysql

@@ -2,7 +2,7 @@ login: &login
   adapter: mysql
   host: localhost
   username: root
-  password: root
+  password:
 
 development: &development
   database: your_local_database
@@ -12,10 +12,6 @@ test: &test
   database: your_test_database
   <<: *login
 
-cucumber: &cucumber
-  database: your_cucumber_database
-  <<: *test
-
 production: &production
   adapter: mysql
   host: localhost

data/config/database.yml.sqlite3

@@ -1,6 +1,6 @@
 # SQLite version 3.x
 development:
-  adapter: sqlite3
+  adapter: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
   database: db/development.sqlite3
   timeout: 5000
 
@@ -8,7 +8,7 @@ development:
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
+  adapter: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
   database: db/test.sqlite3
   timeout: 5000
 
@@ -16,11 +16,11 @@ test:
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 cucumber:
-  adapter: sqlite3
+  adapter: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
   database: db/cucumber.sqlite3
   timeout: 5000
 
 production:
-  adapter: sqlite3
+  adapter: <%= "jdbc" if defined?(JRUBY_PLATFORM) %>sqlite3
   database: db/production.sqlite3
   timeout: 5000

data/config/environments/development.rb

@@ -1,5 +1,5 @@
-Refinery::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+RefineryApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
@@ -17,12 +17,11 @@ Refinery::Application.configure do
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
 
-  # Set the log level to the most chatty.
-  config.log_level = :debug
-
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
 end
 
-# Don't handle some exceptions with the 404 page.
 Refinery.rescue_not_found = false

data/config/environments/production.rb

@@ -1,5 +1,5 @@
-Refinery::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+RefineryApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
 
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
@@ -25,14 +25,11 @@ Refinery::Application.configure do
   # config.logger = SyslogLogger.new
 
   # Use a different cache store in production
-  config.cache_store = :memory_store
+  # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server (Rails default)
+  # Disable Rails's static asset server
   # In production, Apache or nginx will already do this
-  # Warning: Refinery CMS has enabled this setting.
-  # Disabling this will means files in your public directly
-  # won't override core assets that are served from the plugin public directories.
-  config.serve_static_assets = true
+  config.serve_static_assets = true # Refinery CMS requires this to be true
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
@@ -50,11 +47,4 @@ Refinery::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 end
-
-# When true will use Amazon's Simple Storage Service on your production machine
-# instead of the default file system for resources and images
-# Make sure to your bucket info is correct in amazon_s3.yml
-Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
-
-# Handle some exceptions with the 404 page.
 Refinery.rescue_not_found = true

data/config/environments/test.rb

@@ -1,5 +1,5 @@
-Refinery::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+RefineryApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
   # test suite.  You never need to work with it otherwise.  Remember that
@@ -30,9 +30,7 @@ Refinery::Application.configure do
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
-  # Print deprecation notices to the stderr <-- :log until authlogic calms down.
-  config.active_support.deprecation = :log
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
 end
-
-# Don't handle some exceptions with the 404 page.
 Refinery.rescue_not_found = false

data/core/app/controllers/admin/base_controller.rb

@@ -0,0 +1,10 @@
+# Filters added to this controller apply to all controllers in the refinery backend.
+# Likewise, all the methods added will be available for all controllers in the refinery backend.
+
+# You can extend refinery backend with your own functions here and they will likely not get overriden in an update.
+
+module Admin
+  class BaseController < ActionController::Base
+
+  end
+end

data/core/app/controllers/admin/dialogs_controller.rb

@@ -0,0 +1,26 @@
+module Admin
+  class DialogsController < Admin::BaseController
+
+    def show
+      if (@dialog_type = params[:id].try(:downcase))
+        url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
+
+        @iframe_src = if @dialog_type == 'image'
+          insert_admin_images_url(url_params.merge(:id => nil, :modal => true))
+        elsif @dialog_type == 'link'
+          link_to_admin_pages_dialogs_url(url_params.merge(:id => nil))
+        end
+
+        render :layout => false
+
+      else
+        render :nothing => true
+      end
+    end
+
+    def from_dialog?
+      true
+    end
+
+  end
+end

data/core/app/controllers/admin/refinery_core_controller.rb

@@ -0,0 +1,12 @@
+module Admin
+  class RefineryCoreController < Admin::BaseController
+    def update_plugin_positions
+      params[:menu].each_with_index do |plugin_name, index|
+        if (plugin = current_user.plugins.find_by_name(plugin_name))
+          plugin.update_attribute(:position, index)
+        end
+      end
+      render :nothing => true
+    end
+  end
+end

data/core/app/controllers/application_controller.rb

@@ -0,0 +1,6 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+
+end

data/core/app/controllers/refinery/fast_controller.rb

@@ -0,0 +1,9 @@
+module Refinery
+  class FastController < ActionController::Base
+
+    def wymiframe
+      render :template => "/wymiframe", :layout => false
+    end
+
+  end
+end

data/core/app/controllers/sitemap_controller.rb

@@ -0,0 +1,14 @@
+class SitemapController < ::Refinery::FastController
+  layout nil
+
+  def index
+    headers['Content-Type'] = 'application/xml'
+
+    respond_to do |format|
+      format.xml do
+        @pages = Page.live.includes(:parts)
+      end
+    end
+  end
+
+end

data/core/app/helpers/application_helper.rb

@@ -0,0 +1,5 @@
+# Methods added to this helper will be available to all templates in the application.
+
+module ApplicationHelper
+
+end

data/core/app/views/admin/_head.html.erb

@@ -0,0 +1,43 @@
+<%
+  if (yielded_head = yield(:head)).present?
+    logger.warn "\n-- DEPRECATION WARNING --"
+    logger.warn "The use of 'content_for :head' is DEPRECATED for the admin layouts."
+    logger.warn "For stylesheets, use content_for :stylesheets"
+    logger.warn "For javascripts, use content_for :javascripts"
+    logger.warn "For meta tags, use content_for :meta"
+    logger.warn "This change is necessary so that we can deliver a performant experience for the user."
+    logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
+  end
+  if (yielded_head_libraries = yield(:head)).present?
+    logger.warn "\n-- DEPRECATION WARNING --"
+    logger.warn "The use of 'content_for :head_libraries' is DEPRECATED for the admin layouts."
+    logger.warn "Please use content_for :before_javascript_libraries or content_for :after_javascript_libraries instead."
+    logger.warn "This change is necessary so that we can deliver a performant experience for the user."
+    logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
+  end
+-%>
+<head>
+  <meta charset='<%= ::Refinery::Application.config.encoding %>' />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <%= yield :meta %>
+  <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name') -%> - Refinery</title>
+  <%= csrf_meta_tag %>
+
+  <%= stylesheet_link_tag 'refinery/site_bar',
+                          'refinery/refinery',
+                          'refinery/ui',
+                          'refinery/submenu',
+                          'refinery/tooltips',
+                          'wymeditor/skins/refinery/skin',
+                          :cache => ("cache/refinery" if Rails.root.writable? and
+                                                         RefinerySetting.find_or_set(:use_resource_caching, true) and
+                                                         request.env['HTTP_USER_AGENT'] !~ /MSIE/) -%>
+
+  <%= yield :stylesheets %>
+
+  <%= javascript_include_tag 'modernizr-min' %>
+
+  <% #TODO: REMOVE yielded_head and yielded_head_libraries and deprecation notice 0.9.9 <=> 1.0 %>
+  <%= yielded_head_libraries %>
+  <%= yielded_head %>
+</head>

data/core/app/views/admin/_javascripts.html.erb

@@ -0,0 +1,32 @@
+<%
+  js_caching = Rails.root.writable? and RefinerySetting.find_or_set(:use_resource_caching, true)
+  login = defined?(login) ? login : login?
+-%>
+<%= yield :before_javascript_libraries -%>
+<%= javascript_include_tag 'refinery/i18n' -%>
+<script>I18n.locale = '<%= I18n.locale %>';</script>
+
+<%= jquery_include_tags    :caching => js_caching -%>
+
+<%= javascript_include_tag 'rails.js' %>
+
+<%= javascript_include_tag 'jquery/jquery.corner.js',
+                           'jquery/jquery.textTruncate.js',
+                           'jquery/jquery.html5-placeholder-shim.js',
+                           'jquery/jquery.timers.js',
+                           'jquery/jquery.jcarousel.js',
+                           :cache => ("cache/jquery-plugins" if js_caching) unless login -%>
+
+<%= yield :after_javascript_libraries -%>
+
+<%= javascript_include_tag 'wymeditor/jquery.refinery.wymeditor.js',
+                           'admin',
+                           'refinery/boot_wym',
+                           'refinery/core',
+                           'refinery/site_bar',
+                           'refinery/admin',
+                           'refinery/submenu',
+                           :cache => ("cache/admin" if js_caching) unless login -%>
+<%= javascript_include_tag 'refinery/core' if login -%>
+
+<%= yield :javascripts -%>

data/core/app/views/admin/_menu.html.erb

@@ -0,0 +1,17 @@
+<nav id="menu">
+  <% Refinery::Plugins.active.in_menu.each do |plugin| -%>
+    <%= link_to plugin.title, plugin.url,
+                :class => (plugin.highlighted?(params) ? "active" : ""),
+                :id => "plugin_#{plugin.name}" %>
+  <% end -%>
+  <% if Refinery::Plugins.active.in_menu.many? -%>
+    <%= link_to refinery_icon_tag('arrow_switch.png'), "",
+                :id => "menu_reorder",
+                :title => t('.reorder_menu') %>
+
+    <%= link_to refinery_icon_tag('tick.png'), "",
+                :id => "menu_reorder_done",
+                :title => t('.reorder_menu_done'),
+                :style => "display: none;" %>
+  <% end %>
+</nav>

data/core/app/views/admin/dialogs/show.html.erb

@@ -0,0 +1,19 @@
+<form id='wym_dialog_form' class='wym_dialog wym_dialog_<%= @dialog_type %>'>
+  <input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='<%= @dialog_type %>' />
+  <iframe src='<%= @iframe_src %>' id='dialog_frame' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>
+  <div class='wym_hideables'>
+  <% if @dialog_type == "image" %>
+    <input type='hidden' id='wym_src' class='wym_src' value='' />
+    <input type='hidden' id='wym_alt' class='wym_alt' value='' />
+    <input type='hidden' id='wym_title' class='wym_title' value='' />
+    <input type='hidden' id='wym_size' class='wym_size' value='' />
+  <% elsif @dialog_type == "link" %>
+    <input type='hidden' id='wym_href' class='wym_href' value='' />
+    <input type='hidden' id='wym_title' class='wym_title' value='' />
+    <input type='hidden' id='wym_target' class='wym_target' value='' />
+  <% end %>
+
+    <input id='wym_dialog_submit' class='wym_submit submit_dialog button' type='button' value='<%= t('.save') %>' />
+    <a id='wym_dialog_cancel' href='' class='wym_cancel close_dialog button'><%= t('.cancel') %></a>
+  </div>
+</form>