zena 1.2.3 → 1.2.4

data/test/integration/zafu_compiler/relations.yml

@@ -33,7 +33,7 @@ icon:
     node: 'cleanWater'
   src: "<r:icon do='title'/>"
   tem: "/ORDER BY links.id DESC/"
-  res: "it's a lake"
+  res: "it&#39;s a lake"
 
 pages:
   context:
@@ -91,7 +91,7 @@ pages_random:
 
 nodes_in_project:
   src: "<r:nodes in='project' limit='2'><r:each join=', '><r:show attr='title'/></r:each></r:nodes>"
-  res: "it's a lake, Lake Tanganyika"
+  res: "it&#39;s a lake, Lake Tanganyika"
 
 nodes_in_project_stored:
   src: "<r:void set_foo='this'><r:node where='id = 29 in site'>from <r:show attr='title'/>, look at <r:foo do='title'/>: <r:foo do='pages in project' do='each' join=', ' do='title'/></r:node></r:void>"
@@ -289,7 +289,7 @@ projects:
 
 nodes:
   src: "<r:nodes in='project'><r:each join=', ' do='show' attr='title'/></r:nodes>"
-  res: "it's a lake, Lake Tanganyika, parc opening, status title, water"
+  res: "it&#39;s a lake, Lake Tanganyika, parc opening, status title, water"
 
 menu_with_favorites:
   context:
@@ -348,7 +348,7 @@ where:
 
 where_like:
   src: "<r:images where='title like \"%ke\"' in='site' do='each' join=',' do='title'/>"
-  res: "it's a lake"
+  res: "it&#39;s a lake"
 
 else:
   src: "<r:nodes where='id = 1' in='site' else='[this]' do='each' join=',' do='title'/>"
@@ -363,7 +363,7 @@ where_not:
   context:
     node: 'cleanWater'
   src: "<r:nodes where='title ne \"status title\"' do='each' join=',' do='title'/>"
-  res: "it's a lake,Lake Tanganyika,parc opening,water"
+  res: "it&#39;s a lake,Lake Tanganyika,parc opening,water"
 
 where_two_attributes:
   src: "<r:nodes where='log_at ne event_at' in='site' do='each' join=', ' do='title'/>"
@@ -373,7 +373,7 @@ where_two_attributes:
 many_or:
   # old: or='images in site' or='tags in site'
   src: "<r:tagged in='site or images in site or tags in site' do='each' join=',' do='title'/>"
-  res: "Art,bird,Clean Water project,flower,it's a lake,News list,parc opening,Top menu"
+  res: "Art,bird,Clean Water project,flower,it&#39;s a lake,News list,parc opening,Top menu"
 
 hot_or_page:
   context:
@@ -405,11 +405,11 @@ group_by_project_sort_zip:
   context:
     visitor: ant
   src: "<r:images in='site' order='zip ASC' do='group' by='project' sort='id'><b do='project' do='title'/>: <r:each join=', ' do='title'/></r:images>"
-  res: "<b>Clean Water project</b>: it's a lake<b>a wiki with Zena</b>: bird, flower<b>Zena the wild CMS</b>: Autumn Tree"
+  res: "<b>Clean Water project</b>: it&#39;s a lake<b>a wiki with Zena</b>: bird, flower<b>Zena the wild CMS</b>: Autumn Tree"
 
 group_by_parent_sort:
   src: "<r:images in='site' order='title ASC' do='group' by='parent' sort='title'><b do='parent' do='title'/>: <r:each join=', ' do='title'/></r:images>"
-  res: "<b>a wiki with Zena</b>: bird, flower<b>Clean Water project</b>: it's a lake"
+  res: "<b>a wiki with Zena</b>: bird, flower<b>Clean Water project</b>: it&#39;s a lake"
 
 nodes_in_site_group_by_year:
   old_src: "<r:nodes in='site' group='log_at:year' order='log_at:year asc, title ASC' do='each' join=', '><r:show attr='log_at' format='%Y'/></r:nodes>"

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -96,7 +96,7 @@ map_join:
     node: 'cleanWater'
   src: "<r:children do='map(\"title\").join(\",\")'/>"
   tem: "/var1.map\{\|_map_obj\| _map_obj.prop\['title'\]\}/"
