refinerycms 0.9.7.5 → 0.9.7.6

data/changelog.md

@@ -1,9 +1,22 @@
+## 0.9.7.6 [15 July 2010]
+
+- Bugfixes, fixed some failing tests. [Philip Arndt]
+- More pt-BR translation keys translated [Kivanio Barbosa]
+- Locked gems using Gemfile.lock [David Jones]
+- Changed 'refinery' task to 'refinerycms' as that is our gem's name. [Steven Heidel]
+- Fixed bug where settings were still considered restricted if NULL. [Steven Heidel]
+- Ensures that bundler is available before creating an application from a gem. [Philip Arndt]
+- Application generator (from gem) and application upgrade bin task (from 0.9.6) is now Ruby 1.9.2 compatible. [Philip Arndt]
+- bin/refinery-upgrade-from-096-to-097 will no longer allow you to run it if Gemfile is present and thus signifying an upgraded app. [Philip Arndt]
+- Cleaned up syntax, changed CSS involving dialogues [Philip Arndt]
+- [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.5...0.9.7.6)
+
 ## 0.9.7.5 [08 July 2010]
 
 - Wrote an upgrade task for migrating from 0.9.6.x releases of RefineryCMS. Just run refinery-update-096-to-097 inside your application's directory. [Philip Arndt]
-- Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found [Philip Arndt]
-- Fixed a broken migration that would mean pages were missing upon upgrading [Jesper Hvirring Henriksen]
-- More pt-BR translation keys translated [Kivanio Barbosa]
+- Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found. [Philip Arndt]
+- Fixed a broken migration that would mean pages were missing upon upgrading. [Jesper Hvirring Henriksen]
+- More pt-BR translation keys translated. [Kivanio Barbosa]
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.4...0.9.7.5)
 
 ## 0.9.7.4 [07 July 2010]
@@ -21,12 +34,12 @@
 
 ## 0.9.7.2 [06 July 2010]
 
-- Bugfixes with users and roles [Philip Arndt and Amanda Wagener]
+- Bugfixes with users and roles. [Philip Arndt and Amanda Wagener]
 - Fixed the rake translate:lost_in_translation LOCALE=en and rake translate:lost_in_translation_all tasks so that they accurately reflect the missing i18n translation keys. [Philip Arndt]
 - Refactored routing of i18n to allow different default frontend and backend locales. [Philip Arndt]
-- Added better grammar support for some i18n [Halan Pinheiro]
+- Added better grammar support for some i18n. [Halan Pinheiro]
 - Improved output of rake refinery:update task and removed bin/refinery-update-core task. [Steven Heidel]
-- Set config.ru to run in production RAILS_ENV by default [Philip Arndt]
+- Set config.ru to run in production RAILS_ENV by default. [Philip Arndt]
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.1...0.9.7.2)
 
 ## 0.9.7.1 [03 July 2010]
@@ -41,11 +54,11 @@
 ## 0.9.7 [02 July 2010]
 
 - Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn and Philip Arndt and many others]
-- Marketable URLs, such as /contact [Joshua Davey and Joe Sak].
+- Marketable URLs, such as "/contact". [Joshua Davey and Joe Sak].
 - Switched to bundler and rack. [Alex Coles and Philip Arndt]
 - Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel and Philip Arndt]
-- Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions [Philip Arndt]
-- Added spam filtering to contact form. [djones]
+- Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions. [Philip Arndt]
+- Added spam filtering to contact form. [David Jones]
 - Full Refinery UI redesign. [Resolve Digital]
 - User Role support. [Amanda Wagener and Philip Arndt]
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.6.34...0.9.7)
@@ -329,8 +342,8 @@
 
 ## 0.9.3 [11 October 2009]
 
-- Optimise loading of WYM Editors
-- Supported more plugins' menu matches
+- Optimise loading of WYM Editors.
+- Supported more plugins' menu matches.
 
 ## 0.9.2.2 [08 October 2009]
 
