zena 1.2.5 → 1.2.6

data/test/integration/query_node/filters.yml

@@ -83,6 +83,14 @@ filter_through_links:
   sql: "/.*li1.source_id = nodes.id.*li2.source_id = nodes.id.*jn1\.zip = 33 AND jn2\.zip = 22/"
   res: "Clean Water project"
 
+filter_through_many_links:
+  context:
+    params:
+      ids: '33,22'
+  src: "projects where set_tag.id in (#{params[:ids].split(',')}) in site"
+  sql: "/AND jn1.zip IN \(\?\)/"
+  res: "Clean Water project"
+
 filter_with_fullpath:
   # Get all objects under a given node (node the '/' to avoid self)
   src: "nodes where fullpath like \"#{fullpath}/%\" in site order by fullpath"

data/test/integration/query_node/relations.yml

@@ -81,4 +81,24 @@ project_as_blog:
   # Should scope by path
   # This is the same as "project where class like Blog"
   src: "Blog:project"
-  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NPPB%' AND nodes.id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
+  sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.kpath LIKE 'NPPB%' AND nodes.id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
+
+from_root:
+  context:
+    site: alias
+  src: nodes from root limit 3
+  res: 'people, projects list, Collections'
+  
+from_home:
+  context:
+    site: alias
+  src: nodes from home limit 3
+  res: 'bird, flower'
+
+# openging in art(33) and news(34)
+having_on_relation_count:
+  context:
+    params:
+      ids: '33,34'
+  src: 'tagged from tag select id.count as t_count where id in (#{params[:ids].split(",")}) in site having t_count = #{params[:ids].split(",").size}'
+  res: 'super ouverture'

data/test/integration/query_node_test.rb

@@ -38,8 +38,8 @@ class QueryNodeTest < Zena::Unit::TestCase
       params[k.to_sym] = v
     end
 
-    $_test_site = params[:site] || 'zena'
-    login @context[:visitor].to_sym
+    $_test_site = @context[:site] || 'zena'
+    login(@context[:visitor].to_sym, $_test_site)
 
     @context[:rubyless_helper] = self
     defaults = (@context[:default] ||= {})

data/test/integration/zafu_compiler/context.yml

@@ -28,4 +28,11 @@ master_template_on_static_render:
 
 login_info:
   src: "<r:contacts in='site'><r:each do='login_info'><r:login/>, </r:each></r:contacts>"
-  res: "lion, tiger, ant, , "
+  res: "lion, tiger, ant, , "
+
+home_compiled_to_project:
+  context:
+    site: alias
+  src: "<r:home do='collaborators'/>"
+  # project_has_collaborators => home resolved as project during compilation
+  tem: '/links.relation_id = 540144154/'

data/test/integration/zafu_compiler_test.rb

@@ -98,7 +98,7 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     end
 
     context = yt_get('context', file, test)
-    site = sites(context.delete('site') || 'zena')
+    site = Site.setup_master(sites(context.delete('site') || 'zena'))
     $_test_site = site.name
     @request.host = site.host
 

data/test/sites/zena/sites.yml

@@ -1,7 +1,7 @@
 zena:
   host:            test.host
-  orphan:          zena
   root:            zena
+  home:            zena
   anon:            anon
   public_group:    public
   site_group:      workers
@@ -20,8 +20,8 @@ zena:
 alias:
   master:          zena
   host:            alias.host
-  orphan:          zena
-  root:            wiki
+  root:            zena
+  home:            wiki
   anon:            anon
   public_group:    public
   site_group:      workers

data/test/unit/site_test.rb

@@ -400,7 +400,11 @@ class SiteTest < Zena::Unit::TestCase
     end
     
     should 'return alias root node' do
-      assert_equal nodes_id(:wiki), subject.root_id
+      assert_equal nodes_id(:zena), subject.root_id
+    end
+    
+    should 'return alias home node' do
+      assert_equal nodes_id(:wiki), subject.home_id
     end
   end
   

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

@@ -20,13 +20,13 @@ class UploadTest < Zena::View::TestCase
 
       context 'to a file too large' do
         setup do
