Merge branch 'master' into configureable-engines

Conflicts:
	images/refinerycms-images.gemspec
	pages/refinerycms-pages.gemspec
	resources/lib/generators/resources_generator.rb
	resources/lib/generators/templates/config/refinery/resources.yml.erb
	resources/lib/refinery/resources/validators/file_size_validator.rb
	resources/lib/refinerycms-resources.rb
	resources/refinerycms-resources.gemspec
	resources/spec/models/refinery/resource_spec.rb
	resources/spec/requests/refinery/admin/resources_spec.rb

.travis.yml

@@ -1,5 +1,4 @@
-#before_script: "sh -e /etc/init.d/xvfb start"
-before_script: "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/refinery_capybara_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x16"
+before_script: "sh -e /etc/init.d/xvfb start"
 script: "DISPLAY=:99.0 bundle exec rake db:create db:migrate spec"
 notifications:
   email:

Gemfile

@@ -21,6 +21,7 @@ gemspec
 # Anything you put in here will be overridden when the app gets updated.
 
 # gem 'refinerycms', '~> 2.0.0'
+gem 'seo_meta', :git => 'git://github.com/parndt/seo_meta.git'
 
 # END REFINERY CMS ============================================================
 

Gemfile.lock

@@ -6,6 +6,13 @@ GIT
       refinerycms-core (~> 2.0.0)
       routing-filter (>= 0.2.3)
 
+GIT
+  remote: git://github.com/parndt/seo_meta.git
+  revision: 151e1e83a3bb6607f6191be5410b0bec1bebe93f
+  specs:
+    seo_meta (1.2.0.rc1)
+      rails (>= 3.0.0)
+
 PATH
   remote: .
   specs:
@@ -33,15 +40,13 @@ PATH
       jquery-rails
       rails (~> 3.1.0)
       refinerycms-base (= 2.0.0)
-      refinerycms-generators (= 2.0.0)
       refinerycms-settings (= 2.0.0)
       sass-rails (~> 3.1.0)
       truncate_html (~> 0.5)
       uglifier
       will_paginate (~> 3.0)
     refinerycms-dashboard (2.0.0)
       refinerycms-core (= 2.0.0)
-    refinerycms-generators (2.0.0)
     refinerycms-images (2.0.0)
       activerecord (~> 3.1.0)
       dragonfly (~> 0.9.0)
@@ -138,7 +143,7 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.3)
-    dragonfly (0.9.5)
+    dragonfly (0.9.8)
       rack
     erubis (2.7.0)
     execjs (1.2.4)
@@ -171,7 +176,7 @@ GEM
       spork (>= 0.8.4)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.13)
+    jquery-rails (1.0.14)
       railties (~> 3.0)
       thor (~> 0.14)
     json_pure (1.5.4)
@@ -246,8 +251,6 @@ GEM
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    seo_meta (1.2.0.rc1)
-      refinerycms-generators (~> 2.0)
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
@@ -293,6 +296,7 @@ DEPENDENCIES
   refinerycms-i18n (~> 2.0.0)!
   refinerycms-testing (~> 2.0.0)
   sass-rails (~> 3.1.0)
+  seo_meta!
   simplecov
   spork (= 0.9.0.rc9)
   sqlite3

authentication/lib/gemspec.rb

@@ -27,7 +27,7 @@
 
   s.files             = [
     '#{%w( **/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(gempath.join(file)) }.flatten.reject{|f|
-      !f.exist? or f.to_s =~ /\.gem$/ or (f.directory? and f.children.empty?)
+      !f.exist? or f.to_s =~ /\.(gem|rbc)$/ or (f.directory? and f.children.empty?)
     }.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n    '")}'
   ]
 end

authentication/refinerycms-authentication.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Authentication engine for Refinery CMS}
   s.description       = %q{The default authentication engine for Refinery CMS}
-  s.date              = %q{2011-09-06}
+  s.date              = %q{2011-09-09}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

base/lib/gemspec.rb

@@ -23,7 +23,7 @@
 
   s.files             = [
     '#{%w( **/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(gempath.join(file)) }.flatten.reject{|f|
-      !f.exist? or f.to_s =~ /\.gem$/ or (f.directory? and f.children.empty?)
+      !f.exist? or f.to_s =~ /\.(gem|rbc)$/ or (f.directory? and f.children.empty?)
     }.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n    '")}'
   ]
 end

base/refinerycms-base.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Base engine for Refinery CMS}
   s.description       = %q{This provides a base for Refinery CMS which handles things like settings on the Refinery namespace.}
-  s.date              = %q{2011-09-05}
+  s.date              = %q{2011-09-09}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

core/app/assets/javascripts/wymeditor/lang/bg.js

@@ -0,0 +1,57 @@
+WYMeditor.STRINGS['bg'] = {
+  Strong:           'Получер',
+  Bold:             'Получер',
+  Emphasis:         'Курсив',
+  Superscript:      'Горен индекс',
+  Subscript:        'Долен индекс',
+  Ordered_List:     'Подреден списък',
+  Unordered_List:   'Списък',
+  Indent:           'Блок навътре',
+  Outdent:          'Блок навън',
+  Undo:             'Отмяна',
+  Redo:             'Повторение',
+  Link:             'Връзка',
+  Unlink:           'Премахване на връзка',
+  Image:            'Изображение',
+  Table:            'Таблица',
+  HTML:             'HTML',
+  Paragraph:        'Параграф',
+  Heading_1:        'Заглавие 1',
+  Heading_2:        'Заглавие 2',
+  Heading_3:        'Заглавие 3',
+  Heading_4:        'Заглавие 4',
+  Heading_5:        'Заглавие 5',
+  Heading_6:        'Заглавие 6',
+  Preformatted:     'Форматиран предварително',
+  Blockquote:       'Цитат',
+  Table_Header:     'Заглавие на таблицата',
+  URL:              'Уеб адрес',
+  Title:            'Заглавие',
+  Alternative_Text: 'Алтернативен текст',
+  Caption:          'Заглавие',
+  Summary:          'Общо',
+  Number_Of_Rows:   'Брой редове',
+  Number_Of_Cols:   'Брой колони',
+  Insert:           'Вмъкване',
+  Submit:           'Изпращане',
+  Cancel:           'Отказ',
+  Choose:           'Избор',
+  Preview:          'Преглед',
+  Paste_From_Word:  'Вмъкнете Вашия текст по-долу',
+  Tools:            'Инструменти',
+  Containers:       'Контейнери',
+  Classes:          'Класове',
+  Status:           'Статус',
+  Source_Code:      'Изходен код',
+  Text_Align:       'На текст',
+  Image_Align:      'На изображение',
+  Font_Size:        'На шрифт',
+  Left:             'Отляво',
+  Right:            'Отдясно',
+  Center:           'Центрирано',
+  Justify:          'Двустранно',
+  Small:            'Малък',
+  Normal:           'Нормален',
+  Large:            'Голям',
+  Apply_Style:      'Стил'
+};

core/lib/gemspec.rb

@@ -23,7 +23,6 @@
 
   s.add_dependency 'refinerycms-base',            '= #{::Refinery::Version}'
   s.add_dependency 'refinerycms-settings',        '= #{::Refinery::Version}'
-  s.add_dependency 'refinerycms-generators',      '= #{::Refinery::Version}'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '~> 0.2.0.beta3'
@@ -38,7 +37,7 @@
 
   s.files             = [
     '#{%w( **/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(gempath.join(file)) }.flatten.reject{|f|
-      !f.exist? or f.to_s =~ /\.gem$/ or (f.directory? and f.children.empty?)
+      !f.exist? or f.to_s =~ /\.(gem|rbc)$/ or (f.directory? and f.children.empty?)
     }.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n    '")}'
   ]
 end

core/lib/refinery/admin/base_controller.rb

@@ -5,20 +5,15 @@ module Refinery
   module Admin
     module BaseController
 
-      def self.included(controller)
-        controller.send :include, ::Refinery::Admin::BaseController::InstanceMethods
-        controller.send :include, ::Refinery::Admin::BaseController::ClassMethods
-      end
+      extend ActiveSupport::Concern
 