-  res: "crocodiles,it's a lake,The lake we love,parc opening,status title,water"
+  res: "crocodiles,it&#39;s a lake,The lake we love,parc opening,status title,water"
 
 sum:
   context:
@@ -145,7 +145,12 @@ range:
     x: 4
   src: "<r:void do='(0..params[:x].to_i).to_a'><span do='each' join=' ' do='this'/></r:void>"
   res: '<span>0</span> <span>1</span> <span>2</span> <span>3</span> <span>4</span>'
-  
+
+range_literal:
+  src: "<r:void do='(0..4).to_a'><span do='each' join=' ' do='this'/></r:void>"
+  tem: '/\(0..4\)/'
+  res: '<span>0</span> <span>1</span> <span>2</span> <span>3</span> <span>4</span>'
+    
 hash_to_params:
   context:
     q:

data/test/integration/zafu_compiler/urls.yml

@@ -187,10 +187,19 @@ encode_params:
       b: 'Bee'
     c: 'Sea'
     x: ''
-  src: "<r:link encode_params='a,c,x,y'/>"
-  tem: "/:encode_params => \"a,c,x,y\"/"
+  src: "<r:link encode_params='a,c,x,y,mode'/>"
+  tem: "/:encode_params => \"a,c,x,y,mode\"/"
   res: "/page22\.html\?a%5Bb%5D=Bee&c=Sea'/"
 
+encode_params_mode:
+  context:
+    mode: 'print'
+    a: 'Sea'
+    b: ''
+  src: "<r:link encode_params='a,b,mode'/>"
+  tem: "/:encode_params => \"a,b,mode\"/"
+  res: "/page22_print\.html\?a=Sea'/"
+
 title_link_mode:
   old_src: "<h2 do='title' link='details'/>"
   src: "<h2 do='link' mode='details' do='title' live='true'/>"
@@ -264,7 +273,19 @@ target_blank:
 
 action_destroy:
   src: "<r:link action='destroy'/>"
-  res: "<a data-confirm='Destroy status title ?' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
+  res: "<a data-confirm='Destroy \"status title\" ?' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
+
+action_destroy_message_apos:
+  context:
+    p: "O'Hear"
+  src: "<r:link action='destroy' confirm='#{params[:p]}'/>"
+  res: "<a data-confirm='O&apos;Hear' href='/nodes/22' onclick='return Zena.m(this,\"delete\")'>status title</a>"
+
+action_destroy_message_apos_remote:
+  context:
+    p: "O'Hear"
+  src: "<div id='foo' do='block'></div><r:link action='destroy' confirm='#{params[:p]}' update='foo'/>"
+  res: "/confirm\(this.getAttribute\(.data-confirm.\)\)/"
 
 action_publish:
   src: "<r:link action='publish'/>"

data/test/integration/zafu_compiler/zazen.yml

@@ -125,4 +125,12 @@ target:
   src: |
     <r:zazen text='"":12' target="foobar"/>
   tem: /:target => "foobar"/
-  res: /<div class='zazen'><p><a .* target=\"foobar\"/
+  res: /<div class='zazen'><p><a .* target=\"foobar\"/
+
+notextile_not_auth:
+  src: "<r:zazen text='<notextile>hello</notextile>'/>"
+  res: "<div class='zazen'></div>"
+
+notextile_auth:
+  src: "<r:zazen notextile='true' text='<notextile>hello\nblah\nblah</notextile>'/>"
+  res: "<div class='zazen'>hello\nblah\nblah</div>"

data/test/selenium/Destroy/destroy1.rsel

@@ -4,11 +4,12 @@ verify_element_not_present 'destroy_destroy1'
 
 click 'css=img[alt=add]'
 type 'destroy_list1_title', 'destroy1'
+type 'destroy_list1_summary', 'destroy1'
 click 'css=input[type=submit]'
 wait_for_element_present 'destroy_destroy1'
 
 click 'css=#destroy_destroy1 a'
-assert_confirmation 'Destroy destroy1 ?'
+assert_confirmation 'Destroy "destroy1" ?'
 wait_for_element_not_present 'destroy_destroy1'
 
 # Reload

data/test/selenium/Destroy/destroy2.rsel

