[Ruby 1.9.3] Upgrade to work w/ Ruby 1.9.3

* Use mysql2 v0.3.10 gem - Fixes issues with Lion/Ruby 1.9.3 bugs. * Setup the test database automatically each time `rake test` is run. * Fix issue with where temp files were written out as absolute paths. * Write todo plan for 3.4 release.

Author: peakpg

Gemfile.lock

@@ -89,7 +89,7 @@ GEM
  mocha (0.9.8)
  rake
  multi_json (1.0.3)
- mysql2 (0.3.7)
+ mysql2 (0.3.10)
  nokogiri (1.5.0)
  polyglot (0.3.2)
  rack (1.3.3)
@@ -128,7 +128,7 @@ GEM
  sprockets (2.0.0)
  hike (~> 1.2)
  rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
+ tilt (~> 1.1, != 1.3.0)
  sqlite3 (1.3.4)
  sqlite3-ruby (1.3.3)
  sqlite3 (>= 1.3.3)

Rakefile

@@ -50,7 +50,7 @@ Cucumber::Rake::Task.new(:features) do |t|
 end
 
 desc 'Runs all the tests'
-task :test do
+task :test => 'app:test:prepare' do
  tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration features)
  errors = tests_to_run.collect do |task|
  begin

doc/release_notes.md

@@ -1,6 +1,8 @@
 v3.4.0
 ======
 
+Recommend using Ruby 1.9.3 with this release.
+
 Add the ability to add BrowserCMS to Rails projects.
 * Add bcms install method that will add browsercms to an existing Rails project.
 * Most core files in the CMS are namespaced under Cms:: . This should reduce the chance of conflicting classes (i.e. what was User is now Cms::User)

features/support/debugging.rb

@@ -3,6 +3,7 @@
 
 module LaunchBrokenTests
  LAUNCH = false
+
  def launch_broken_tests
  LAUNCH
  end
@@ -22,10 +23,14 @@ def launch_broken_tests
 end
 
 
-require File.expand_path(File.join(__FILE__, "..", "..", "..","test", "mock_file"))
+require File.expand_path(File.join(__FILE__, "..", "..", "..", "test", "mock_file"))
 module FileOperations
 
- def create_file(file_name, text="Test Content")
+ # Creates an 'uploaded' file block at a given relative path
+ # @param [String] relative_file_path A relative file path (i.e. /test.txt) for the uploaded block.
+ def create_file(relative_file_path, text="Test Content")
+ # We are creating a temp file with no path, so strip leading slash
+ file_name = relative_file_path.gsub(/^\//, "")
  tempfile = Tempfile.new file_name do |f|
  f << text
  end

todo_list.markdown

@@ -1,18 +1,22 @@
 Working on bcms 3.4
 
+# Short Term
+
+* Get 3.4 ready for release
+* Test upgrading from Rails 3.1 project
+* Use new migration behavior for engines
+* Differ `bundle install` from happening until Gemfile is updated to include bcms
+
 # Needs
 
 * Email a page portlet doesn't work (throws error when you create one) - Add scenarios
 * Tag Cloud portlet doesn't work (throws error when you create one) - Add scenarios
-* Differ `bundle install` from happening until Gemfile is updated to include bcms
-* Improve Performance - Sitemap and serving pages is particularly slow
-** Use Ancestry gem - It handles automatically turning models into tree via a single column. Would be very very performant in comparison to current behavior.
 * Update a few modules (like bcms_news) to test module generation
 * Test this on a production environment prior to releasing (things like assets and/or config options might be wonky)
 * Rework a few modules to work with Rails 3.1
 * Review the README for accuracy in light of engines and asset pipeline
 
-# Wants (Taking advantage of 3.1)
+# Wants (Taking advantage of Rails 3.1)
 
 * Add Block.publish and publish! for easier coding. (or just make default for blocks to be published via code and not via UI)
 * Verify that instances of Acts::As::ContentPage in projects can correctly load CMS templates
@@ -38,6 +42,11 @@ Working on bcms 3.4
 * Move 'datepicker' initialization into application.js
 * Upgrade jquery.selectbox-0.5 to jquery.sb.js (https://github.com/revsystems/jQuery-SelectBox). This will likely improve the usability of the selectbox.
 
+# 3.5 Planned Features
+
+* Improve Performance - Sitemap and serving pages is particularly slow
+** Use Ancestry gem - It handles automatically turning models into tree via a single column. Would be very very performant in comparison to current behavior.
+
 ## New Features
 
 * Make templating better through the UI