Changeset 1182

Timestamp:

2008-09-23 09:34:24 (4 months ago)

Author:

gaspard

Message:

commit 4075721e9737820f2ba11fbe91d426cb4af0259d
Author: Gaspard Bucher <gaspard@teti.ch>

Hot fix to prevent crash when [context] tag is badly formed.

Files:

• trunk/lib/multiversion.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/test/unit/multiversion_test.rb (modified) (5 diffs)

trunk/lib/multiversion.rb

@@ -480 +480 @@
-          end
-          if ok && publish_after_save && version.status != Zena::Status[:pub]
-publish
+can_apply?(:publish) ? apply(:publish) : apply(:propose)
-          elsif ok
-            ok = update_max_status && update_publish_from
@@ -515 +515 @@
-            if v == nil && can_write?
-              # create new redaction or redit current publication
-== Zena::Status[:pub
+>= Zena::Status[:prop
-                # re-edit publication
-                redit = true

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

@@ -1955 +1955 @@
-    def r_context
-      # DRY ! (build_finder_for, block)
-
+
+
-      context = node_class.zafu_known_contexts[method]
-      if context && @params.keys == [:method]

trunk/test/unit/multiversion_test.rb

@@ -793 +793 @@
-  end
-  
-
+_can_publish
-    # set site.auto_publish      ===> publish
-    # now < updated + redit_time ===> update current publication
-    Site.connection.execute "UPDATE sites set auto_publish = 1, redit_time = 7200 WHERE id = #{sites_id(:zena)}"
+    Version.connection.execute "UPDATE versions set updated_at = '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}' WHERE id = #{versions_id(:tiger_en)}"
+    login(:tiger)
+    visitor.lang = 'en'
+    node = secure!(Node) { nodes(:tiger) }
+    assert_equal Zena::Status[:pub], node.v_status
+    assert_equal 'Tiger', node.v_title
+    assert_equal 1, node.v_number
+    assert_equal users_id(:tiger), node.v_user_id
+    assert node.v_updated_at < Time.now + 600
+    assert node.v_updated_at > Time.now - 600
+    node.update_attributes(:v_title => "Puma")
+    assert_equal Zena::Status[:pub], node.v_status
+    assert_equal 1, node.v_number
+    assert_equal versions_id(:tiger_en), node.v_id
+    assert_equal 'Puma', node.v_title
+  end
+
+  def test_publish_after_save_in_redit_time_can_publish
+    # set site.auto_publish      ===> publish
+    # now < updated + redit_time ===> update current publication
+    Site.connection.execute "UPDATE sites set auto_publish = 0, redit_time = 7200 WHERE id = #{sites_id(:zena)}"
+    Version.connection.execute "UPDATE versions set updated_at = '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}' WHERE id = #{versions_id(:tiger_en)}"
+    login(:tiger)
+    visitor.lang = 'en'
+    node = secure!(Node) { nodes(:tiger) }
+    assert_equal Zena::Status[:pub], node.v_status
+    assert_equal 'Tiger', node.v_title
+    assert_equal 1, node.v_number
+    assert_equal users_id(:tiger), node.v_user_id
+    assert node.v_updated_at < Time.now + 600
+    assert node.v_updated_at > Time.now - 600
+    node.update_attributes(:v_title => "Puma", :v_status => Zena::Status[:pub])
+    assert_equal Zena::Status[:pub], node.v_status
+    assert_equal 1, node.v_number
+    assert_equal versions_id(:tiger_en), node.v_id
+    assert_equal 'Puma', node.v_title
+  end
+  
+  def test_auto_publish_in_redit_time
+    # set site.auto_publish      ===> publish
+    # now < updated + redit_time ===> update current proposition
+    Site.connection.execute "UPDATE sites set auto_publish = 1, redit_time = 7200 WHERE id = #{sites_id(:zena)}"
-    Version.connection.execute "UPDATE versions set updated_at = '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}' WHERE id = #{versions_id(:status_en)}"
-    login(:ant)
@@ -805 +847 @@
-    assert_equal 1, node.v_number
-    assert_equal users_id(:ant), node.v_user_id
+    assert !node.can_publish?
-    assert node.v_updated_at < Time.now + 600
-    assert node.v_updated_at > Time.now - 600
-    node.update_attributes(:v_title => "Statues are better")
-ub
-1
+rop
+2
-    assert_equal versions_id(:status_en), node.v_id
-    assert_equal 'Statues are better', node.v_title
@@ -816 +859 @@
-  def test_publish_after_save_in_redit_time
-    # set site.auto_publish      ===> publish
-ublica
+roposi
-    Site.connection.execute "UPDATE sites set auto_publish = 0, redit_time = 7200 WHERE id = #{sites_id(:zena)}"
-
-
-
-
-ub
+status=#{Zena::Status[:prop]} 
+
+
+
+rop
-    assert_equal 'status title', node.v_title
-    assert_equal 1, node.v_number
@@ -829 +872 @@
-    assert node.v_updated_at > Time.now - 600
-    node.update_attributes(:v_title => "Statues are better", :v_status => Zena::Status[:pub])
-ub
+rop
-    assert_equal 1, node.v_number
-    assert_equal versions_id(:status_en), node.v_id
@@ -868 +911 @@
-    assert_equal Zena::Status[:rep], old_version.status
-  end
+  
+  def test_v_status_no_publish_rights
+    login(:ant)
+    node = secure!(Node) { nodes(:cleanWater) }
+    assert !node.can_publish?
+    assert node.can_write?
+    assert node.update_attributes(:v_title => 'bloated waters', :v_status => Zena::Status[:pub])
+    assert_equal Zena::Status[:prop], node.v_status
+  end
+  
+  def test_auto_publish_no_publish_rights
+    Site.connection.execute "UPDATE sites set auto_publish = 1, redit_time = 0 WHERE id = #{sites_id(:zena)}"
+    login(:ant)
+    node = secure!(Node) { nodes(:cleanWater) }
+    assert !node.can_publish?
+    assert node.update_attributes(:v_title => 'bloated waters')
+    assert_equal Zena::Status[:prop], node.v_status
+  end
-end