Changeset 1168

Timestamp:

2008-09-19 16:27:18 (4 months ago)

Author:

gaspard

Message:

commit 2eb44b1b17c14bf0ab71dcd0c8284027d61e8ad7
Author: Gaspard Bucher <gaspard@teti.ch>

Fixed a bug where negative values could not be used in test conditions.

Files:

• trunk/app/models/comment.rb (modified) (2 diffs)
• trunk/app/models/node.rb (modified) (1 diff)
• trunk/app/models/version.rb (modified) (1 diff)
• trunk/db/migrate/000_zena/021_create_relations.rb (modified) (1 diff)
• trunk/lib/node_query.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (2 diffs)
• trunk/test/helpers/node_query/comments.yml (added)
• trunk/test/helpers/node_query/filters.yml (modified) (1 diff)
• trunk/test/helpers/node_query/relations.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser/basic.yml (modified) (1 diff)

trunk/app/models/comment.rb

@@ -7 +7 @@
-=end
-class Comment < ActiveRecord::Base
-, :user_id, :user_zip
+
-  zafu_context       :replies => ["Comment"]
-  attr_accessible    :title, :text, :author_name, :discussion_id, :reply_to, :status
@@ -23 +23 @@
-  def author_name
-    self[:author_name] || (self[:user_id] ? author.fullname : nil)
-  end
-  
-  def user_zip
-    user_id
-  end
-  

trunk/app/models/node.rb

@@ -132 +132 @@
-                     :section_zip, :skin, :ref_lang, :fullpath, :rootpath, :position, :publish_from, :max_status, :rgroup_id, 
-                     :wgroup_id, :pgroup_id, :basepath, :custom_base, :klass, :zip, :score, :comments_count, :l_status, :l_comment,
- :user_id,
+
-                     :m_text, :m_title, :m_author   
-  zafu_context       :author => "Contact", :parent => "Node", 

trunk/app/models/version.rb

@@ -31 +31 @@
-
-  zafu_readable      :title, :text, :summary, :comment, :created_at, :updated_at, :publish_from, :status, 
-, :user_id
+
-                     
-  zafu_context       :author => "Contact", :user => "User", :node => "Node"

trunk/db/migrate/000_zena/021_create_relations.rb

@@ -15 +15 @@
-    end
-    add_column :links, 'relation_id', :integer
-    # load relations fixtures
-    source_rel = {}
-    target_rel = {}
-    relations  = []
-    YAML::load_documents( File.open( File.join(RAILS_ROOT, 'test', 'fixtures', 'relations.yml') ) ) do |entries|
-      entries.each do |key,value|
-        relation = []
-        ['source_role', 'source_kpath', 'source_icon', 'target_role', 'target_kpath', 'target_icon'].each do |sym|
-          relation << quote(value[sym])
-        end
-        relations << relation
-      end
-    end
-    # create relations for each site
-    Site.find(:all).each do |site|
-      insert = relations.map do |rel|
-        "(#{(rel + [site[:id]]).join(',')})"
-      end
-      execute "INSERT INTO relations (`source_role`,`source_kpath`,`source_icon`,`target_role`,`target_kpath`,`target_icon`,`site_id`) VALUES #{insert.join(', ')}"
-      execute "UPDATE links,nodes SET relation_id = (SELECT id FROM relations WHERE source_role = links.role OR target_role = links.role AND site_id = #{site[:id]} LIMIT 1) WHERE links.source_id = nodes.id AND nodes.site_id = #{site[:id]}"
-    end
-  end
-

trunk/lib/node_query.rb

@@ -163 +163 @@
-        case $2
-        when 'visitor'
-
-
-
-
-
+
-        when 'param'
-          value = "\#{Node.connection.quote(#{val_start}params[:#{$3}].to_s#{val_end})}"
@@ -347 +343 @@
-      #   * VCLASS: a virtual class created by the user ('posts', 'houses', ...)
-      #   * RELATION: a relation defined by the user ('icon_for', 'news', 'calendar', ...)
-
+only use 'and' in clauses. 'or' is not supported. You can 
-      #
-      # Examples: 'todos in section where d_priority = high and d_assigned = [visitor:name]'

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

@@ -2557 +2557 @@
-          end
-        when :test
-]+)\s*(>=|<=|<>|<|=|>|lt|le|eq|ne|ge|gt)\s*("[^"]*"|'[^']*'|[\w\.
+\-]+)\s*(>=|<=|<>|<|=|>|lt|le|eq|ne|ge|gt)\s*("[^"]*"|'[^']*'|[\w\.\-
-            parts = [$1,$3]
-            op = {'lt' => '<','le' => '<=','eq' => '==', '=' => '==','ne' => '!=','ge' => '>=','gt' => '>'}[$2] || $2
-\d+$/ || parts[1] =~ /^
+-?\d+$/ || parts[1] =~ /^-?
-            parts.map! do |part|
-              if ['"',"'"].include?(part[0..0])
@@ -2566 +2566 @@
-              elsif part == 'NOW'
-                "Time.now.to_i"
-
+-?
-                part
-              else

trunk/test/helpers/node_query/filters.yml

@@ -91 +91 @@
-  src: "nodes in site group by log_at:year order by log_at:year asc, name asc"
-  sql: "SELECT nodes.* FROM nodes WHERE (#{@node.secure_scope('nodes')}) GROUP BY year(nodes.log_at) ORDER BY year(nodes.log_at) ASC, nodes.name ASC"
-
-nodes_author:
-  context:
-    visitor: ant
-  src: "nodes where user_id eq \"[visitor:author_id]\" in site"
-  sql: "SELECT nodes.* FROM nodes WHERE nodes.user_id = \#{visitor.id} AND (\#{@node.secure_scope('nodes')}) ORDER BY nodes.position ASC, nodes.name ASC"
-  res: "."

trunk/test/helpers/node_query/relations.yml

@@ -29 +29 @@
-projects_in_site:
-  sql: "SELECT nodes.* FROM nodes WHERE nodes.kpath LIKE 'NPP%' AND (#{@node.secure_scope('nodes')}) ORDER BY nodes.position ASC, nodes.name ASC"
-
-comments_order:
-  src: "comments order by created_at desc"
-  sql: "Comment: SELECT comments.* FROM comments WHERE comments.discussion_id = #{@node.get_discussion_id} ORDER BY comments.created_at DESC"

trunk/test/helpers/zena_parser/basic.yml

@@ -630 +630 @@
-  src: "<div do='project' on_if='name eq \"cleanWater\"' do='[name]'/>"
-  res: "<div class='on'>cleanWater</div>"
+
+test_negative_value:
+  src: "<div do='void' off_if='custom_a eq -10'>...</div>"
+  tem: "<div<%= @node.custom_a.to_i == -10 ? \" class='off'\" : \"\" %>>...</div>"
-  
-simple_each: