zena 1.2.7 → 1.2.8

data/test/unit/zena/use/upload_test.rb

@@ -20,27 +20,29 @@ class UploadTest < Zena::View::TestCase
 
       context 'to a file too large' do
         setup do
-          @params = {'attachment_url' => "http://apod.nasa.gov/apod/image/0901/gcenter_hstspitzer_big.jpg"}
+          #@params = {'attachment_url' => 'http://apod.nasa.gov/apod/image/0901/gcenter_hstspitzer_big.jpg'}
+          @params = {'attachment_url' => 'http://upload.wikimedia.org/wikipedia/commons/f/f4/360-degree_Panorama_of_the_Southern_Sky.jpg'}
         end
 
         should 'return an error about file being too big, without a download' do
           file, error = get_attachment
           assert_nil file
-          assert_equal 'size (10.9 MB) too big to fetch url', error
+          assert_equal 'size (18 MB) too big to fetch url', error
         end
       end
 
-      context 'to a file without size' do
-        setup do
-          @params = {'attachment_url' => "http://prdownload.berlios.de/zena/zena_playground.zip"}
-        end
-
-        should 'return an error about missing content length' do
-          file, error = get_attachment
-          assert_nil file
-          assert_equal 'unknown size: cannot fetch url', error
-        end
-      end
+      # this test is not reproductible: need to find an improper configurered HTTP server...
+      # context 'to a file without size' do
+      #   setup do
+      #     @params = {'attachment_url' => "http://prdownload.berlios.de/zena/zena_playground.zip"}
+      #   end
+      # 
+      #   should 'return an error about missing content length' do
+      #     file, error = get_attachment
+      #     assert_nil file
+      #     assert_equal 'unknown size: cannot fetch url', error
+      #   end
+      # end
 
 
       context 'that is not valid' do

data/test/unit/zena/use/urls_test.rb

@@ -33,6 +33,7 @@ class UrlsTest < Zena::View::TestCase
     node = secure!(Node) { nodes(:status) }
     assert_equal '/en/projects-list/Clean-Water-project/page22.html', zen_path(node)
     assert_equal '/en/projects-list/Clean-Water-project/page22_test.html', zen_path(node, :mode=>'test')
+    assert_equal '/en/projects-list/Clean-Water-project/page22.html', zen_path(node, :mode=>'')
   end
 
   def test_zen_path_custom_base_with_accents

data/vendor/plugins/ar_mysql_full_text/lib/ar_mysql_full_text.rb

@@ -5,22 +5,30 @@ module ActiveRecord
   class SchemaDumper #:nodoc:
       # modifies index support for MySQL full text indexes
       def indexes(table, stream)
-        indexes = @connection.indexes(table)
-        indexes.each do |index|
-          if index.kind_of?(ActiveRecord::ConnectionAdapters::MySQLIndexDefinition) && index.index_type == 'FULLTEXT'
-            stream.puts <<RUBY
-  if Zena::Db.adapter == 'mysql'
-    execute "ALTER TABLE #{index.table} ENGINE = MyISAM"
-    execute "CREATE #{index.index_type} INDEX #{index.name} ON #{index.table} (#{index.columns.join(',')})"
-  end
-RUBY
-          else
-            stream.print "  add_index #{index.table.inspect}, #{index.columns.inspect}, :name => #{index.name.inspect}"
-            stream.print ", :unique => true" if index.unique
-            stream.puts
+        if (indexes = @connection.indexes(table)).any?
+          add_index_statements = indexes.map do |index|
+            if index.kind_of?(ActiveRecord::ConnectionAdapters::MySQLIndexDefinition) && index.index_type == 'FULLTEXT'
+              %Q{
+    if Zena::Db.adapter == 'mysql'
+      execute "ALTER TABLE #{index.table} ENGINE = MyISAM"
+      execute "CREATE #{index.index_type} INDEX #{index.name} ON #{index.table} (#{index.columns.join(',')})"
+    end
+  }
+            else
+              statment_parts = [ ('add_index ' + index.table.inspect) ]
+              statment_parts << index.columns.inspect
+              statment_parts << (':name => ' + index.name.inspect)
+              statment_parts << ':unique => true' if index.unique
+
+              index_lengths = index.lengths.compact if index.lengths.is_a?(Array)
+              statment_parts << (':length => ' + Hash[*index.columns.zip(index.lengths).flatten].inspect) if index_lengths.present?
+
+              '  ' + statment_parts.join(', ')
+            end
           end
