zena 1.1.3 → 1.2.0

data/test/fixtures/files/TestNode.zafu

@@ -3,7 +3,7 @@
     <title do='title_for_layout' do='show' attr='title' name='page_title'>page title</title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <r:void name='stylesheets'>
-      <r:stylesheets media='all' list='reset,zena,code,calendar'/>
+      <r:stylesheets media='all' list='reset,zena,code,calendar,grid'/>
     </r:void>
     <link href="style.css" rel="Stylesheet" type="text/css"/>
 <style>
@@ -21,7 +21,7 @@
 .test .drop {background:#ccc;}
 .test .drop_hover { background:#ace; border:2px dashed #99f;}
 </style>
-    <r:javascripts list='prototype,effects,zena,dragdrop'/>
+    <r:javascripts list='prototype,effects,zena,dragdrop,grid'/>
     <r:uses_datebox/>
   </r:with>
 
@@ -94,6 +94,63 @@
     </table>
   </div>
 
+  //! edit4
+  <div class='test' id='edit4' do='selenium' do='root'>
+    <h3>edit4</h3>
+    <p>Edit element from list in place (makes form from each block).</p>
+    <ul do='pages'>
+      <li class='#{title}' do='each'><span class='title' do='title'/> <r:edit/></li>
+    </ul>
+  </div>
+
+  //! edit5
+  <div class='test' id='edit5' do='selenium' do='root'>
+    <h3>edit5</h3>
+    <p>Edit element from list in place (use a custom form).</p>
+    <ul do='pages'>
+      <li do='each'><span class='title' do='title'/> <r:edit/></li>
+      <li do='form'><r:input name='title'/> <r:select name='origin' nodes='contacts in site' attr='name'/></li>
+    </ul>
+  </div>
+
+  //! edit6
+  <div class='test' id='edit6' do='selenium' do='root'>
+    <h3>edit6</h3>
+    <p>Edit link after [block].</p>
+    <ul do='pages'>
+      <li do='each'><span class='title' do='title'/> <div do='block'>O:<span id='swap_span' do='if' test='origin' do='origin'/> <r:swap attr='origin' states=',bob' do='t'>swap</r:swap></div> <r:edit/></li>
+      <li do='form'><r:input name='title'/></li>
+    </ul>
+  </div>
+
+  //! swap1
+  <div class='test' id='swap1' do='selenium' do='root'>
+    <h3>swap1</h3>
+    <p>Swap value in [block].</p>
+    <div id='swap1_s' class='#{origin}' do='block'>
+      <span id='swap1_span' do='if' test='origin' do='origin'/>
+      <r:swap attr='origin' states=',bob' do='t'>swap</r:swap>
+    </div>
+  </div>
+
+  //! swap2
+  <div class='test' id='swap2' do='selenium' do='root'>
+    <h3>swap2</h3>
+    <p>Swap value in [block] with [drop] in same block.</p>
+    <ul do='pages in site limit 3'>
+      <li do='each' draggable='true' do='title'/>
+    </ul>
+
+    <div id='swap2_s' class='#{origin}' do='block'>
+      <span id='swap2_span' do='if' test='origin' do='origin'/>
+      <r:swap attr='origin' states=',bob' do='t'>swap</r:swap>
+      <ul do='drop' set='reference' change='receiver' do='references'>
+        <li class='#{id}' do='each'><r:unlink/> <r:title/></li>
+      </ul>
+    </div>
+  </div>
+
+  //! toggle1
   <div class='test' id='toggle1' do='selenium'>
     <h3>toggle1</h3>
     <p>Toggle relation in list.</p>
@@ -125,6 +182,32 @@
     </table>
   </div>
 
+  <div class='test' id='filter1' do='selenium'>
+    <h3>filter1</h3>
+    <p>Ajax live filter.</p>
+    <div id='filter1_form' do='filter' live='true'>
+      <input name='f' id='filter1_in' value=''/>
+    </div>
+    <ul id='filter1_list' do='block' do='nodes where title like "%#{params[:f]}%" in site limit 2'>
+      <li id='fil1_#{id}' do='each' do='title'/>
+    </ul>
+  </div>
+
+  <div class='test' id='filter2' do='selenium'>
+    <h3>filter2</h3>
+    <p>Ajax live filter (remote target).</p>
+    <div do='parent'>
+      <b do='title'/> //! Filter is not in same parent as filtered list. Explicit target.
+      <div id='filter2_form' do='filter' live='true' update='filter2_list'>
+        <input name='f' id='filter2_in' value=''/>
+      </div>
+    </div>
+    <ul id='filter2_list' do='block' do='nodes where title like "%#{params[:f]}%" in site limit 2'>
+      <li id='fil2_#{id}' do='each' do='title'/>
+    </ul>
+  </div>
+
+  //! form1
   <div class='test' id='form1' do='selenium'>
     <h3>form1</h3>
     <p>Form in [new] to create objects.</p>
@@ -135,6 +218,7 @@
     </r:new>
   </div>
 
+  //! form2
   <div class='test' id='form2' do='selenium'>
     <h3>form2</h3>
     <p>Form to update object.</p>
@@ -143,6 +227,19 @@
     </r:form>
   </div>
 
+  //! form3
+  <div class='test' id='form3' do='selenium'>
+    <h3>form3</h3>
+    <p>Form to update object with checkbox.</p>
+    <r:form node[v_status]='50'>
+      <ul>
+        <li><r:input label='t' name='title'/></li>
+        <li style='margin-top:1em; border-top:1px solid black;'><r:checkbox role='set_tag' nodes='tags in site'/></li>
+        <li><r:input type='submit'/></li>
+      </ul>
+    </r:form>
+  </div>
+
   <div class='test' id='drop1' do='selenium'>
     <h3>drop1</h3>
     <p>Create a relation by drag and dropping.</p>
@@ -215,317 +312,32 @@
       </ul>
     </r:projects>
   </div>
-<!-- OLD TESTS
-<div id='related'>
-<ul do='pages'>
-<li do='each'><p><b do='show' attr='title' edit='true' publish='true'/> <r:edit/></p>
-<r:zazen attr='summary' edit='true' publish='true'/>
-</li>
-</ul>
-This filter updates the "distant filter block test"
-<r:filter live='true' update='upfi'/>
-</div>
-
-<h3>publish = true</h3>
-<r:zazen attr='origin' edit='true' publish='true'/>
-
-<h3>publish = force</h3>
-<r:zazen attr='origin' edit='true' publish='force'/>
-
-<h3>pagination test</h3>
-(no ajax)
-<r:nodes in='site' order='zip' limit='8' paginate='p'>
-  <p><b do='page_count'/> nodes</p>
-  <p>
-    <r:link mode='test' page='previous' do='t'>previous</r:link>
-    <r:p/>/<r:page_count/>
-    || <r:link page='list' mode='test'/> ||
-    <r:link mode='test' page='next' do='t'>next</r:link>
-  </p>
-<ul>
- <li do='each'><r:show attr='zip'/> <r:link/></li>
-</ul>
-</r:nodes>
-
-(ajax)
-<div id='pagir' do='block' do='nodes' in='site' order='zip' limit='8' paginate='p'>
-  <p><b do='page_count'/> nodes</p>
-  <p>
-    <r:link mode='test' update='pagir' page='previous' do='t'>previous</r:link>
-    <r:p/>/<r:page_count/>
-    || <r:link page='list' update='pagir'/> ||
-    <r:link mode='test' update='pagir' page='next' do='t'>next</r:link>
-  </p>
-<ul>
- <li do='each'><r:show attr='zip'/> <r:link/></li>
-</ul>
-</div>
-
-<hr/>
-<h3>date query test</h3>
-
-<h4>event='week'</h4>
-<ul do='nodes in site' event='week'>
- <li do='each' do='link'/>
-</ul>
-
-<h4>event='today'</h4>
-<ul do='nodes in site' event='today'>
- <li do='each' do='link'/>
-</ul>
-
-<h4>event='4 days' (+/- 4 days)</h4>
-<ul do='nodes in site' event='4 days'>
- <li do='each' do='link'/>
-</ul>
-
-<h4>event='-4 hours' (last 4 hours)</h4>
-<ul do='nodes in site' event='-4 hours'>
- <li do='each' do='link'/>
-</ul>
-
-<h3>calendar test</h3>
-<div do='calendar' select='posts in site' attr='date'/>
-
-<h3>week calendar</h3>
-<div do='calendar' select='posts in site' attr='date' type='week'/>
-
-<h3>tiny calendar</h3>
-<div do='calendar' select='posts in site' attr='date' size='tiny'/>
-
-<h2>assign calendar</h2>
-<r:root>
-  <div do='block' id='assign_cal'>
-    <h3><b><r:show attr='title'/></b> calendar</h3>
-    <r:calendar assign_as='reference' used='warn' split_hours='12' />
+
+  //! link create
+  <div class='test' id='link1' do='selenium'>
+    <h3>link-create</h3>
+    <p>Create objects with links.</p>
+    <ul>
+      <li id='link1_create' do='link' action='create' node[title]='%{New node}' node[klass]='%{Page}' do='t'>create page</li>
+    </ul>
+    <ul do='pages'>
+      <li do='each' do='link' action='destroy'/>
+    </ul>
   </div>
-</r:root>
-<r:projects in='site' do='each' join=', ' do='link' update='assign_cal'/>
-
-<div id='edit' do='block'>
-  <h3>edit block test</h3>
-    <r:text/>
-    <r:edit publish='true'><r:if test='1 == 2'>blue<r:else>edit in else</r:else></r:if></r:edit>
-</div>
-
-<hr/>
-
-<h2>update target test</h2>
-<div id='bozo' do='block'><h3 do='title' actions='all'/><r:img mode='pv'/>
-  <r:summary/>
-</div>
-
-<ul do='images in site'><r:each join=', ' do='link' update='bozo'/></ul>
-
-<hr/>
-
-<div id='upfi' do='block'>
-  <h2>distant filter block test</h2>
-    <ol do='pages where title like "[param:f]%" limit 5'><li do='each' do='title'/></ol>
-</div>
-
-<hr/>
-
-<div id='filter'>
-  <h2>filter block test</h2>
-  <r:filter live='true'/>
-  <r:block do='pages where title like "[param:f]%" limit 5'>
-    <ol><li do='each' do='title'/></ol>
-  </r:block>
-</div>
-
-<hr/>
-
-
-<h2>data test</h2>
-<ol do='data'>
-  <li do='each'><r:edit/> <b do='[text]'/> <r:show attr='value_a'/> <r:show attr='value_b'/><r:unlink/></li>
-  <li do='form'><r:cancel/> <r:input name='text'/> <r:input name='value_a'/> <r:input name='value_b'/> <r:input type='submit'/></li>
-  <li do='add' done='focus'/>
-  <r:set var='hours' do='stat' find='sum' from='value_a'/> <r:set var='exp' do='stat' find='sum' of='value_b'/>
-  <li><b><r:show var='hours'/> * 150.00 = <r:show eval='hours * 150'/> + <r:show var='exp'/> = <r:show eval='( hours * 150 ) + exp'/></b></li>
-</ol>
-
-<hr/>
-
-<h2>data group block test</h2>
-<ol id='bdata' do='block' do='data'>
-  <r:group by='value_a'>
-    <li>value: <b do='[value_a]'/></li>
-    <li do='each'><r:edit/> <b do='[text]'/> <r:show attr='value_a'/> <r:show attr='value_b'/><r:unlink/></li>
-  </r:group>
-    <li do='form'><r:cancel/> <r:input name='text'/> <r:input name='value_a'/> <r:input name='value_b'/> <r:input type='submit'/></li>
-    <li do='add' done='focus'/>
-    <r:set var='hours' do='stat' find='sum' from='value_a'/> <r:set var='exp' do='stat' find='sum' of='value_b'/>
-    <li><b><r:show var='hours'/> * 150.00 = <r:show eval='hours * 150'/> + <r:show var='exp'/> = <r:show eval='( hours * 150 ) + exp'/></b></li>
-</ol>
-
-<hr/>
-
-<h2>data block test</h2>
-<ol id='bdata' do='block' do='data'>
-  <li do='each'><r:edit/> <b do='[text]'/> <r:show attr='value_a'/> <r:show attr='value_b'/><r:unlink/></li>
-  <li do='form'><r:cancel/> <r:input name='text'/> <r:input name='value_a'/> <r:input name='value_b'/> <r:input type='submit'/></li>
-  <li do='add' done='focus'/>
-  <r:set var='hours' do='stat' find='sum' from='value_a'/> <r:set var='exp' do='stat' find='sum' of='value_b'/>
-  <li><b><r:show var='hours'/> * 150.00 = <r:show eval='hours * 150'/> + <r:show var='exp'/> = <r:show eval='( hours * 150 ) + exp'/></b></li>
-</ol>
-
-<hr/>
-
-<h2>swap</h2>
-<style>
-.orange { background:orange;}
-.green  { background:green;}
-</style>
-<div id='swap' class='orange' do='block' green_if='weight == 100'>
-  <span do='swap' states=',100' attr='weight' publish='true'><r:if test='weight == 100'><r:t>done</r:t><r:else do='t'>open</r:else></r:if></span> weight: <b do='weight'/>
-</div>
-
-<h2>drag &amp; drop</h2>
-
-<r:images in='site' do='each' draggable='all' do='img' mode='tiny'/>
-
-<h3>drop set relation (drop in each)</h3>
-
-<ul do='tags in site'>
-  //! drop in each
-  <li style='border:1px solid #400; min_width:100px; min_height:100px;' do='each' do='drop' set='set_tag'>
-    <b do='title'/>
-    <ul do='context' select='tagged'><li do='each' do='unlink' do='img' mode='tiny'/></ul>
-  </li>
-</ul>
-
-<h3>drop set relation (drop in each/add)</h3>
-
-
-<ul do='tags in site'>
-  //! drop in each
-  <li style='border:1px solid #400; min_width:100px; min_height:100px;' do='each' do='drop' set='set_tag'>
-    <b do='title'/>
-    <ul do='context' select='tagged'><li do='each' do='unlink' do='img' mode='tiny'/></ul>
-  </li>
-  <li do='add' klass='Tag'/>
-</ul>
-
-<h3>drop set attributes</h3>
-
-<ul do='projects in site'>
-  <li style='border:1px solid #400; min_width:100px; min_height:100px;' do='each'><r:drop node[origin]='%Q{I am an icon for #{title}}' node[icon_for_id]='id'><b do='title' actions='all'/><r:icon where='1'><r:unlink do='img' mode='pv'/> <r:origin/> </r:icon></r:drop>
-</li>
-</ul>
-
-<h3>drop reload with param (comment on receiving)</h3>
-//! The strange %q{#{id}} means "lazy evaluation on drop".
-<div style='border:1px solid #400; min_width:100px; min_height:100px;' do='drop' change='params' d='%q{#{id}}' do='if' test='params[:d]'>
-  <r:node where='id = #{params[:d]}' in='site'>
-    Change icon to <r:img mode='tiny'/> (<r:title/>)?
-    <r:set icon='this' do='main' do='form'>
-      <r:input type='hidden' name='icon_id' value='#{icon.id}'/>
-      <r:input type='hidden' name='m_title' value='icon changed to #{icon.title}'/>
-      <r:textarea name='m_text'/>
-      <r:input type='submit'/>
-    </r:set>
-  </r:node>
-  <r:else>
-    <r:icon do='img' mode='pv'/>
-    please drop a node to change the icon
-    <ul do='comments'>
-    <li do='each'><b do='title'/> <b do='author.title'/>
-    <div do='zazen' attr='text'/>
-    </li>
-    </ul></r:else>
-</div>
-
-<hr/>
-
-<h3>drop reload with param (comment on dropped)</h3>
-
-<r:images in='site' do='each' draggable='true' do='img' mode='tiny'/>
-//! The strange %q{#{id}} means "lazy evaluation on drop".
-<div style='border:1px solid #400; min_width:100px; min_height:100px;' do='drop' change='params' d='%q{#{id}}' do='if' test='params[:d]'>
-  <r:node where='id = #{params[:d]}' in='site'>
-    <r:img mode='tiny'/> (<r:title/>) Set as icon for <r:main do='title'/> ?
-    //! We need to set 't_id' (template rendering object id) so that after form submit, the
-    //! original (main) element is rendered and not the icon.
-    <r:form node[icon_for_id]='main.id' node[m_title]='%{icon for #{main.title}}' t_id='main.id'>
-      <r:input name='m_text'/>
+
+  //! grid edition
+  <div class='test' id='grid1' do='selenium'>
+    <h3>grid editing</h3>
+    <p>Attribute based grid.</p>
+    <r:form redir='url(this, :test =&gt;"grid1")'>
+      <r:grid attr='origin'/>
       <r:input type='submit'/>
     </r:form>
-  </r:node>
-  <r:else>
-    please drop a node to change the icon in <b do='title'/>
-    <r:icon>
-      <r:img mode='pv'/>
-      <ul do='comments'>
-        <li do='each'><b do='title'/>
-          <b do='author.title'/>
-          <div do='zazen' attr='text'/>
-        </li>
-      </ul>
-    </r:icon>
-  </r:else>
-</div>
-
-<hr/>
-
-<h2>add in updated DOM</h2>
-
-<div id='add_and_update' do='block'>
-  <h3 do='title'/>
-  <ul do='pages'>
-    <li do='each' do='[title]'/>
-    <li do='add' klass='Page' update='add_and_update'/>
-  </ul>
-</div>
-
-<r:projects in='site' do='each' join=', ' do='link' update='add_and_update'/>
-
-<hr/>
-
-<h2>simplest comments</h2>
-
-<ul do='comments'>
-  <li do='each'><r:zazen attr='text'/></li>
-  <li do='add'/>
-</ul>
-
-<h2>notes &amp; comments</h2>
-
-<div id='notes' do='posts' in='project' limit='10' order='date desc'>
-  <ul class='note_list'>
-    <li do='add' after='self'/>
-    <li class='inline_form' do='form'>
-      <p class='node_title'><r:input type='text' name='title' size='25'/></p>
-      <p class='node_klass'>  <r:select name='klass' root_class='Note' selected='Post'/></p>
-      <p class='node_date'> <r:input type='date_box' name='date'/> </p>
-      <p class='validate'>    <r:input type="submit" value='validate' do='void' tset_value='validate'/></p>
-    </li>
-    <li class='note' do='each'>
-      <div class='header'>
-        <p class='date' do='show' attr='date' tformat='full_date'>04.10</p>
-        <h2 class='title' do='title' actions='all'/>
-        <div class='summary' do ='summary'/>
-      </div>
-      <r:text/>
-<ul do='comments'>
-<li do='each'><b do='title'/> <b do='author_name'/>
-<div do='zazen' attr='text'/>
-</li>
-<li do='add'/>
-<li do='form'>
-<p><r:input name='title'/></p>
-<p><r:textarea name='text'/></p>
-<p><r:input type='submit'/></p>
-</li>
-</ul>
-      <div class='clear'></div>
-    </li>
-  </ul>
-</div>
-
-
-<hr/>
--->
+    <r:js>
+$$('.grid').each(function(e) {
+   Grid.make(e);
+ });
+    </r:js>
+  </div>
   </r:with>
 </r:include>

data/test/fixtures/files/translations_fr.yml

@@ -17,4 +17,9 @@ translations:
   not_found: sans
   crop: rogner
   no_parent: pas de parent
-  admin_interface: interface admin
+  admin_interface: interface admin
+  # Used to test options list in [select].
+  assigned_:  '--'
+  assigned_1: foo
+  assigned_2: bar
+  assigned_3: baz

data/test/functional/acls_controller_test.rb

@@ -32,7 +32,7 @@ class AclsControllerTest < Zena::Controller::TestCase
 
       should 'respond missing' do
         assert_difference('Acl.count', 0) do
-          post :create, :acl => { :query => 'assigned_project', :group_id => groups_id(:sky) }
+          post :create, :acl => { :query => '%q{assigned_project}', :group_id => groups_id(:sky) }
         end
 
         assert_response :missing
@@ -45,7 +45,7 @@ class AclsControllerTest < Zena::Controller::TestCase
 
         should 'create acl' do
           assert_difference('Acl.count', 1) do
-            post :create, :acl => { :query => 'assigned_project', :group_id => groups_id(:sky) }
+            post :create, :acl => { :query => '%q{assigned_project}', :group_id => groups_id(:sky) }
           end
         end
       end # with admin rights

data/test/functional/nodes_controller_test.rb

@@ -178,7 +178,7 @@ class NodesControllerTest < Zena::Controller::TestCase
 
         should 'insert cachestamp and render template' do
           get_subject
-          # 
+          #
           assert_redirected_to "/en/page18_info.js?#{nodes(:projects).updated_at.to_i}"
           get 'show', :path => subject[:path], :cachestamp => nodes(:projects).updated_at.to_i.to_s, :prefix => 'en'
           assert_response :success
@@ -314,7 +314,7 @@ class NodesControllerTest < Zena::Controller::TestCase
       should 'succeed' do
         post_subject
         node = assigns(:node)
-        assert_redirected_to "/oo/blog#{node.zip}.html"
+        assert_redirected_to "/oo/blog#{node.zip}.html?new=true"
       end
 
       should 'set type and vclass' do
@@ -527,9 +527,9 @@ class NodesControllerTest < Zena::Controller::TestCase
             {:action => 'create', :controller => 'nodes', :node => {:parent_id => nodes_zip(:zena), :title => 'hello'}, :mode => 'info'}
           end
 
-          should 'redirect to node with mode' do
+          should 'redirect to node with mode with new' do
             post_subject
-            assert_redirected_to "/oo/page#{assigns(:node).zip}_info.html"
+            assert_redirected_to "/oo/page#{assigns(:node).zip}_info.html?new=true"
           end
         end # with a redir param
       end # creating a node
@@ -700,7 +700,7 @@ class NodesControllerTest < Zena::Controller::TestCase
         # cache info ok
         get 'show', :prefix => 'en', :path => ["image#{node.zip}.jpg"], :cachestamp => node.updated_at.to_i
         assert_response :success
-        assert File.exist?("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg")
+        assert File.exist?(make_cache_path("#{SITES_ROOT}/test.host/public/en/image#{node.zip}.jpg", node))
       end
     end
   end
@@ -761,6 +761,10 @@ END:VCALENDAR
     end
   end
 
+  def make_cache_path(file, node)
+    "#{file}.#{node.updated_at.to_i}"
+  end
+
   def test_cache_css_auto_publish
     test_site('zena')
     Site.connection.execute    "UPDATE sites set auto_publish = #{Zena::Db::TRUE}, redit_time = 7200 WHERE id = #{sites_id(:zena)}"
@@ -774,18 +778,20 @@ END:VCALENDAR
         assert !File.exist?(filename)
         get 'show', :prefix => 'en', :path => [name], :cachestamp => node.updated_at.to_i
         assert_response :success
-        assert File.exist?(filename) # cached page created
-        assert_match %r[body \{ background: #eee; color:#444;], File.read(filename)
+        cache1 = make_cache_path(filename, node)
+        assert File.exist?(cache1) # cached page created
+        assert_match %r[body \{ background: #eee; color:#444;], File.read(cache1)
         put 'save_text', :id => nodes_zip(:style_css), :node => {'text' => '/* empty */'}
         node = assigns['node']
         assert node.errors.empty?
         assert_equal Zena::Status::Pub, node.version.status
         assert_equal versions_id(:style_css_en), node.version.id # auto publish
-        assert !File.exist?(filename) # old cached page removed
+        assert !File.exist?(cache1) # old cached page removed
         get 'show', :prefix => 'en', :path => [name], :cachestamp => node.updated_at.to_i
         assert_response :success
-        assert File.exist?(filename) # cached page created again
-        assert_match %r[/\* empty \*/], File.read(filename)
+        cache2 = make_cache_path(filename, node)
+        assert File.exist?(cache2) # cached page created again
+        assert_match %r[/\* empty \*/], File.read(cache2)
       end
     end
   end
@@ -895,7 +901,7 @@ END:VCALENDAR
       img = secure!(Node) { nodes(:bird_jpg) }
       assert_not_equal pub_version_id, img.version.id
       assert_not_equal pub_content_id, img.version.attachment.id
-      assert_equal 2010,   img.size
+      assert_equal 2002,   img.size
       assert_equal 160,  img.width
       assert_equal 80, img.height
     end

data/test/functional/virtual_classes_controller_test.rb

@@ -203,7 +203,7 @@ class VirtualClassesControllerTest < Zena::Controller::TestCase
             post_subject
             assert_response :success
             diff = assigns(:diff)
-            assert_match(/<ins class="differ">Foo/, diff)
+            assert_match(/<ins class="differ">.*Foo/, diff)
           end
         end
       end # importing virtual class definitions

data/test/integration/query_node/basic.yml

@@ -51,6 +51,15 @@ project:
   sql: "[%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} AND nodes.id = ? ORDER BY nodes.zip ASC}, @node.get_project_id]"
   res: 'Clean Water project'
 
+date_year:
+  src: "nodes where created_at = 2006 in site"
+#  sql: "%Q{SELECT nodes.* FROM nodes WHERE #{secure_scope('nodes')} GROUP BY nodes.project_id HAVING MIN(nodes.created_at) = 2006 ORDER BY nodes.zip ASC}"
+  res: ""
+
+min:
+  src: "nodes select created_at.min as mat in site group by project_id"
+  sql: "%Q{SELECT nodes.*,MIN(nodes.created_at) AS `mat` FROM nodes WHERE #{secure_scope('nodes')} GROUP BY nodes.project_id ORDER BY nodes.zip ASC}"
+
 many_alternatives:
   src: tagged in site or images in site or tags in site
   sql: "%Q{SELECT nodes.*,links.id AS `link_id`,links.status AS `l_status`,links.comment AS `l_comment`,links.date AS `l_date` FROM links,nodes WHERE #{secure_scope('nodes')} AND ((nodes.id = links.source_id AND links.relation_id = _ID(node_has_tags)) OR (nodes.kpath LIKE 'NDI%' AND links.id = 0) OR (nodes.kpath LIKE 'NPT%' AND links.id = 0)) GROUP BY nodes.id ORDER BY nodes.zip ASC}"

data/test/integration/query_node/dates.yml

@@ -45,4 +45,4 @@ date_tz_date:
     # This date is translated to 2006-04-10 17:0 UTC
   src: "nodes where created_at.date = #{date}"
   sql: '/INTERVAL 1 DAY/'
-  res: "crocodiles"
+  res: "crocodiles"