@@ -354,7 +367,7 @@
 
 ## 0.9.1 [04 October 2009]
 
-- Bugfixes
+- Bugfixes.
 - Renamed project from Refinery to refinerycms and released as a gem.
 
 ## 0.9 [29 May 2009]

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100702022630) do
+ActiveRecord::Schema.define(:version => 20100708014636) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"

data/features/refinery/site_bar.feature

@@ -1,20 +1,21 @@
 Feature: Site Bar
   In order to allow administrators to easily switch between editing and viewing their website
-  I want logged in refinery users to see a site bar 
+  I want logged in refinery users to see a site bar
   And I want logged in customers to not see a site bar
 
   Background:
-    Given I am not logged in
+    Given I have a home page titled "Home"
+    And I am not logged in
 
   Scenario: Not logged in
     When I go to the home page
     Then I should not see "Log out"
-    
+
   Scenario: Logged in as a Refinery user
     Given I am a logged in user
     When I go to the home page
     Then I should see "Log out"
-    
+
   Scenario: Logged in as a customer
     Given A Refinery user exists
     And I am a logged in customer

data/features/step_definitions/refinery/page_steps.rb

@@ -1,6 +1,10 @@
-Given /^I (only )?have a page titled (.+)$/ do |only, title|
+Given /^I (only )?have a (home )?page titled (.+)$/ do |only, home, title|
   Page.delete_all if only
-  Page.create(:title => title)
+  unless home
+    Page.create(:title => title)
+  else
+    Page.create(:title => title, :link_url => '/')
+  end
 end
 
 Given /^I (only )?have pages titled (.+)$/ do |only, titles|

data/lib/gemspec.rb

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\\ Digital David\\ Jones Philip\\ Arndt)
   s.require_paths     = %w(lib)