-      module ClassMethods
-        def self.included(c)
-          c.layout :layout?
+      included do
+        layout :layout?
 
-          c.before_filter :authenticate_refinery_user!, :restrict_plugins, :restrict_controller
-          c.after_filter :store_location?, :except => [:new, :create, :edit, :update, :destroy, :update_positions] # for redirect_back_or_default
+        before_filter :authenticate_refinery_user!, :restrict_plugins, :restrict_controller
+        after_filter :store_location?, :except => [:new, :create, :edit, :update, :destroy, :update_positions] # for redirect_back_or_default
 
-          c.helper_method :searching?, :group_by_date
-        end
+        helper_method :searching?, :group_by_date
       end
 
       module InstanceMethods

core/lib/refinerycms-core.rb

@@ -18,7 +18,6 @@ module Refinery
 # These have to be specified after the autoload to correct load issues on some systems.
 # As per commit 12af0e3e83a147a87c97bf7b29f343254c5fcb3c
 require 'refinerycms-base'
-require 'refinerycms-generators'
 require 'refinerycms-settings'
 require 'rails/generators'
 require 'rails/generators/migration'

core/public/javascripts/wymeditor/lang/bg.js

@@ -0,0 +1,57 @@
+WYMeditor.STRINGS['bg'] = {
+  Strong:           'Получер',
+  Bold:             'Получер',
+  Emphasis:         'Курсив',
+  Superscript:      'Горен индекс',
+  Subscript:        'Долен индекс',
+  Ordered_List:     'Подреден списък',
+  Unordered_List:   'Списък',
+  Indent:           'Блок навътре',
+  Outdent:          'Блок навън',
+  Undo:             'Отмяна',
+  Redo:             'Повторение',
+  Link:             'Връзка',
+  Unlink:           'Премахване на връзка',
+  Image:            'Изображение',
+  Table:            'Таблица',
+  HTML:             'HTML',
+  Paragraph:        'Параграф',
+  Heading_1:        'Заглавие 1',
+  Heading_2:        'Заглавие 2',
+  Heading_3:        'Заглавие 3',
+  Heading_4:        'Заглавие 4',
+  Heading_5:        'Заглавие 5',
+  Heading_6:        'Заглавие 6',
+  Preformatted:     'Форматиран предварително',
+  Blockquote:       'Цитат',
+  Table_Header:     'Заглавие на таблицата',
+  URL:              'Уеб адрес',
+  Title:            'Заглавие',
+  Alternative_Text: 'Алтернативен текст',
+  Caption:          'Заглавие',
+  Summary:          'Общо',
+  Number_Of_Rows:   'Брой редове',
+  Number_Of_Cols:   'Брой колони',
+  Insert:           'Вмъкване',
+  Submit:           'Изпращане',
+  Cancel:           'Отказ',
+  Choose:           'Избор',
+  Preview:          'Преглед',
+  Paste_From_Word:  'Вмъкнете Вашия текст по-долу',
+  Tools:            'Инструменти',
+  Containers:       'Контейнери',
+  Classes:          'Класове',
+  Status:           'Статус',
+  Source_Code:      'Изходен код',
+  Text_Align:       'На текст',
+  Image_Align:      'На изображение',
+  Font_Size:        'На шрифт',
+  Left:             'Отляво',
+  Right:            'Отдясно',
+  Center:           'Центрирано',
+  Justify:          'Двустранно',
+  Small:            'Малък',
+  Normal:           'Нормален',
+  Large:            'Голям',
+  Apply_Style:      'Стил'
+};

core/refinerycms-core.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-09-06}
+  s.date              = %q{2011-09-09}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'refinerycms-base',            '= 2.0.0'
   s.add_dependency 'refinerycms-settings',        '= 2.0.0'
-  s.add_dependency 'refinerycms-generators',      '= 2.0.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '~> 0.2.0.beta3'
@@ -216,6 +215,7 @@ Gem::Specification.new do |s|
     'app/assets/javascripts/wymeditor',
     'app/assets/javascripts/wymeditor/jquery.refinery.wymeditor.js',
     'app/assets/javascripts/wymeditor/lang',
