zena 0.16.3 → 0.16.4

data/test/unit/node_test.rb

@@ -340,7 +340,7 @@ class NodeTest < Zena::Unit::TestCase
     login(:ant)
     node = secure!(Node) { nodes(:cleanWater)  }
     child = node.new_child( :name => 'status', :class => Page )
-    assert ! child.save , "Save fails"
+    assert !child.save, "Save fails"
     assert child.errors[:name].any?
 
     child = node.new_child( :name => 'new_name', :class => Page )
@@ -1442,6 +1442,20 @@ done: \"I am done\""
     assert_equal 'nicePeople', node.name
   end
 
+  def test_sync_name_should_result_on_duplicates
+    login(:tiger)
+    # was in sync, correct lang
+    people = secure!(Node) { nodes(:people) }
+    node = secure!(Page) { Page.create(:v_title => 'nice people', :parent_id => people.parent_id)}
+    assert !node.new_record?
+    assert_equal 'nicePeople', node.name
+    # would sync to 'nicePeople'
+    assert people.update_attributes(:v_title => 'nice people')
+    assert_equal 'people', people.name
+    assert people.publish
+    assert_equal 'nicePeople-1', people.name
+  end
+
   def test_sync_name_before_publish_if_single_version
     login(:ant)
     node = secure!(Node) { Node.create(:v_title => 'Eve', :parent_id => nodes_id(:people)) }

data/test/unit/virtual_class_test.rb

@@ -239,4 +239,110 @@ class VirtualClassTest < Zena::Unit::TestCase
     assert post.update_attributes(:d_foo => 'bar', :d_book => 'Alice In Wonderland')
     assert_equal ["book", "foo", "reading"], post.dyn_attribute_keys
   end
+
+  context 'importing virtual class definitions' do
+    setup do
+      login(:lion)
+    end
+
+    context 'with an existing superclass' do
+      setup do
+        @data = {"Foo" => {'superclass' => 'Page'}}
+      end
+
+      should 'create a new virtual class with the given name' do
+        res = nil
+        assert_difference('VirtualClass.count', 1) do
+          res = secure(VirtualClass) { VirtualClass.import(@data) }
+        end
+        assert_equal 'Foo', res.first.name
+        assert_equal 'new', res.first.import_result
+        assert_equal 'NPF', res.first.kpath
+      end
+
+      context 'and an existing virtual class' do
+        setup do
+          @data = {'Post' => {'superclass' => 'Note'}}
+        end
+
+        should 'update the virtual class if the superclass match' do
+          res = nil
+          assert_difference('VirtualClass.count', 0) do
+            res = secure(VirtualClass) { VirtualClass.import(@data) }
+          end
+          assert_equal 'Post', res.first.name
+          assert_equal 'same', res.first.import_result
+          assert_equal 'NNP', res.first.kpath
+        end
+
+        context 'if the superclasses do not match' do
+          setup do
+            @data['Post']['superclass'] = 'Page'
+          end
+
+          should 'return a conflict error' do
+            res = nil
+            assert_difference('VirtualClass.count', 0) do
+              res = secure(VirtualClass) { VirtualClass.import(@data) }
+            end
+            assert_equal 'Post', res.first.name
+            assert_equal 'conflict', res.first.import_result
+          end
+
+          should 'propagate the conflict error to subclasses in the definitions' do
+            @data['Foo'] = {'superclass' => 'Post'}
+            @data['Bar'] = {'superclass' => 'Foo'}
+            res = nil
+            assert_difference('VirtualClass.count', 0) do
+              res = secure(VirtualClass) { VirtualClass.import(@data) }
+            end
+            post = res.detect {|r| r.name == 'Post'}
+            foo  = res.detect {|r| r.name == 'Foo'}
+            bar  = res.detect {|r| r.name == 'Bar'}
+            assert foo.new_record?
+            assert_equal 'Foo', foo.name
+            assert_equal 'conflict in superclass', foo.import_result
+            assert_equal 'Post', post.name
+            assert_equal 'conflict', post.import_result
+            assert bar.new_record?
+            assert_equal 'Bar', bar.name
+            assert_equal 'conflict in superclass', bar.import_result
+          end
+        end
+      end
+    end # with an existing superclass
+
+    context 'without an existing superclass' do
+      setup do
+        @data = {'Foo' => {'superclass' => 'Baz'}, 'Baz' => {'superclass' => 'Post'}}
+      end
+
+      should 'create the superclass first if it is in the definitions' do
+        res = nil
+        assert_difference('VirtualClass.count', 2) do
+          res = secure(VirtualClass) { VirtualClass.import(@data) }
+        end
+        foo = res.detect {|r| r.name == 'Foo'}
+        baz = res.detect {|r| r.name == 'Baz'}
+        assert_equal 'Foo', foo.name
+        assert_equal 'new', foo.import_result
+        assert_equal 'NNPBF', foo.kpath
+        assert_equal 'Baz', baz.name
+        assert_equal 'new', baz.import_result
+        assert_equal 'NNPB', baz.kpath
+      end
+
+      should 'return an error if the superclass is not in the definitions' do
+        @data.delete('Baz')
+        res = nil
+        assert_difference('VirtualClass.count', 0) do
+          res = secure(VirtualClass) { VirtualClass.import(@data) }
+        end
+        foo = res.first
+        assert_equal 'Foo', foo.name
+        assert_equal 'missing superclass', foo.import_result
+      end
+    end # without an existing superclass
+  end # importing virtual class definitions
+
 end

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