-  s.executables       = %w(refinery refinery-upgrade-096-to-097)
+  s.executables       = %w(#{Dir.glob('bin/*').map{|d| d.gsub('bin/','')}.join(' ')})
 
   s.files             = [
     '#{files.join("',\n    '")}'

data/lib/refinery/tasks/refinery.rake

@@ -17,36 +17,42 @@ namespace :test do
     abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any?
   end
   namespace :refinery do
-    Rake::TestTask.new(:units => "db:test:prepare") do |t|
-      t.libs << Refinery.root.join("test").to_s
-      t.pattern = Refinery.root.join("test", "unit", "**", "*_test.rb").to_s
+    Rake::TestTask.new(:units => 'db:test:prepare') do |t|
+      t.libs += [Refinery.root.join('test').to_s,
+                 Dir[Rails.root.join('vendor', 'plugins', '**', 'test').to_s]].flatten
+      t.pattern = [Refinery.root.join('test', 'unit', '**', '*_test.rb').to_s,
+                   Rails.root.join('vendor', 'plugins', '**', 'test', '**', '*_test.rb').to_s]
       t.verbose = true
-      ENV["RAILS_ROOT"] = Rails.root.to_s
+      ENV['RAILS_ROOT'] = Rails.root.to_s
     end
-    Rake::Task['test:refinery:units'].comment = "Run the unit tests in Refinery."
+    Rake::Task['test:refinery:units'].comment = 'Run the unit tests in Refinery.'
 
-    Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
-      t.libs << Refinery.root.join("test").to_s
-      t.pattern = Refinery.root.join("test", "functional", "**", "*_test.rb").to_s
+    Rake::TestTask.new(:functionals => 'db:test:prepare') do |t|
+      t.libs += [Refinery.root.join('test').to_s,
+                 Dir[Rails.root.join('vendor', 'plugins', '**', 'test').to_s]].flatten
+      t.pattern = [Refinery.root.join('test', 'functional', '**', '*_test.rb').to_s,
+                   Rails.root.join('vendor', 'plugins', '**', 'functional', '**', '*_test.rb').to_s]
       t.verbose = true
-      ENV["RAILS_ROOT"] = Rails.root.to_s
+      ENV['RAILS_ROOT'] = Rails.root.to_s
     end
-    Rake::Task['test:refinery:functionals'].comment = "Run the functional tests in Refinery."
+    Rake::Task['test:refinery:functionals'].comment = 'Run the functional tests in Refinery.'
 
-    Rake::TestTask.new(:integration => "db:test:prepare") do |t|
-      t.libs << Refinery.root.join("test").to_s
-      t.pattern = Refinery.root.join("test", "integration", "**", "*_test.rb").to_s
+    Rake::TestTask.new(:integration => 'db:test:prepare') do |t|
+      t.libs += [Refinery.root.join('test').to_s,
+                 Dir[Rails.root.join('vendor', 'plugins', '**', 'test').to_s]].flatten
+      t.pattern = [Refinery.root.join('test', 'integration', '**', '*_test.rb').to_s,
+                   Rails.root.join('vendor', 'plugins', '**', 'integration', '**', '*_test.rb').to_s]
       t.verbose = true
-      ENV["RAILS_ROOT"] = Rails.root.to_s
+      ENV['RAILS_ROOT'] = Rails.root.to_s
     end
-    Rake::Task['test:refinery:integration'].comment = "Run the integration tests in Refinery."
+    Rake::Task['test:refinery:integration'].comment = 'Run the integration tests in Refinery.'
 
     Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
-      t.libs << Refinery.root.join("test").to_s
-      t.pattern = Refinery.root.join("test", "performance", "**", "*_test.rb")
+      t.libs << Refinery.root.join('test').to_s
+      t.pattern = Refinery.root.join('test', 'performance', '**', '*_test.rb')
       t.verbose = true
       t.options = '-- --benchmark'
-      ENV["RAILS_ROOT"] = Rails.root.to_s
+      ENV['RAILS_ROOT'] = Rails.root.to_s
     end
     Rake::Task['test:refinery:benchmark'].comment = 'Benchmark the performance tests in Refinery'
   end

data/lib/tasks/rspec.rake

@@ -1,4 +1,3 @@
-gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
 rspec_gem_dir = nil
 Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
   rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")

data/public/javascripts/refinery/admin.js

@@ -16,6 +16,7 @@ init_interface = function() {
   $('#editor_switch a').appendTo($('<span></span>').prependTo('#editor_switch').corner('6px'));
   $('#page_container, .wym_box').corner('5px bottom');
   $('.wym_box').corner('5px tr');
+  $('.field > .wym_box').corner('5px tl');
   $('.wym_iframe iframe').corner('2px');
   $('.form-actions:not(".form-actions-dialog")').corner('5px');
   $('#recent_activity li a, #recent_inquiries li a').each(function(i, a) {
@@ -327,7 +328,7 @@ var link_dialog = {
         }
 
         // Add any alternate resource stores that need a absolute URL in the regex below
-        if( resourceUrl.hostname.match(/s3.amazonaws.com/) ) {
+        if(resourceUrl.hostname.match(/s3.amazonaws.com/)) {
           relevant_href = resourceUrl.protocol + '//' + resourceUrl.host + relevant_href;
         }
 
@@ -339,16 +340,9 @@ var link_dialog = {
           });
         }
       }
-
-      if(parent && typeof(parent.tb_remove) == "function"){
-        parent.tb_remove();
-      }
     });
 
-    $('.form-actions-dialog #cancel_button').click(function(e){
-      e.preventDefault();
-      parent.tb_remove();
-    });
+    $('.form-actions-dialog #cancel_button').trigger('click');
   },
 
   init_close: function(){

data/public/javascripts/refinery/boot_wym.js

@@ -138,8 +138,8 @@ var wymeditor_boot_options = $.extend({
 
   , dialogPath: "/refinery/dialogs/"
   , dialogFeatures: {
-      width: 958
-    , height: 500
+      width: 866
+    , height: 455
     , modal: true
     , draggable: true
     , resizable: false
@@ -149,7 +149,7 @@ var wymeditor_boot_options = $.extend({
   }
   , dialogInlineFeatures: {
       width: 600
-    , height: 530
+    , height: 485
     , modal: true
     , draggable: true
     , resizable: false

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1488,7 +1488,7 @@ WYMeditor.editor.prototype.format_block = function(selected) {
 
   var container = selected || wym.selected() || $(wym._iframe).contents().find('body').get(0);
   var name = container.tagName.toLowerCase();
-  
+
   //fix forbidden main containers
   if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a']) > -1) {
     name = container.parentNode.tagName.toLowerCase();
@@ -4579,7 +4579,7 @@ WYMeditor.WymClassMozilla.prototype.enableDesignMode = function() {
       try {
         this._doc.designMode = "on";
         this._doc.execCommand("styleWithCSS", '', false);
-      } 
+      }
       catch(e) { }
     }
 };
@@ -4972,7 +4972,7 @@ WYMeditor.WymClassSafari.prototype.keydown = function(e) {
   if(e.ctrlKey){
     //'this' is the doc
     var wym = WYMeditor.INSTANCES[this.title];
-    
+
     if(e.keyCode == 66) {
       //CTRL+b => STRONG
       wym._exec(WYMeditor.BOLD);
@@ -5011,7 +5011,7 @@ WYMeditor.WymClassSafari.prototype.keyup = function(e) {
   if(e.keyCode == 13 && e.shiftKey) {
     wym._exec('InsertLineBreak');
   }
-  else if(($.inArray(e.keyCode, [8, 17, 46, 224]) == -1) && !e.metaKey && !e.ctrlKey) 
+  else if(($.inArray(e.keyCode, [8, 17, 46, 224]) == -1) && !e.metaKey && !e.ctrlKey)
   {
     //NOT BACKSPACE, NOT DELETE, NOT CTRL, NOT COMMAND
     //text nodes replaced by P
@@ -5023,7 +5023,7 @@ WYMeditor.WymClassSafari.prototype.keyup = function(e) {
     if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a', 'span']) > -1) {
       name = container.parentNode.tagName.toLowerCase();
     }
-    
+
     if(name == WYMeditor.BODY || name == WYMeditor.DIV) {
       wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //fix #110 for DIV
     }

data/public/javascripts/wymeditor/lang/pt-br.js

@@ -1,46 +1,47 @@
 WYMeditor.STRINGS['pt-BR'] = {
-  Bold: 'Negrito',
-	Strong:			 'Resaltar',
-	Emphasis:		 'Itálico',
-	Superscript:		'Sobre escrito',
-	Subscript:		'Sub escrito ',
-	Ordered_List:	 'Lista ordenada',
-	Unordered_List:	 'Lista desordenada',
-	Indent:			 'Indentado',
-	Outdent:			'Desidentar',
-	Undo:			 'Desfazer',
-	Redo:			 'Refazer',
-	Link:			 'Link',
-	Unlink:			 'Remover Link',
-	Image:			'Imagem',
-	Table:			'Tabela',
-	HTML:			 'HTML',
-	Paragraph:		'Parágrafo',
-	Heading_1:		'Título 1',
-	Heading_2:		'Título 2',
-	Heading_3:		'Título 3',
-	Heading_4:		'Título 4',
-	Heading_5:		'Título 5',
-	Heading_6:		'Título 6',
-	Preformatted:	 'Preformatado',
-	Blockquote:		 'Citação',
-	Table_Header:	 'Título de tabela',
-	URL:				'URL',
-	Title:			'Título',
+	Bold: 'Negrito',
+	Strong: 'Resaltar',
+	Emphasis: 'Itálico',
+	Superscript: 'Sobre escrito',
+	Subscript: 'Sub escrito ',
+	Ordered_List: 'Lista ordenada',
+	Unordered_List: 'Lista desordenada',
+	Indent: 'Indentado',
+	Outdent: 'Desidentar',
+	Undo: 'Desfazer',
+	Redo: 'Refazer',
+	Link: 'Link',
+	Unlink: 'Remover Link',
+	Image: 'Imagem',
+	Table: 'Tabela',
+	HTML: 'HTML',
+	Paragraph: 'Parágrafo',
+	Heading_1: 'Título 1',
+	Heading_2: 'Título 2',
+	Heading_3: 'Título 3',
+	Heading_4: 'Título 4',
+	Heading_5: 'Título 5',
+	Heading_6: 'Título 6',
+	Preformatted: 'Preformatado',
+	Blockquote: 'Citação',
+	Table_Header: 'Título de tabela',
+	URL: 'URL',
+	Title: 'Título',
 	Alternative_Text: 'Texto alternativo',
-	Caption:			'Legenda',
-	Summary:			'Summary',
-	Number_Of_Rows:	 'Número de linhas',
-	Number_Of_Cols:	 'Número de colunas',
-	Submit:			 'Enviar',
-	Cancel:			 'Cancelar',
-	Choose:			 'Selecionar',
-	Preview:			'Previsualizar',
-	Paste_From_Word:	'Copiar do Word',
-	Tools:			'Ferramentas',
-	Containers:		 'Conteneiners',
-	Classes:			'Classes',
-	Status:			 'Estado',
-	Source_Code:		'Código fonte'
+	Caption: 'Legenda',
+	Summary: 'Summary',
+	Number_Of_Rows: 'Número de linhas',
+	Number_Of_Cols: 'Número de colunas',
+	Insert: 'Inserir',
+	Submit: 'Enviar',
+	Cancel: 'Cancelar',
+	Choose: 'Selecionar',
+	Preview: 'Previsualizar',
+	Paste_From_Word: 'Copiar do Word',
+	Tools: 'Ferramentas',
+	Containers: 'Conteneiners',
+	Classes: 'Classes',
+	Status: 'Estado',
+	Source_Code: 'Código fonte',
+	Css_Class: 'Aplicar classe CSS'
 };
-

data/public/stylesheets/refinery/refinery.css

@@ -117,8 +117,8 @@ hr {
   border: 1px solid red !important;
   background-color: #FFECF0 !important;
 }
-.fieldWithErrors iframe {
-  border: 1px solid red !important;
+.fieldWithErrors iframe, .fieldWithErrors .wym_box {
+  border-color: red !important;
 }
 #message, #flash {
   padding: 8px 8px 8px 30px;
@@ -557,7 +557,7 @@ pre {
 }
 .pagination {
   background-color: #C9DAE2;
-  padding: 7px;
+  padding: 5px 5px 4px 5px;
   margin: 10px 0px;
 }
 .pagination .disabled {
@@ -787,17 +787,19 @@ body.dialog form {
   font-weight: bold;
 }
 .dialog #dialog_menu_left {
+  position: fixed;
+  left: 12px;
+  top: 9px;
   width: 130px;
-  float: left;
-  margin-top: 9px;
 }
 .dialog #dialog_main {
   float: left;
+  margin-left: 130px;
   min-height: 405px;
-  width: 756px;
+  width: 696px;
 }
-.wym_dialog_table{
-	height:250px;
+.wym_dialog_table {
+	height: 250px;
 }
 .dialog #existing_image_content {
   position: relative;
@@ -811,7 +813,7 @@ body.dialog form {
 .dialog #existing_image_area_content ul li {
   list-style: none;
   padding: 0px;
-  margin: 0px 6px;
+  margin: 0px 2px 0px 0px;
   float: left;
   height: 114px;
   max-height: 114px;
@@ -828,6 +830,9 @@ body.dialog form {
 .dialog #existing_image_area_content ul li.selected img {
   border: 4px solid #22A7F2;
 }
+.dialog #existing_image_size_area {
+  margin-top: 18px;
+}
 .dialog #existing_image_size_area ul {
   margin: 0px;
   padding: 10px 0px 0px 0px;
@@ -862,24 +867,12 @@ body.dialog form {
 .dialog #existing_image_size_area #image_dialog_size_2 a { height: 70px; width: 70px; line-height: 70px; margin-top:-10px}
 .dialog #existing_image_size_area #image_dialog_size_3 a { height: 90px; width: 90px; line-height: 90px; margin-top:-20px}
 
-
-/*
-#dialog_main {
-  position: relative;
-}
-*/
-#existing_image_area_content {
-  height: 238px;
-}
-#existing_image_area .pagination {
-  background: #FFF;
-  /*bottom: 0px;*/
-  /*right: 0px;*/
-  text-align: right;
-  float: right;
-  /*position: absolute;*/
+#dialog_main .pagination {
   margin: 0px;
-  width: 763px;
+  position: fixed;
+  bottom: 5px;
+  right: 12px;
+  z-index: 1000;
 }
 #upload_image_area, #upload_resource_area {
   padding: 12px;
@@ -895,7 +888,7 @@ body.dialog form {
   width: 100%;
 }
 #dialog_main #pages_list ul {
-  margin: 12px 24px 24px 12px;
+  margin: 0px 12px 0px 12px;
   padding: 0px;
 }
 #dialog_main #pages_list ul li {
@@ -1109,6 +1102,12 @@ a#toggle_advanced_options:hover {
   margin-top: 10px;
   height: 45px;
 }
+.dialog .dialog_area {
+  margin-bottom: 45px;
+}
+.dialog .dialog_area > div > .field label:first-child, .dialog .dialog_area > div > label:first-child {
+  margin-top: 0px;
+}
 .wym_dialog .form-actions, #content.form-actions.dialog-form-actions, .ui-dialog .form-actions {
   margin-top: 16px;
 }
@@ -1132,7 +1131,7 @@ a#toggle_advanced_options:hover {
   position: relative;
 }
 #dialog_container #content .form-actions, .ui-dialog .form-actions, .dialog_container .form-actions {
-  position: absolute;
+  position: fixed;
   bottom: 0px;
   left: 0px;
   right: 0px;
@@ -1153,14 +1152,14 @@ textarea.wymeditor {
   padding: 12px;
 }
 ul#image_grid {
-  width: 670px;/*580px;*/
+  width: 100%;
   padding: 0px;
   margin: 10px 0px 15px 0px;
 }
 ul#image_grid li {
   position: relative;
   float: left;
-  margin: 0px 12px 12px 0px;
+  margin: 0px 7px 12px 0px;
   padding: 0px;
   width: 124px;
   text-align: center;
@@ -1169,6 +1168,10 @@ ul#image_grid li {
   max-width: 124px;
   max-height: 165px;
 }
+ul#image_grid li.image_4 {
+  margin-left: 1px;
+  margin-right: 0px;
+}
 #records ul#image_grid li .actions {
   top: auto;
   bottom: 0px;
@@ -1399,15 +1402,15 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
 }
 #page_container, .wym_box {
   border-radius-bottom: 5px;
-  -webkit-border-radius-bottom-left: 5px;
-  -webkit-border-radius-bottom-right: 5px;
+  -moz-border-radius-bottomleft: 5px;
+  -moz-border-radius-bottomright: 5px;
   -webkit-border-bottom-left-radius: 5px;
   -webkit-border-bottom-right-radius: 5px;
 }
 .wym_iframe iframe {
   border-radius-bottom: 2px;
-  -webkit-border-radius-bottom-left: 2px;
-  -webkit-border-radius-bottom-right: 2px;
+  -moz-border-radius-bottomleft: 2px;
+  -moz-border-radius-bottomright: 2px;
   -webkit-border-bottom-left-radius: 2px;
   -webkit-border-bottom-right-radius: 2px;
 }