@@ -0,0 +1,17 @@
+# Add first element
+open '/oo/testnode37.html?test=destroy1'
+verify_element_not_present 'destroy_destroy2'
+
+click 'css=img[alt=add]'
+type 'destroy_list1_title', "rock'n rol\"l"
+type 'destroy_list1_summary', 'destroy2'
+click 'css=input[type=submit]'
+wait_for_element_present 'destroy_destroy2'
+
+click 'css=#destroy_destroy2 a'
+assert_confirmation 'Destroy "rock\'n rol"l" ?'
+wait_for_element_not_present 'destroy_destroy2'
+
+# Reload
+open '/oo/testnode37.html?test=destroy2'
+verify_element_not_present 'destroy_destroy2'

data/test/unit/document_test.rb

@@ -7,19 +7,32 @@ class DocumentTest < Zena::Unit::TestCase
     should 'return self on unknown content_type' do
       class Dummy < Document
       end
-      assert_equal Dummy, Dummy.document_class_from_content_type('zorglub')
+      assert_equal 'DocumentTest::Dummy', Dummy.document_class_from_content_type('zorglub').to_s
     end
 
     should 'return Image on image types' do
-      assert_equal Image, Document.document_class_from_content_type('image/png')
+      assert_equal 'Image', Document.document_class_from_content_type('image/png').to_s
     end
     
     should 'not return Image on svg' do
-      assert_equal TextDocument, Document.document_class_from_content_type('image/svg+xml')
+      assert_equal 'TextDocument', Document.document_class_from_content_type('image/svg+xml').to_s
     end
 
     should 'return TextDocument on nil' do
-      assert_equal TextDocument, Document.document_class_from_content_type(nil)
+      assert_equal 'TextDocument', Document.document_class_from_content_type(nil).to_s
+    end
+    
+    should 'return matching content_type sub-class' do
+      login(:lion)
+      secure(VirtualClass) {
+        VirtualClass.create(
+          :superclass      => 'TextDocument',
+          :name            => 'HtmlDoc',
+          :create_group_id => groups_id(:public), 
+          :content_type    => 'text/html'
+        )}
+      assert_equal VirtualClass['HtmlDoc'], Document.document_class_from_content_type('text/html')  
+      assert_equal VirtualClass['TextDocument'], Document.document_class_from_content_type('text/plain')
     end
   end
 

data/test/unit/relation_proxy_test.rb

@@ -572,22 +572,33 @@ class RelationProxyTest < Zena::Unit::TestCase
     subject do
       node = secure(Node) { nodes(:cleanWater)}
     end
-
-    setup do
+    
+    should 'update with string list of ids' do
       login(:lion)
       node = secure(Node) { nodes(:cleanWater)}
       assert_difference('Link.count', 3) do
-        node.update_attributes_with_transformation('reference_ids' => [:art, :menu, :bird_jpg].map {|s| nodes_zip(s)})
+        node.update_attributes_with_transformation('reference_ids' => [:art, :menu, :bird_jpg].map {|s| nodes_zip(s)}.join(', '))
       end
     end
+    
+    context 'updating' do
 
-    should 'use other_id to update status' do
-      assert_difference('Link.count', 0) do
-        assert subject.update_attributes_with_transformation('rel' => {'reference' => {'other_id' => nodes_zip(:art), :status => 100}})
-        err subject
+      setup do
+        login(:lion)
+        node = secure(Node) { nodes(:cleanWater)}
+        assert_difference('Link.count', 3) do
+          node.update_attributes_with_transformation('reference_ids' => [:art, :menu, :bird_jpg].map {|s| nodes_zip(s)})
+        end
       end
 
-      assert_equal 100, subject.find(:first, 'reference where l_status = 100').l_status
+      should 'use other_id to update status' do
+        assert_difference('Link.count', 0) do
+          assert subject.update_attributes_with_transformation('rel' => {'reference' => {'other_id' => nodes_zip(:art), :status => 100}})
+          err subject
+        end
+
+        assert_equal 100, subject.find(:first, 'reference where l_status = 100').l_status
+      end
     end
   end # With many links
 end

data/test/unit/string_hash_test.rb

@@ -12,7 +12,7 @@ class StringHashTest < Test::Unit::TestCase
     end
     
     should 'convert to json' do
-      assert_match %r{"json_class":"StringHash",\{"data":\{"b":"2","a":"1"|"a":"1","b":"2"\}\}|\{"data":\{"b":"2","a":"1"|"a":"1","b":"2"\},"json_class":"StringHash"\}}, subject.to_json
+      assert_match %r{"json_class":"StringHash","data":\{"b":"2","a":"1"|"a":"1","b":"2"\}|"data":\{"b":"2","a":"1"|"a":"1","b":"2"\},"json_class":"StringHash"}, subject.to_json
     end
     
     should 'create from json' do

data/test/unit/template_test.rb

@@ -123,7 +123,7 @@ class TemplateTest < Zena::Unit::TestCase
 
       context 'with a blank title' do
         subject do
-          secure(Template) { Template.create(:parent_id=>nodes_id(:default), :target_klass => 'Section') }
+          secure(Template) { Template.create(:parent_id => nodes_id(:default), :target_klass => 'Section') }
         end
 
         should 'use target_klass as title' do
@@ -198,9 +198,9 @@ class TemplateTest < Zena::Unit::TestCase
           secure!(Document) { Document.create(:parent_id => nodes_id(:default), :title => 'sub.html')}
         end
 
-        should 'create a Template' do
+        should 'create a TextDocument' do
           assert !subject.new_record?
-          assert_kind_of Template, subject
+          assert_kind_of TextDocument, subject
         end
       end # with an html extension
 

data/test/unit/virtual_class_test.rb

@@ -60,6 +60,17 @@ class VirtualClassTest < Zena::Unit::TestCase
     assert !classes_for_form.include?("Page")
     assert !classes_for_form.include?("Reference")
   end
+  
+  def test_sub_classes
+    # add a sub class
+    login(:lion)
+    vclass = VirtualClass.create(:superclass => 'Post', :name => 'Super', :create_group_id => groups_id(:public))
+    assert !vclass.new_record?
+
+    login(:anon)
+    
+    assert_equal %w{Post Super}, VirtualClass['Post'].sub_classes.map(&:name)
+  end
 
   def test_post_classes_for_form_opt
     # add a sub class
@@ -808,8 +819,74 @@ class VirtualClassTest < Zena::Unit::TestCase
     should 'consider role methods as safe' do
       assert_equal Hash[:class=>String, :method=>"prop['assigned']", :nil=>true], subject.safe_method_type(['assigned'])
     end
+    
+    # with content_type
+    #
   end # A virtual class
+  
+  context 'Creating a virtual class' do
+    context 'with an admin visitor' do
+      setup do
+        login(:lion)
+      end
+      
+      context 'with content_type' do
+        subject do
+          {
+            :superclass      => 'Document',
+            :name            => 'HtmlDoc',
+            :create_group_id => groups_id(:public), 
+            :content_type    => 'text/html'}
+        end
+
+        should 'save and create regexp' do
+          v = secure(VirtualClass) { VirtualClass.new(subject) }
+          assert v.save
+          assert_equal %r{^text/html$}, v.content_type_re
+        end
+        
+        should 'add an error on bad content_type' do
+          v = secure(VirtualClass) { VirtualClass.new(subject.merge(:content_type => '(')) }
+          assert !v.save
+          assert_equal 'invalid characters', v.errors[:content_type]
+        end
+        
+      end
+    end
+  end
+  
+  context 'A Virtual class' do
+    context 'subclass of Document with content_type' do
+      setup do
+        login(:lion)
+      end
+      
+      context 'with content_type' do
+        subject do
+          secure(VirtualClass) {
+            VirtualClass.create(
+              :superclass      => 'TextDocument',
+              :name            => 'HtmlDoc',
+              :create_group_id => groups_id(:public), 
+              :content_type    => 'text/html'
+            )}
+        end
 
+        should 'be used to create matching content_type documents' do
+          klass = subject
+          n = secure!(Document) { Document.create(
+                :parent_id    => nodes_id(:cleanWater),
+                :content_type => 'text/html',
+                :file         => uploaded_text('some.txt'))
+          }
+              
+          assert !n.new_record?
+          assert_equal subject.name, n.klass
+        end
+      end
+    end
+  end
+  
   context 'A visitor with write access' do
     setup do
       login(:tiger)

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