-          @params = {'attachment_url' => "http://zenadmin.org/zena_playground.zip"}
+          @params = {'attachment_url' => "http://apod.nasa.gov/apod/image/0901/gcenter_hstspitzer_big.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 (631.6 MB) too big to fetch url', error
+          assert_equal 'size (10.9 MB) too big to fetch url', error
         end
       end
 

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-07-15}
+  s.date = %q{2013-08-16}
   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}
@@ -404,6 +404,7 @@ Gem::Specification.new do |s|
     "bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb",
     "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",
     "config/boot.rb",
     "config/bricks.yml",
     "config/database_example.yml",
@@ -2478,87 +2479,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<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
       s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
       s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<property>, ["= 2.3.3"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
       s.add_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<tzinfo>, [">= 0"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_dependency(%q<daemons>, [">= 0"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
-      s.add_dependency(%q<property>, ["= 2.3.2"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<open4>, [">= 0"])
+      s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
     s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<property>, ["= 2.3.3"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
     s.add_dependency(%q<gettext>, ["= 2.1.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<differ>, ["= 0.1.2"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<tzinfo>, [">= 0"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<rails>, ["= 2.3.18"])
-    s.add_dependency(%q<daemons>, [">= 0"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
-    s.add_dependency(%q<property>, ["= 2.3.2"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<open4>, [">= 0"])
+    s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -15,69 +15,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-15 00:00:00 +02:00
+date: 2013-08-16 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: rubyless
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 43
         segments: 
-        - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 8
+        - 10
+        version: 0.8.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: versions
+  name: yamltest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: yamltest
+  name: property
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
+        - 2
+        - 3
+        - 3
+        version: 2.3.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: simple_xlsx_writer
+  name: httmultiparty
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 8
+        version: 0.3.8
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -97,115 +99,115 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: daemons
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 12
-        version: 2.3.12
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: safe_yaml
+  name: differ
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 31
         segments: 
         - 0
-        - 8
-        - 0
-        version: 0.8.0
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: differ
+  name: syntax
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
-        - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: tzinfo
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: authlogic
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 3
+        version: 2.1.3
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: querybuilder
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 2
+        version: 1.2.2
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: authlogic
+  name: json
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 1
         segments: 
-        - 2
         - 1
-        - 3
-        version: 2.1.3
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: tzinfo
+  name: hpricot
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -219,115 +221,117 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: fast_gettext
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 16
+        version: 0.4.16
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: simple_xlsx_writer
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
+        version: "0"
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: httmultiparty
+  name: ruby-recaptcha
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
+        - 1
         - 0
         - 3
-        - 8
-        version: 0.3.8
+        version: 1.0.3
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: versions
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 33
+        hash: 17
         segments: 
-        - 2
-        - 10
+        - 0
         - 3
-        version: 2.10.3
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: safe_yaml
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 63
         segments: 
-        - 2
-        - 3
-        - 18
-        version: 2.3.18
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: rails
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 39
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 18
+        version: 2.3.18
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: fast_gettext
+  name: RedCloth
   prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 15
         segments: 
+        - 3
         - 0
         - 4
-        - 16
-        version: 0.4.16
+        version: 3.0.4
   type: :runtime
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: gem_plugin
+  name: open4
   prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
@@ -341,83 +345,79 @@ dependencies:
   type: :runtime
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: ruby-recaptcha
+  name: will_paginate
   prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 27
         segments: 
-        - 1
-        - 0
+        - 2
         - 3
-        version: 1.0.3
+        - 12
+        version: 2.3.12
   type: :runtime
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: querybuilder
+  name: gem_plugin
   prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id023
 - !ruby/object:Gem::Dependency 
-  name: rubyless
+  name: uuidtools
   prerelease: false
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 15
         segments: 
+        - 2
         - 0
-        - 8
-        - 10
-        version: 0.8.10
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id024
 - !ruby/object:Gem::Dependency 
-  name: syntax
+  name: shoulda
   prerelease: false
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 33
         segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        - 2
+        - 10
+        - 3
+        version: 2.10.3
   type: :runtime
   version_requirements: *id025
 - !ruby/object:Gem::Dependency 
-  name: property
+  name: jeweler
   prerelease: false
   requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id026
 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).
@@ -815,6 +815,7 @@ files:
 - bricks/zena/zena/migrate/20120904071601_change_link_status_to_float.rb
 - 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
 - config/boot.rb
 - config/bricks.yml
 - config/database_example.yml