@@ -20,19 +20,19 @@ class UploadTest < Zena::View::TestCase
 
       context 'to a file too large' do
         setup do
-          @params = {'attachment_url' => "http://cdimage.debian.org/debian-cd/5.0.3/i386/iso-cd/debian-503-i386-CD-1.iso"}
+          @params = {'attachment_url' => "http://ftp.acc.umu.se/debian-cd/5.0.4/i386/iso-cd/debian-504-i386-CD-1.iso"}
         end
 
         should 'return an error about file being too big, without a download' do
           file, error = get_attachment
           assert_nil file
-          assert_equal 'size (645.5 MB) too big to fetch url', error
+          assert_equal 'size (645.8 MB) too big to fetch url', error
         end
       end
 
       context 'to a file without size' do
         setup do
-          @params = {'attachment_url' => "http://download.berlios.de/zena/zena_playground.zip"}
+          @params = {'attachment_url' => "http://prdownload.berlios.de/zena/zena_playground.zip"}
         end
 
         should 'return an error about missing content length' do

data/vendor/plugins/gettext_i18n_rails/tasks/gettext_rails_i18n.rake

@@ -18,7 +18,7 @@ namespace :gettext do
 
     if GetText.respond_to? :update_pofiles_org
       GetText.update_pofiles_org(
-        "app",
+        "zena",
         Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml}"),
         "version 0.0.1",
         :po_root => 'locale',
@@ -37,8 +37,8 @@ namespace :gettext do
 
       #parse files.. (models are simply parsed as ruby files)
       GetText.update_pofiles(
-        "app",
-        Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml}"),
+        "zena",
+        Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml,rhtml}"),
         "version 0.0.1",
         'locale'
       )

data/zena.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "0.16.3"
+  s.version = "0.16.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-01-19}
+  s.date = %q{2010-02-22}
   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}
@@ -151,7 +151,6 @@ Gem::Specification.new do |s|
      "app/views/links/create.rjs",
      "app/views/links/destroy.rjs",
      "app/views/links/show.rjs",
-     "app/views/nodes/404.html",
      "app/views/nodes/500.html",
      "app/views/nodes/_dates.rhtml",
      "app/views/nodes/_edit_attribute.rhtml",
@@ -188,6 +187,7 @@ Gem::Specification.new do |s|
      "app/views/relations/show.rjs",
      "app/views/relations/update.rjs",
      "app/views/search/_form.rhtml",
+     "app/views/sites/404.html",
      "app/views/sites/_form.erb",
      "app/views/sites/_li.erb",
      "app/views/sites/clear_cache.rjs",
@@ -395,19 +395,11 @@ Gem::Specification.new do |s|
      "doc/template/cache/STYLE",
      "doc/template/cache/URL",
      "doc/zafu_changes.yml",
-     "lib/base_additions.rb",
      "lib/bricks.rb",
      "lib/bricks/loader.rb",
      "lib/bricks/requirements_validation.rb",
-     "lib/comment_query.rb",
-     "lib/core_ext/date_time.rb",
-     "lib/core_ext/dir.rb",
-     "lib/core_ext/fixnum.rb",
-     "lib/core_ext/string.rb",
      "lib/exif_data.rb",
-     "lib/fix_rails_layouts.rb",
      "lib/gettext_strings.rb",
-     "lib/image_builder.rb",
      "lib/log_recorder/lib/log_recorder.rb",
      "lib/log_recorder/test/log_recorder_test.rb",
      "lib/parser.rb",
@@ -415,7 +407,6 @@ Gem::Specification.new do |s|
      "lib/tasks/zena.rake",
      "lib/tasks/zena.rb",
      "lib/upload_progress_server.rb",
-     "lib/webdav_adapter.rb",
      "lib/zafu/action.rb",
      "lib/zafu/ajax.rb",
      "lib/zafu/attributes.rb",
@@ -442,8 +433,14 @@ Gem::Specification.new do |s|
      "lib/zena/acts/multiversion.rb",
      "lib/zena/acts/secure.rb",
      "lib/zena/app.rb",
+     "lib/zena/base_additions.rb",
      "lib/zena/code_syntax.rb",
      "lib/zena/controller/test_case.rb",
+     "lib/zena/core_ext/date_time.rb",
+     "lib/zena/core_ext/dir.rb",
+     "lib/zena/core_ext/file_utils.rb",
+     "lib/zena/core_ext/fixnum.rb",
+     "lib/zena/core_ext/string.rb",
      "lib/zena/crypto_provider/initial.rb",
      "lib/zena/db.rb",
      "lib/zena/deploy.rb",
@@ -458,6 +455,7 @@ Gem::Specification.new do |s|
      "lib/zena/deploy/vhost.rhtml",
      "lib/zena/deploy/vhost_www.rhtml",
      "lib/zena/fix/mysql_connection.rb",
+     "lib/zena/fix_rails_layouts.rb",
      "lib/zena/foxy_parser.rb",
      "lib/zena/info.rb",
      "lib/zena/migrator.rb",
@@ -480,8 +478,11 @@ Gem::Specification.new do |s|
      "lib/zena/use/grid.rb",
      "lib/zena/use/html_tags.rb",
      "lib/zena/use/i18n.rb",
+     "lib/zena/use/image_builder.rb",
      "lib/zena/use/nested_attributes_alias.rb",
-     "lib/zena/use/node_query_finders.rb",
+     "lib/zena/use/query_comment.rb",
+     "lib/zena/use/query_node.rb",
+     "lib/zena/use/query_node_finders.rb",
      "lib/zena/use/refactor.rb",
      "lib/zena/use/relations.rb",
      "lib/zena/use/rendering.rb",
@@ -492,6 +493,9 @@ Gem::Specification.new do |s|
      "lib/zena/use/zafu.rb",
      "lib/zena/use/zazen.rb",
      "lib/zena/view/test_case.rb",
+     "lib/zena/webdav_adapter.rb",
+     "locale/de/LC_MESSAGES/zena.mo",
+     "locale/de/zena.po",
      "locale/en/LC_MESSAGES/zena.mo",
      "locale/en/zena.po",
      "locale/fr/LC_MESSAGES/zena.mo",
@@ -502,9 +506,11 @@ Gem::Specification.new do |s|
      "public/calendar/calendar-setup.js",
      "public/calendar/calendar.js",
      "public/calendar/iconCalendar.gif",
+     "public/calendar/lang/calendar-de-utf8.js",
      "public/calendar/lang/calendar-en-utf8.js",
      "public/calendar/lang/calendar-fr-utf8.js",
      "public/calendar/lang/lang.zip",
+     "public/calendar/menuarrow.gif",
      "public/dispatch.cgi",
      "public/dispatch.fcgi",
      "public/dispatch.rb",
@@ -1629,6 +1635,7 @@ Gem::Specification.new do |s|
      "test/fixtures/files/translations_de.yml",
      "test/fixtures/files/translations_fr.yml",
      "test/fixtures/files/tree.jpg",
+     "test/fixtures/files/vclasses.yml",
      "test/fixtures/files/water.pdf",
      "test/fixtures/import/photos.en.zml",
      "test/fixtures/import/photos/bird.jpg",
@@ -1657,12 +1664,12 @@ Gem::Specification.new do |s|
      "test/functional/users_controller_test.rb",
      "test/functional/versions_controller_test.rb",
      "test/functional/virtual_classes_controller_test.rb",
-     "test/helpers/node_query/basic.yml",
-     "test/helpers/node_query/comments.yml",
-     "test/helpers/node_query/complex.yml",
-     "test/helpers/node_query/filters.yml",
-     "test/helpers/node_query/relations.yml",
-     "test/helpers/node_query_test.rb",
+     "test/helpers/query_node/basic.yml",
+     "test/helpers/query_node/comments.yml",
+     "test/helpers/query_node/complex.yml",
+     "test/helpers/query_node/filters.yml",
+     "test/helpers/query_node/relations.yml",
+     "test/helpers/query_node_test.rb",
      "test/integration/multiple_hosts_test.rb",
      "test/integration/multiversion_test.rb",
      "test/integration/navigation_test.rb",
@@ -1873,7 +1880,6 @@ Gem::Specification.new do |s|
      "vendor/apache2_upload_progress/README",
      "vendor/apache2_upload_progress/mod_upload_progress.c",
      "vendor/apache_upload/mod_upload_progress.c",
-     "vendor/bricks/20070122-172926.txt",
      "vendor/plugins/ar_mysql_full_text/README",
      "vendor/plugins/ar_mysql_full_text/init.rb",
      "vendor/plugins/ar_mysql_full_text/lib/ar_mysql_full_text.rb",
@@ -1905,7 +1911,8 @@ Gem::Specification.new do |s|
      "vendor/plugins/rjs-assertions/init.rb",
      "vendor/plugins/rjs-assertions/lib/rjs-assertions.rb",
      "vendor/rails_patches/support_for_inverse_relationships_on_active_record_objects.diff",