+          stream.puts add_index_statements.sort.join("\n")
+          stream.puts
         end
-        stream.puts unless indexes.empty?
       end
   end
 end
@@ -29,38 +37,44 @@ end
 module ActiveRecord
   module ConnectionAdapters
 
-    class MySQLIndexDefinition < Struct.new(:table, :name, :unique, :columns, :index_type) #:nodoc:
+    class MySQLIndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :index_type) #:nodoc:
     end
     class MysqlAdapter
       # Now you can write
+      alias o_add_index add_index
       # add_index(:posts, :text, :index_type=>'FULLTEXT')
       def add_index(table_name, column_name, options = {})
-        column_names = Array(column_name)
-        index_name   = index_name(table_name, :column => column_names)
+        if options[:index_type]
+          column_names = Array(column_name)
+          index_name   = index_name(table_name, :column => column_names)
 
-        if Hash === options # legacy support, since this param was a string
-          index_type = options[:unique] ? "UNIQUE" : (options[:index_type] || "")
-          index_name = options[:name] || index_name
+          if Hash === options # legacy support, since this param was a string
+            index_type = options[:unique] ? "UNIQUE" : (options[:index_type] || "")
+            index_name = options[:name] || index_name
+          else
+            index_type = options
+          end
+          quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
+          execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{table_name} (#{quoted_column_names})"
         else
-          index_type = options
+          o_add_index(table_name, column_name, options)
         end
-        quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
-        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{table_name} (#{quoted_column_names})"
       end
 
       def indexes(table_name, name = nil)#:nodoc:
         indexes = []
         current_index = nil
-        execute("SHOW KEYS FROM #{table_name}", name).each do |row|
+        execute("SHOW KEYS FROM #{quote_table_name(table_name)}", name).each do |row|
           if current_index != row[2]
             next if row[2] == "PRIMARY" # skip the primary key
             current_index = row[2]
             index_type = row[10]
             index_type = '' if index_type == 'BTREE'
-            indexes << MySQLIndexDefinition.new(row[0], row[2], row[1] == "0", [], index_type)
+            indexes << MySQLIndexDefinition.new(row[0], row[2], row[1] == "0", [], [], index_type)
           end
 
           indexes.last.columns << row[4]
+          indexes.last.lengths << row[7]
         end
         indexes
       end

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.7"
+  s.version = "1.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-08-16}
+  s.date = %q{2014-08-18}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -288,6 +288,7 @@ Gem::Specification.new do |s|
     "bricks/acls/zena/migrate/20110627193757_add_allowed_mode_and_format_to_acl.rb",
     "bricks/acls/zena/migrate/20130313110443_add_create_kpath_to_acl.rb",
     "bricks/acls/zena/migrate/20130429073432_fix_create_kpath_default.rb",
+    "bricks/acls/zena/migrate/20130903150356_longer_names_for_acl.rb",
     "bricks/acls/zena/test/integration/acl_integration_test.rb",
     "bricks/acls/zena/test/sites/erebus/acls.yml",
     "bricks/acls/zena/test/sites/erebus/groups.yml",
@@ -306,6 +307,8 @@ Gem::Specification.new do |s|
     "bricks/captcha/lib/bricks/captcha.rb",
     "bricks/captcha/zena/init.rb",
     "bricks/captcha/zena/test/zafu/captcha.yml",
+    "bricks/currency/lib/bricks/currency.rb",
+    "bricks/currency/zena/test/unit/currency_test.rb",
     "bricks/fs_skin/lib/bricks/fs_skin.rb",
     "bricks/fs_skin/zena/migrate/20110702010330_add_fs_skin_to_idx_templates.rb",
     "bricks/fs_skin/zena/skins/blog/Image-edit.zafu",
@@ -328,6 +331,7 @@ Gem::Specification.new do |s|
     "bricks/fs_skin/zena/tasks.rb",
     "bricks/fs_skin/zena/test/integration/fs_skin_integration_test.rb",
     "bricks/fs_skin/zena/test/unit/fs_skin_test.rb",
+    "bricks/fs_skin/zena/test/unit/fs_skin_view_test.rb",
     "bricks/grid/lib/bricks/grid.rb",
     "bricks/math/lib/bricks/math.rb",
     "bricks/math/zena/init.rb",
@@ -405,6 +409,14 @@ Gem::Specification.new do |s|
     "bricks/zena/zena/migrate/20130617164527_add_master_id_to_site.rb",
     "bricks/zena/zena/migrate/20130712081512_alter_login_users.rb",
     "bricks/zena/zena/migrate/20130715171232_rename_orphan_and_root_in_site.rb",
+    "bricks/zena/zena/migrate/20130829093753_add_versioned_flag_to_column.rb",
+    "bricks/zena/zena/migrate/20130903084909_count_login_attempts.rb",
+    "bricks/zena/zena/migrate/20131104153126_index_fullpath.rb",
+    "bricks/zena/zena/migrate/20131104210011_rebuild_fullpath_after_change.rb",
+    "bricks/zena/zena/migrate/20131105160420_add_skin_id_to_sites.rb",
+    "bricks/zena/zena/migrate/20131105175822_add_profile_to_users.rb",
+    "bricks/zena/zena/migrate/20140213120038_fix_idx_scope.rb",
+    "bricks/zena/zena/migrate/20140628140247_add_site_readonly.rb",
     "config/boot.rb",
     "config/bricks.yml",
     "config/database_example.yml",
@@ -1973,6 +1985,7 @@ Gem::Specification.new do |s|
     "test/integration/xml_api_test.rb",
     "test/integration/zafu_compiler/action.yml",
     "test/integration/zafu_compiler/ajax.yml",
+    "test/integration/zafu_compiler/alias_site.yml",
     "test/integration/zafu_compiler/apphelper.yml",
     "test/integration/zafu_compiler/asset.yml",
     "test/integration/zafu_compiler/basic.yml",
@@ -2167,95 +2180,6 @@ Gem::Specification.new do |s|
     "test/unit/zena/use/zafu_template_test.rb",
     "test/unit/zena/use/zazen_test.rb",
     "test/unit/zena/workflow/status_version_test.rb",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run 2.tmCommand",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run Context.tmCommand",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run Focused Should.tmCommand",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run.tmCommand",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Commands/YAML to Shoulda.tmCommand",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Preferences/Symbol List: Context.tmPreferences",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Preferences/Symbol List: Should.tmPreferences",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory attributes for.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory build.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_define with class.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_define.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_next.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/Factory_sequence.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_bad_value.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_contains.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_does_not_contain.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_good_value.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_same_elements.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_save.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_sent_email.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/assert_valid.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/association.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/attribute.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/before_should block.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/context block get.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/context block post.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/context block with setup.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/setup.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should block with before proc.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should block.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_allow_values_for.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_assign_to.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_be_restful denied.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_be_restful.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_belong_to.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_change by.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_change from to.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_length_at_least.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_length_in_range.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_length_is.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_ensure_value_in_range.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_eventually.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_filter_params.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_and_belong_to_many.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_class_methods.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_db_column.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_db_columns.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_index.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_indices.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_instance_methods.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_many.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_named_scope.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_one.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_have_readonly_attributes.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_allow_mass_assignment_of.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_allow_values_for.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_assign_to.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_change.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_not_set_the_flash.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_redirect_to.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_a_form.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_template.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_with_layout.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_render_without_layout.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_respond_with.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_respond_with_content_type.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_return_from_session.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_route.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_set_the_flash_to.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_acceptance_of.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_numericality_of.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_presence_of.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_uniqueness_of with scope.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Snippets/should_validate_uniqueness_of.tmSnippet",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/catch_exception.rb",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/run_script.rb",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/stdin_dialog.rb",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/test.rb",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Support/RubyMate/todo.txt",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Support/bin/yaml_to_shoulda.rb",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/Syntaxes/Ruby on Rails (Shoulda).tmLanguage",
-    "vendor/TextMate/Ruby Shoulda.tmbundle/info.plist",
-    "vendor/TextMate/Zena.tmbundle/Commands/Run all yaml tests.tmCommand",
-    "vendor/TextMate/Zena.tmbundle/Commands/Run focused yaml test.tmCommand",
-    "vendor/TextMate/Zena.tmbundle/Support/RubyMate/catch_exception.rb",
-    "vendor/TextMate/Zena.tmbundle/Support/RubyMate/run_script.rb",
-    "vendor/TextMate/Zena.tmbundle/Support/RubyMate/stdin_dialog.rb",
-    "vendor/TextMate/Zena.tmbundle/info.plist",
     "vendor/apache2_upload_progress/MIT-LICENSE",
     "vendor/apache2_upload_progress/README",
     "vendor/apache2_upload_progress/mod_upload_progress.c",
@@ -2300,171 +2224,6 @@ Gem::Specification.new do |s|
     "vendor/plugins/rjs-assertions/README",
     "vendor/plugins/rjs-assertions/init.rb",
     "vendor/plugins/rjs-assertions/lib/rjs-assertions.rb",
-    "vendor/plugins/selenium-on-rails/CHANGELOG",
-    "vendor/plugins/selenium-on-rails/LICENSE-2.0.txt",
-    "vendor/plugins/selenium-on-rails/README.md",
-    "vendor/plugins/selenium-on-rails/Rakefile",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumController.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumHelper.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/FixtureLoader.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/PartialsSupport.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Paths.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/RSelenese.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Renderer.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/Selenese.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/SuiteRenderer.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilder.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderAccessors.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderActions.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderUserAccessors.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRails/TestBuilderUserActions.html",
-    "vendor/plugins/selenium-on-rails/doc/classes/SeleniumOnRailsConfig.html",
-    "vendor/plugins/selenium-on-rails/doc/files/CHANGELOG.html",
-    "vendor/plugins/selenium-on-rails/doc/files/README.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/controllers/selenium_controller_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_helper_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/acceptance_test_runner_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/fixture_loader_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/partials_support_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/paths_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/renderer_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/rselenese_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/selenese_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/suite_renderer_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/test_builder_accessors_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/test_builder_actions_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails/test_builder_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails_config_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/files/lib/selenium_on_rails_rb.html",
-    "vendor/plugins/selenium-on-rails/doc/fr_class_index.html",
-    "vendor/plugins/selenium-on-rails/doc/fr_file_index.html",
-    "vendor/plugins/selenium-on-rails/doc/fr_method_index.html",
-    "vendor/plugins/selenium-on-rails/doc/index.html",
-    "vendor/plugins/selenium-on-rails/doc/rdoc-style.css",
-    "vendor/plugins/selenium-on-rails/generators/selenium/USAGE",
-    "vendor/plugins/selenium-on-rails/generators/selenium/selenium_generator.rb",
-    "vendor/plugins/selenium-on-rails/generators/selenium/templates/rhtml.rhtml",
-    "vendor/plugins/selenium-on-rails/generators/selenium/templates/rselenese.rhtml",
-    "vendor/plugins/selenium-on-rails/generators/selenium/templates/selenese.rhtml",
-    "vendor/plugins/selenium-on-rails/init.rb",
-    "vendor/plugins/selenium-on-rails/lib/controllers/selenium_controller.rb",
-    "vendor/plugins/selenium-on-rails/lib/controllers/switch_environment_controller.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_helper.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/acceptance_test_runner.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/fixture_loader.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/partials_support.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/paths.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/renderer.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/rselenese.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/selenese.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/suite_renderer.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_accessors.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_actions.rb",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_user_accessors.rb.example",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails/test_builder_user_actions.rb.example",
-    "vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb",
-    "vendor/plugins/selenium-on-rails/lib/views/layouts/layout.rhtml",
-    "vendor/plugins/selenium-on-rails/lib/views/record.rhtml",
-    "vendor/plugins/selenium-on-rails/lib/views/selenium_helper.rb",
-    "vendor/plugins/selenium-on-rails/lib/views/setup.rhtml",
-    "vendor/plugins/selenium-on-rails/lib/views/test_suite.rhtml",
-    "vendor/plugins/selenium-on-rails/routes.rb",
-    "vendor/plugins/selenium-on-rails/selenium-core/Blank.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/InjectedRemoteRunner.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/RemoteRunner.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/SeleniumLog.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/TestPrompt.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/TestRunner-splash.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/TestRunner.hta",
-    "vendor/plugins/selenium-on-rails/selenium-core/TestRunner.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/domviewer/butmin.gif",
-    "vendor/plugins/selenium-on-rails/selenium-core/domviewer/butplus.gif",
-    "vendor/plugins/selenium-on-rails/selenium-core/domviewer/domviewer.css",
-    "vendor/plugins/selenium-on-rails/selenium-core/domviewer/domviewer.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/domviewer/selenium-domviewer.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/all.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/continue.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/continue_disabled.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/pause.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/pause_disabled.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/selected.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/step.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/icons/step_disabled.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/iedoc-core.xml",
-    "vendor/plugins/selenium-on-rails/selenium-core/iedoc.xml",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/cssQuery-p.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level2.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-level3.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery-standard.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/cssQuery/src/cssQuery.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/prototype.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/builder.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/controls.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/dragdrop.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/effects.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/scriptaculous.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/slider.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/scriptaculous/unittest.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/lib/snapsie.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/find_matching_child.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/htmlutils.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/injection.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-api.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserbot.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-browserdetect.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-commandhandlers.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-executionloop.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-logging.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-remoterunner.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-testrunner.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/selenium-version.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-doc.html",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-element.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/ui-map-sample.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/user-extensions.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/user-extensions.js.sample",
-    "vendor/plugins/selenium-on-rails/selenium-core/scripts/xmlextras.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/selenium-logo.png",
-    "vendor/plugins/selenium-on-rails/selenium-core/selenium-test.css",
-    "vendor/plugins/selenium-on-rails/selenium-core/selenium.css",
-    "vendor/plugins/selenium-on-rails/selenium-core/xpath/dom.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/xpath/javascript-xpath-0.1.11.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/xpath/util.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/xpath/xmltoken.js",
-    "vendor/plugins/selenium-on-rails/selenium-core/xpath/xpath.js",
-    "vendor/plugins/selenium-on-rails/tasks/test_acceptance.rake",
-    "vendor/plugins/selenium-on-rails/test/fixtures/config.yml",
-    "vendor/plugins/selenium-on-rails/test/fixtures/selenium.yml",
-    "vendor/plugins/selenium-on-rails/test/paths_test.rb",
-    "vendor/plugins/selenium-on-rails/test/renderer_test.rb",
-    "vendor/plugins/selenium-on-rails/test/rselenese_test.rb",
-    "vendor/plugins/selenium-on-rails/test/selenese_test.rb",
-    "vendor/plugins/selenium-on-rails/test/selenium_controller_test.rb",
-    "vendor/plugins/selenium-on-rails/test/selenium_on_rails_config_test.rb",
-    "vendor/plugins/selenium-on-rails/test/selenium_support_test.rb",
-    "vendor/plugins/selenium-on-rails/test/setup_test.rb",
-    "vendor/plugins/selenium-on-rails/test/suite_renderer_test.rb",
-    "vendor/plugins/selenium-on-rails/test/switch_environment_controller_test.rb",
-    "vendor/plugins/selenium-on-rails/test/test_builder_functions_authortest.rb",
-    "vendor/plugins/selenium-on-rails/test/test_helper.rb",
-    "vendor/plugins/selenium-on-rails/test_data/_partial.rsel",
-    "vendor/plugins/selenium-on-rails/test_data/own_layout.html",
-    "vendor/plugins/selenium-on-rails/test_data/partials/_html.html",
-    "vendor/plugins/selenium-on-rails/test_data/partials/_nesting.rsel",
-    "vendor/plugins/selenium-on-rails/test_data/partials/_rhtml.rhtml",
-    "vendor/plugins/selenium-on-rails/test_data/partials/_rsel.rsel",
-    "vendor/plugins/selenium-on-rails/test_data/partials/_sel.sel",
-    "vendor/plugins/selenium-on-rails/test_data/partials/all_partials.rsel",
-    "vendor/plugins/selenium-on-rails/test_data/rhtml.rhtml",
-    "vendor/plugins/selenium-on-rails/test_data/rselenese.rsel",
-    "vendor/plugins/selenium-on-rails/test_data/selenese.sel",
-    "vendor/plugins/selenium-on-rails/test_data/suite_one/subsuite/suite_one_subsuite_testcase.sel",
-    "vendor/plugins/selenium-on-rails/test_data/suite_one/suite_one_testcase1.sel",
-    "vendor/plugins/selenium-on-rails/test_data/suite_one/suite_one_testcase2.sel",
-    "vendor/plugins/selenium-on-rails/test_data/suite_two/suite_two_testcase.sel",
     "vendor/rails_patches/support_for_inverse_relationships_on_active_record_objects.diff",
     "zena.gemspec",
     "zena_console.rb"
@@ -2479,84 +2238,87 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
       s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.11"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.4"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<httparty>, ["= 0.7.8"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.3"])
       s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
       s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.9"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
     else
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
       s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<open4>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.11"])
+      s.add_dependency(%q<property>, ["= 2.3.4"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<property>, ["= 2.3.3"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<httparty>, ["= 0.7.8"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.3"])
       s.add_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
       s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.9"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
     end
   else
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
     s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<open4>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.11"])
+    s.add_dependency(%q<property>, ["= 2.3.4"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<gettext>, ["= 2.1.0"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<property>, ["= 2.3.3"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
     s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<httparty>, ["= 0.7.8"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.3"])
     s.add_dependency(%q<rails>, ["= 2.3.18"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
     s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.9"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
   end
 end