@@ -53,6 +53,14 @@ class UrlsTest < Zena::View::TestCase
     assert_equal '/en/projects-list/Clean-Water-project/page22.html?a%5Bb%5D=Bee&p=Pepe', zen_path(node, :encode_params => 'p,a')
   end
 
+  def test_zen_path_query_params_array
+    login(:anon)
+    node = secure!(Node) { nodes(:status) }
+    assert_equal '/en/projects-list/Clean-Water-project/page22.html?p=5', zen_path(node, :p => 5)
+    @params = {'p' => 'Pepe', 'b' => ['','bee','c','','dee']}
+    assert_equal '/en/projects-list/Clean-Water-project/page22.html?b%5B%5D=bee&b%5B%5D=c&b%5B%5D=dee&p=Pepe', zen_path(node, :encode_params => 'p,b')
+  end
+
   def test_zen_path_cache_stamp
     login(:ant)
     node = secure!(Node) { nodes(:zena) }
@@ -127,7 +135,7 @@ class UrlsTest < Zena::View::TestCase
   end
 
   def test_data_path_for_public_documents
-    login(:ant)
+    login(:lion)
     node = secure!(Node) { nodes(:water_pdf) }
     assert_equal "/en/projects-list/Clean-Water-project/document25.pdf", data_path(node)
     node = secure!(Node) { nodes(:status) }

data/vendor/plugins/selenium-on-rails/lib/selenium_on_rails_config.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'safe_yaml'
 require 'erb'
 
 class SeleniumOnRailsConfig

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "1.2.3"
+  s.version = "1.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-03-11}
+  s.date = %q{2013-06-13}
   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}
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
     "app/models/group.rb",
     "app/models/idx_nodes_datetime.rb",
     "app/models/idx_nodes_float.rb",
+    "app/models/idx_nodes_integer.rb",
     "app/models/idx_nodes_ml_string.rb",
     "app/models/idx_nodes_string.rb",
     "app/models/idx_project.rb",
@@ -285,6 +286,8 @@ Gem::Specification.new do |s|
     "bricks/acls/zena/init.rb",
     "bricks/acls/zena/migrate/20110509141600_create_acls.rb",
     "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/test/integration/acl_integration_test.rb",
     "bricks/acls/zena/test/sites/erebus/acls.yml",
     "bricks/acls/zena/test/sites/erebus/groups.yml",
@@ -2011,6 +2014,7 @@ Gem::Specification.new do |s|
     "test/selenium/Add/add3.rsel",
     "test/selenium/Destroy/0setup.rsel",
     "test/selenium/Destroy/destroy1.rsel",
+    "test/selenium/Destroy/destroy2.rsel",
     "test/selenium/Drop/0setup.rsel",
     "test/selenium/Drop/drop1.rsel",
     "test/selenium/Drop/drop2.rsel",
@@ -2473,84 +2477,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<rails>, ["= 2.3.11"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 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<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.1"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
       s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.8"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<httparty>, ["= 0.7.8"])
+      s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
       s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
     else
-      s.add_dependency(%q<rails>, ["= 2.3.11"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
       s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<gem_plugin>, [">= 0"])
       s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<property>, ["= 2.3.2"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<open4>, [">= 0"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+      s.add_dependency(%q<rails>, ["= 2.3.18"])
       s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<gettext>, ["= 2.1.0"])
-      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<rubyless>, ["= 0.8.8"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<property>, ["= 2.3.2"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
       s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-      s.add_dependency(%q<httparty>, ["= 0.7.8"])
+      s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
       s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<gettext>, ["= 2.1.0"])
     end
   else
-    s.add_dependency(%q<rails>, ["= 2.3.11"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.1"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
     s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<gem_plugin>, [">= 0"])
     s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<property>, ["= 2.3.2"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<open4>, [">= 0"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
+    s.add_dependency(%q<rails>, ["= 2.3.18"])
     s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<gettext>, ["= 2.1.0"])
-    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<rubyless>, ["= 0.8.8"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<property>, ["= 2.3.2"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
     s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
-    s.add_dependency(%q<httparty>, ["= 0.7.8"])
+    s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
     s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<gettext>, ["= 2.1.0"])
   end
 end