-     "zena.gemspec"
+     "zena.gemspec",
+     "zena_console.rb"
   ]
   s.homepage = %q{http://zenadmin.org}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -1935,7 +1942,7 @@ Gem::Specification.new do |s|
      "test/functional/users_controller_test.rb",
      "test/functional/versions_controller_test.rb",
      "test/functional/virtual_classes_controller_test.rb",
-     "test/helpers/node_query_test.rb",
+     "test/helpers/query_node_test.rb",
      "test/integration/multiple_hosts_test.rb",
      "test/integration/multiversion_test.rb",
      "test/integration/navigation_test.rb",
@@ -2028,11 +2035,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_runtime_dependency(%q<gettext>, ["= 1.93.0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<rmagick>, [">= 2.11.1"])
+      s.add_runtime_dependency(%q<rmagick>, [">= 2.10.0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, [">= 0.1.1"])
       s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 0.5.6"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 0.5.8"])
     else
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
@@ -2051,11 +2058,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_dependency(%q<gettext>, ["= 1.93.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rmagick>, [">= 2.11.1"])
+      s.add_dependency(%q<rmagick>, [">= 2.10.0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<differ>, [">= 0.1.1"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<querybuilder>, ["= 0.5.6"])
+      s.add_dependency(%q<querybuilder>, ["= 0.5.8"])
     end
   else
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
@@ -2075,11 +2082,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
     s.add_dependency(%q<gettext>, ["= 1.93.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rmagick>, [">= 2.11.1"])
+    s.add_dependency(%q<rmagick>, [">= 2.10.0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<differ>, [">= 0.1.1"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<querybuilder>, ["= 0.5.6"])
+    s.add_dependency(%q<querybuilder>, ["= 0.5.8"])
   end
 end
 

data/zena_console.rb

@@ -0,0 +1,33 @@
+require 'test/test_helper'
+require "authlogic/test_case"
+require 'hpricot'
+
+include Zena::Acts::Secure
+
+module Console
+
+  include Zena::Use::Fixtures
+  include Zena::Use::TestHelper
+  include Zena::Acts::Secure
+  include ::Authlogic::TestCase
+
+
+  def controller
+    @controller ||= Authlogic::TestCase::MockController.new
+  end
+
+  def setup_authlogic
+    Authlogic::Session::Base.controller = (@request && Authlogic::TestCase::RailsRequestAdapter.new(@request)) || controller
+  end
+
+
+  def visitor
+    Thread.current[:visitor]
+  end
+
+  module_function :controller, :activate_authlogic, :login, :users, :versions, :visitor
+
+end
+
+Console.activate_authlogic
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 +01:00
+date: 2010-02-22 00:00:00 +01:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,7 +190,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.11.1
+        version: 2.10.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
@@ -230,7 +230,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.6
+        version: 0.5.8
     version: 
 description: 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).
 email: gaspard@teti.ch
@@ -374,7 +374,6 @@ files:
 - app/views/links/create.rjs
 - app/views/links/destroy.rjs
 - app/views/links/show.rjs
-- app/views/nodes/404.html
 - app/views/nodes/500.html
 - app/views/nodes/_dates.rhtml
 - app/views/nodes/_edit_attribute.rhtml
@@ -411,6 +410,7 @@ files:
 - app/views/relations/show.rjs
 - app/views/relations/update.rjs
 - app/views/search/_form.rhtml
+- app/views/sites/404.html
 - app/views/sites/_form.erb
 - app/views/sites/_li.erb
 - app/views/sites/clear_cache.rjs
@@ -618,19 +618,11 @@ files:
 - doc/template/cache/STYLE
 - doc/template/cache/URL
 - doc/zafu_changes.yml
-- lib/base_additions.rb
 - lib/bricks.rb
 - lib/bricks/loader.rb
 - lib/bricks/requirements_validation.rb
-- lib/comment_query.rb
-- lib/core_ext/date_time.rb
-- lib/core_ext/dir.rb
-- lib/core_ext/fixnum.rb
-- lib/core_ext/string.rb
 - lib/exif_data.rb
-- lib/fix_rails_layouts.rb
 - lib/gettext_strings.rb
-- lib/image_builder.rb
 - lib/log_recorder/lib/log_recorder.rb
 - lib/log_recorder/test/log_recorder_test.rb
 - lib/parser.rb
@@ -638,7 +630,6 @@ files:
 - lib/tasks/zena.rake
 - lib/tasks/zena.rb
 - lib/upload_progress_server.rb
-- lib/webdav_adapter.rb
 - lib/zafu/action.rb
 - lib/zafu/ajax.rb
 - lib/zafu/attributes.rb
@@ -665,8 +656,14 @@ files:
 - lib/zena/acts/multiversion.rb
 - lib/zena/acts/secure.rb
 - lib/zena/app.rb
+- lib/zena/base_additions.rb
 - lib/zena/code_syntax.rb
 - lib/zena/controller/test_case.rb
+- lib/zena/core_ext/date_time.rb
+- lib/zena/core_ext/dir.rb
+- lib/zena/core_ext/file_utils.rb
+- lib/zena/core_ext/fixnum.rb
+- lib/zena/core_ext/string.rb
 - lib/zena/crypto_provider/initial.rb
 - lib/zena/db.rb
 - lib/zena/deploy.rb
@@ -681,6 +678,7 @@ files:
 - lib/zena/deploy/vhost.rhtml
 - lib/zena/deploy/vhost_www.rhtml
 - lib/zena/fix/mysql_connection.rb
+- lib/zena/fix_rails_layouts.rb
 - lib/zena/foxy_parser.rb
 - lib/zena/info.rb
 - lib/zena/migrator.rb
@@ -703,8 +701,11 @@ files:
 - lib/zena/use/grid.rb
 - lib/zena/use/html_tags.rb
 - lib/zena/use/i18n.rb
+- lib/zena/use/image_builder.rb
 - lib/zena/use/nested_attributes_alias.rb
-- lib/zena/use/node_query_finders.rb
+- lib/zena/use/query_comment.rb
+- lib/zena/use/query_node.rb
+- lib/zena/use/query_node_finders.rb
 - lib/zena/use/refactor.rb
 - lib/zena/use/relations.rb
 - lib/zena/use/rendering.rb
@@ -715,6 +716,9 @@ files:
 - lib/zena/use/zafu.rb
 - lib/zena/use/zazen.rb
 - lib/zena/view/test_case.rb
+- lib/zena/webdav_adapter.rb
+- locale/de/LC_MESSAGES/zena.mo
+- locale/de/zena.po
 - locale/en/LC_MESSAGES/zena.mo
 - locale/en/zena.po
 - locale/fr/LC_MESSAGES/zena.mo
@@ -725,9 +729,11 @@ files:
 - public/calendar/calendar-setup.js
 - public/calendar/calendar.js
 - public/calendar/iconCalendar.gif
+- public/calendar/lang/calendar-de-utf8.js
 - public/calendar/lang/calendar-en-utf8.js
 - public/calendar/lang/calendar-fr-utf8.js
 - public/calendar/lang/lang.zip
+- public/calendar/menuarrow.gif
 - public/dispatch.cgi
 - public/dispatch.fcgi
 - public/dispatch.rb
@@ -1852,6 +1858,7 @@ files:
 - test/fixtures/files/translations_de.yml
 - test/fixtures/files/translations_fr.yml
 - test/fixtures/files/tree.jpg
+- test/fixtures/files/vclasses.yml
 - test/fixtures/files/water.pdf
 - test/fixtures/import/photos.en.zml
 - test/fixtures/import/photos/bird.jpg
@@ -1880,12 +1887,12 @@ files:
 - test/functional/users_controller_test.rb
 - test/functional/versions_controller_test.rb
 - test/functional/virtual_classes_controller_test.rb
-- test/helpers/node_query/basic.yml
-- test/helpers/node_query/comments.yml
-- test/helpers/node_query/complex.yml
-- test/helpers/node_query/filters.yml
-- test/helpers/node_query/relations.yml
-- test/helpers/node_query_test.rb
+- test/helpers/query_node/basic.yml
+- test/helpers/query_node/comments.yml
+- test/helpers/query_node/complex.yml
+- test/helpers/query_node/filters.yml
+- test/helpers/query_node/relations.yml
+- test/helpers/query_node_test.rb
 - test/integration/multiple_hosts_test.rb
 - test/integration/multiversion_test.rb
 - test/integration/navigation_test.rb
@@ -2096,7 +2103,6 @@ files:
 - vendor/apache2_upload_progress/README
 - vendor/apache2_upload_progress/mod_upload_progress.c
 - vendor/apache_upload/mod_upload_progress.c
-- vendor/bricks/20070122-172926.txt
 - vendor/plugins/ar_mysql_full_text/README
 - vendor/plugins/ar_mysql_full_text/init.rb
 - vendor/plugins/ar_mysql_full_text/lib/ar_mysql_full_text.rb
@@ -2129,6 +2135,7 @@ files:
 - vendor/plugins/rjs-assertions/lib/rjs-assertions.rb
 - vendor/rails_patches/support_for_inverse_relationships_on_active_record_objects.diff
 - zena.gemspec
+- zena_console.rb
 has_rdoc: true
 homepage: http://zenadmin.org
 licenses: []
@@ -2179,7 +2186,7 @@ test_files:
 - test/functional/users_controller_test.rb
 - test/functional/versions_controller_test.rb
 - test/functional/virtual_classes_controller_test.rb
-- test/helpers/node_query_test.rb
+- test/helpers/query_node_test.rb
 - test/integration/multiple_hosts_test.rb
 - test/integration/multiversion_test.rb
 - test/integration/navigation_test.rb