+    'app/assets/javascripts/wymeditor/lang/bg.js',
     'app/assets/javascripts/wymeditor/lang/ca.js',
     'app/assets/javascripts/wymeditor/lang/cs.js',
     'app/assets/javascripts/wymeditor/lang/da.js',
@@ -407,6 +407,10 @@ Gem::Specification.new do |s|
     'public/404.html',
     'public/422.html',
     'public/500.html',
+    'public/javascripts',
+    'public/javascripts/wymeditor',
+    'public/javascripts/wymeditor/lang',
+    'public/javascripts/wymeditor/lang/bg.js',
     'public/robots.txt',
     'public/wymeditor',
     'public/wymeditor/GPL-license.txt',

dashboard/lib/gemspec.rb

@@ -23,7 +23,7 @@
 
   s.files             = [
     '#{%w( **/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(gempath.join(file)) }.flatten.reject{|f|
-      !f.exist? or f.to_s =~ /\.gem$/ or (f.directory? and f.children.empty?)
+      !f.exist? or f.to_s =~ /\.(gem|rbc)$/ or (f.directory? and f.children.empty?)
     }.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n    '")}'
   ]
 

dashboard/refinerycms-dashboard.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Dashboard engine for Refinery CMS}
   s.description       = %q{The dashboard is usually the first engine the user sees in the backend of Refinery CMS. It displays useful information and contains links to common functionality.}
-  s.date              = %q{2011-09-06}
+  s.date              = %q{2011-09-09}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

db/migrate/20110907082019_remove_custom_title_from_refinery_pages.rb

@@ -0,0 +1,11 @@
+class RemoveCustomTitleFromRefineryPages < ActiveRecord::Migration
+  def up
+    if ::Refinery::Page.column_names.map(&:to_sym).include?(:custom_title)
+      remove_column ::Refinery::Page.table_name, :custom_title
+    end
+  end
+
+  def down
+    add_column ::Refinery::Page.table_name, :custom_title, :string
+  end
+end

generators/readme.md → doc/generators.md

@@ -1,9 +1,5 @@
 # RefineryCMS Generators
 
-## Dependencies
-
-This version is targeted at RefineryCMS versions 2.0.0 and higher.
-
 ## Engine Generator
 
 The Refinery generator is a standard Rails generator that functions just like the

doc/guides/1 - Getting Started/2 - Getting Started with Refinery.textile

@@ -96,7 +96,7 @@ $ refinerycms rickrockstar
 
 TIP: You can see all of the switches that the +refinerycms+ command accepts by running +refinerycms+ with no options or arguements.
 
-TIP: You can run <tt>$ refinery rickrockstar -r _3.0.9_</tt> to generate a refinery stack with any specific version of rails you need.
+TIP: You can run <tt>$ refinerycms rickrockstar -r 3.0.9</tt> to generate a refinery stack with any specific version of rails you need.
 
 This will create a new Rails application with Refinery built in called Rick Rock Star in a directory called +rickrockstar+. It also automatically runs +bundle install+ which will find and install all Refinery's ruby gem dependencies. Finally, it creates your database and seeds it with some basic defaults to get you started.
 

doc/guides/4 - Customising your Design/1 - How to change Page Parts.textile

@@ -32,7 +32,7 @@ Here's a sample of a site that would have three content areas on most of its pag
 - Right Body
 </yaml>
 
-h3. Changing Part Parts for a single page
+h3. Changing Page Parts for a single page
 
 Often we find our home pages have three or more page parts but the rest of the site only needs two. In this situation you just want to have the default page parts set to Body and Side Body and your home page setup to have an extra one.
 

doc/guides/7 - Hosting/1 - How to Install Refinery on Heroku.textile

@@ -46,7 +46,7 @@ NOTE: if you already have a refinery app you would like to deploy then just depl
 
 h3. Adding Amazon S3 Support
 
-If you want to use Refinery's image and resource support you'll need to setup storage too. Create a bucket called "my_app_production" and uncomment this line in your Gemfile (this might already be done for you):
+If you want to use Refinery's image and resource support you'll need to setup storage too. Create a bucket called "my_app_production" and add this line in your Gemfile (this might already be done for you):
 
 <ruby>
 gem 'fog'