Changeset 1180

Timestamp:

2008-09-22 16:51:56 (4 months ago)

Author:

gaspard

Message:

commit 8b187aa00e9d71e9ae8c329effd5468717938c6d
Author: Gaspard Bucher <gaspard@teti.ch>

Fixed date usage in pseudo sql, fixed empty mode on template state:resolved.
All tests are passing. Reached 1'300 tests !

Files:

• trunk/app/controllers/application.rb (modified) (1 diff)
• trunk/app/models/template.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (2 diffs)
• trunk/test/helpers/application_helper_test.rb (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)
• trunk/test/sites/zena/discussions.yml (modified) (1 diff)
• trunk/test/unit/template_test.rb (modified) (8 diffs)
• trunk/test/unit/user_test.rb (modified) (2 diffs)

trunk/app/controllers/application.rb

@@ -804 +804 @@
-      if thedate.kind_of?(Time)
-        adate = tz.utc_to_local(thedate)
+      elsif thedate.kind_of?(String)
+        begin
+          adate = Date.parse(thedate)
+        rescue
+          return "<span class='parser_error'>invalid date #{thedate.inspect}</span>"
+        end
-      else
-        adate = thedate

trunk/app/models/template.rb

@@ -29 +29 @@
-  
-  def filter_attributes(attributes)
-    ['c_klass','c_mode','c_format'].each do |sym|
-      attributes.delete(sym) if attributes[sym] == ''
-    end
-    content    = version.content
-    new_name   = attributes['name'] || (new_record? ? attributes['v_title'] : nil) # only set name from version title on creation
@@ -100 +97 @@
-      opts[:klass ]  ||= version.content.klass
-      format = opts[:format] == 'html' ? '' : "-#{opts[:format]}"
-opts[:mode]
+!opts[:mode].blank?
-      "#{opts[:klass]}#{mode}#{format}"
-    end

trunk/lib/parser/lib/rules/zena.rb

@@ -1633 +1633 @@
-      else
-        if select =~ /^\d{4}-\d{1,2}-\d{1,2}$/
-          expand_with(:date=>select)
-        elsif date = find_stored(Date, select)
-          begin
-            d = Date.parse(select)
-
+.inspect
-          rescue
-            parser_error("invalid date '#{select}' should be 'YYYY-MM-DD'")
+          end
+        elsif date = find_stored(Date, select)
+          if date[0..0] == '"'
+            begin
+              d = Date.parse(date[1..-2])
+              expand_with(:date=>date)
+            rescue
+              parser_error("invalid date #{select} (#{date}) should be 'YYYY-MM-DD'")
+            end
+          else
+            expand_with(:date=>select)
-          end
-        elsif select =~ /^\[(.*)\]$/
@@ -3206 +3215 @@
-        if date_cond == 'today' || ref_date == 'today'
-          ref_date = 'now()'
-^\d{4}-\d{1,2}-\d{1,2}( \d{1,2}:\d{1,2}(:\d{1,2})?)?$
-ref_date
+(\d{4}-\d{1,2}-\d{1,2}( \d{1,2}:\d{1,2}(:\d{1,2})?)?)
+$1
-        else
-          ref_date = "'\#{#{ref_date}.strftime('%Y-%m-%d %H:%M:%S')}'"

trunk/test/helpers/application_helper_test.rb

@@ -317 +317 @@
-  
-  def test_node_actions_wiki_public
-
+
+
-    assert @node.can_edit?, "Node can be edited by the public"
-    res = node_actions(:actions=>:all)

trunk/test/helpers/zena_parser/basic.yml

@@ -1082 +1082 @@
-  src: "<r:show date='created_at' format='%a' lang='en'/>"
-  res: "Fri"
+
+date_context:
+  src: "<r:date select='2008-03-02'><r:show date='current_date' format='%A %d.%m.%Y'/></r:date>"
+  tem: "<%= format_date(\"2008-03-02\", \"%A %d.%m.%Y\") %>"
+  res: "Sunday 02.03.2008"

trunk/test/sites/zena/discussions.yml

@@ -22 +22 @@
-  inside:          yes
-  lang:            fr
+
+private_discussion_on_myLife:
+  created_at:      2008-09-20 20:00
+  updated_at:      2008-09-20 20:00
+  node:            myLife
+  inside:          yes
+  lang:            fr

trunk/test/unit/template_test.rb

@@ -115 +115 @@
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :name=>'Project-collab-xml.zafu')}
-    assert_kind_of Template, doc
-    err doc
-    assert !doc.new_record?, "Saved"
-    assert doc.update_attributes(:name => "Page-super")
@@ -123 +122 @@
-    assert_equal 'Page', doc.c_klass
-    assert_equal 'Page-super', doc.name
+  end
+  
+  def test_update_name_blank_mode
+    login(:tiger)
+    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :name=>'Project-collab-xml.zafu')}
+    assert_kind_of Template, doc
+    assert !doc.new_record?, "Saved"
+    assert doc.update_attributes(:name => "Page--xml", :v_title=> "Project-collab-xml")
+    assert_nil doc.c_mode
+    assert_equal 'xml', doc.c_format
+    assert_equal 'Page', doc.c_klass
+    assert_equal 'Page--xml', doc.name
+    assert_equal 'Page--xml', doc.v_title
+  end
+  
+  def test_update_blank_mode
+    login(:tiger)
+    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :name=>'Project-collab-xml.zafu')}
+    assert_kind_of Template, doc
+    assert !doc.new_record?, "Saved"
+    assert_equal 'collab', doc.c_mode
+    assert doc.update_attributes(:c_mode => "", :name => "Project-collab-xml")
+    assert_nil doc.c_mode
+    assert_equal 'xml', doc.c_format
+    assert_equal 'Project', doc.c_klass
+    assert_equal 'Project--xml', doc.name
+    assert_equal 'Project--xml', doc.v_title
-  end
-
@@ -142 +168 @@
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), :name=>'Project-collab')}
-    assert_kind_of Template, doc
-    err doc
-    assert !doc.new_record?, "Saved"
-    assert_equal 'Project-collab', doc.name
@@ -198 +223 @@
-  
-  def test_update_format_updates_name
+    login(:lion)
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'c_mode' => '', 'c_klass' => 'Contact', 'name' => '', 'c_format' => 'vcard')}
-    assert_kind_of Template, doc
@@ -215 +241 @@
-  
-  def test_update_text
+    login(:lion)
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'v_text'=>"hey", 'c_mode' => '', 'c_klass' => 'Contact', 'name' => '')}
-    assert_kind_of Template, doc
@@ -223 +250 @@
-  
-  def test_default_text
+    login(:lion)
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'c_klass' => 'Contact', 'name' => '')}
-    assert_kind_of Template, doc
@@ -230 +258 @@
-  
-  def test_default_text_Node
+    login(:lion)
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'c_klass' => 'Node', 'name' => '')}
-    assert_kind_of Template, doc
@@ -237 +266 @@
-  
-  def test_default_text_other_format
+    login(:lion)
-    doc = secure!(Template) { Template.create(:parent_id=>nodes_id(:default), 'c_format' => 'vcard', 'c_klass' => 'Node', 'name' => '')}
-    assert_kind_of Template, doc

trunk/test/unit/user_test.rb

@@ -227 +227 @@
-    login(:tiger)
-    ant = secure!(User) { users(:ant) }
-_in_zena
+
-    assert_equal 50, ant.status
-  end
@@ -259 +259 @@
-    
-    # make lion an admin in ocean
-Group.connection.execute "UPDATE participations SET status = 60
+Participation.connection.execute "UPDATE participations SET status = #{User::Status[:admin]}
-    
-    login(:lion)