Changeset 503

Timestamp:

2007-05-10 13:35:42 (2 years ago)

Author:

gaspard

Message:

[feature] Added dynamic attributes support (versioned dynamic attributes)

Files:

• trunk/TODO (modified) (1 diff)
• trunk/app/models/version.rb (modified) (2 diffs)
• trunk/config/version.rb (modified) (1 diff)
• trunk/db/migrate/000_zena/015_add_dyn_attributes.rb (modified) (1 diff)
• trunk/db/schema.rb (modified) (2 diffs)
• trunk/lib/multiversion.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (1 diff)
• trunk/lib/parser/test/zafu.yml (modified) (1 diff)
• trunk/test/helpers/basic.yml (modified) (1 diff)
• trunk/test/helpers/zafu_ajax.yml (modified) (1 diff)
• trunk/test/helpers/zena_parser_test.rb (modified) (1 diff)
• trunk/test/unit/dyn_attributes_test.rb (added)
• trunk/test/unit/multiversion_test.rb (modified) (1 diff)
• trunk/test/unit/version_test.rb (modified) (1 diff)
• trunk/vendor/plugins/ar_mysql_full_text/lib/ar_mysql_full_text.rb (modified) (1 diff)
• trunk/vendor/plugins/dyn_attributes (added)
• trunk/vendor/plugins/dyn_attributes/MIT-LICENSE (added)
• trunk/vendor/plugins/dyn_attributes/README (added)
• trunk/vendor/plugins/dyn_attributes/init.rb (added)
• trunk/vendor/plugins/dyn_attributes/lib (added)
• trunk/vendor/plugins/dyn_attributes/lib/dyn_attributes.rb (added)

trunk/TODO

@@ -1 +1 @@
-== MOST IMPORTANT:
-
-
-
-
-
+
-
-== Todo

trunk/app/models/version.rb

@@ -37 +37 @@
-  validate_on_update    :can_update_content
-  after_save            :save_content
-
+uses_dynamic_attributes
-  # not tested belongs_to :comment_group, :class_name=>'Group', :foreign_key=>'cgroup_id'
-  # not tested has_many :comments, :order=>'created_at'
@@ -119 +119 @@
-  def content_class
-    nil
+  end
+  
+  def clone
+    obj = super
+    # clone dynamic attributes
+    obj.dyn = self.dyn
+    obj
-  end
-  

trunk/config/version.rb

@@ -3 +3 @@
-    MAJOR = 0
-    MINOR = 8
-1
+2
-    
-    STRING = [MAJOR, MINOR, TINY].join('.')

trunk/db/migrate/000_zena/015_add_dyn_attributes.rb

@@ -7 +7 @@
-      t.column 'value', :text
-    end
+    add_index 'dyn_attributes', 'owner_id'
+    add_index 'dyn_attributes', 'owner_table'
-  end
-
-  def self.down
+    remove_index 'dyn_attributes', 'owner_id'
+    remove_index 'dyn_attributes', 'owner_table'
-    drop_table 'dyn_attributes'
-  end

trunk/db/schema.rb

@@ -83 +83 @@
-    t.column "site_id",      :integer
-  end
+
+  create_table "dyn_attributes", :force => true do |t|
+    t.column "owner_id",    :integer
+    t.column "owner_table", :string
+    t.column "key",         :string
+    t.column "value",       :text
+  end
+
+  execute "ALTER TABLE dyn_attributes ENGINE = MyISAM"
+  execute "CREATE  INDEX index_dyn_attributes_on_owner_id ON dyn_attributes (owner_id)"
+  execute "ALTER TABLE dyn_attributes ENGINE = MyISAM"
+  execute "CREATE  INDEX index_dyn_attributes_on_owner_table ON dyn_attributes (owner_table)"
-
-  create_table "groups", :force => true do |t|
@@ -164 +176 @@
-  end
-
+  create_table "tmp", :id => false, :force => true do |t|
+    t.column "a", :string, :limit => 50
+    t.column "b", :string, :limit => 50
+  end
+
-  create_table "trans_phrases", :force => true do |t|
-    t.column "phrase",  :string,  :limit => 100, :default => "", :null => false

trunk/lib/multiversion.rb

@@ -381 +381 @@
-        # Any attribute starting with 'c_' belongs to the 'version' or 'redaction' content
-        def method_missing(meth, *args)
-
+|d_
-            target = $1
-.to_sym
-.to_sym
+
+
-            mode   = $4
-            if mode == '='
@@ -408 +408 @@
-                end
-              elsif target == 'd_'
-
+[0..-2]
-              else
-                begin

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

@@ -497 +497 @@
-            render_html_tag(expand_with)
-          else
-
-
+
+
+
+
+
-        end
-      end

trunk/lib/parser/test/zafu.yml

@@ -241 +241 @@
-names:
-  src: "<p do='void' name='root'><p do='inspect' name='first'/><p do='inspect' name='second'/></p>"
-> :name=>'root/first'}]<p/>[/inspect][inspect
+= :name=>'first'} {> :name=>'root/first'}]<p/>[/inspect][inspect {= :name=>'second'}
-
-default_tag:

trunk/test/helpers/basic.yml

@@ -287 +287 @@
-  src: "<z:children><z:each join=', '><z:show attr='name'/></z:each></z:children>"
-  res: "bird, flower"
-
-edit_not_each:
-  src: "<li class='blah'>this is a post <z:edit>edit post</z:edit></li>"
-  tem: "/<li class='blah'>this is a post </li>/"
-
-edit_each_no_form:
-  src: "<z:each><li>blah <z:edit>do this and that</z:edit></li>"
-  tem: "/<li>blah </li>"
-
-each_add_with_form:
-  context:
-    node: 'wiki'
-  src: "<z:children><z:each><li do='show' attr='name'>blah</li>\n</z:each><z:add><li>add new</li></z:add><z:form><li><form>this is the form</form></li></z:form></z:children>"
-  res: "/<li>bird.*<li>flower.*<li.*list_add.*list_form.*toggle.*<li .*list_form.*style.*none.*Ajax.Request.*input type='hidden' name='template_url' value='/each/add/with/form/list'/"
-  
-each_edit_with_form:
-  context:
-    node: 'wiki'
-  src: "<z:children><z:each><li><z:show attr='name'>blah</z:show> <z:edit>edit</z:edit></li>\n</z:each><z:form><li><form>this is the form</form></li></z:form></z:children>"
-  res: "/<li id='/each/edit/with/form/list30'>bird <a href=\"#\" onclick=\"new Ajax.Request\('/nodes/30/edit\?template_url=%2Feach%2Fedit%2Fwith%2Fform%2Flist/"
-
-set_attribute:

trunk/test/helpers/zafu_ajax.yml

@@ -9 +9 @@
-  tem: "<span id='/show/edit/list_name<%= @node[:zip] %>'><%= link_to_remote(@node.name, :url => edit_node_path(@node[:zip]) + \"?attribute=name&identifier=%2Fshow%2Fedit%2Flist_name#{@node[:zip]}\", :method => :get) %></span>"
-  res: "/span id='/show/edit/list_name22'>.*Ajax\.Request\('/nodes/22/edit\?attribute=name/"
+
+edit_not_each:
+  src: "<li class='blah'>this is a post <z:edit>edit post</z:edit></li>"
+  tem: "/<li class='blah'>this is a post </li>/"
+
+edit_each_no_form:
+  src: "<z:children><li do='each'>blah <z:edit>do this and that</z:edit></li></z:children>"
+  tem: "/<li>blah </li>/"
+
+each_add_with_form:
+  context:
+    node: 'wiki'
+  src: "<z:children><z:each><li do='show' attr='name'>blah</li>\n</z:each><z:add><li>add new</li></z:add><z:form><li><form>this is the form</form></li></z:form></z:children>"
+  res: "/<li.*list30.*>bird.*<li.*list31.*>flower.*<li.*list_add.*list_form.*toggle.*<li .*list_form.*style.*none.*Ajax.Request.*input type='hidden' name='template_url' value='/each/add/with/form/list'/"
+
+each_edit_with_form:
+  context:
+    node: 'wiki'
+  src: "<z:children><z:each><li><z:show attr='name'>blah</z:show> <z:edit>edit</z:edit></li>\n</z:each><z:form><li><form>this is the form</form></li></z:form></z:children>"
+  res: "/<li id='/each/edit/with/form/list30'>bird <a href=\"#\" onclick=\"new Ajax.Request\('/nodes/30/edit\?template_url=%2Feach%2Fedit%2Fwith%2Fform%2Flist/"

trunk/test/helpers/zena_parser_test.rb

@@ -9 +9 @@
-  
-  def test_single
-show_edit
+edit_each_no_form
-  end
-  

trunk/test/unit/multiversion_test.rb

@@ -575 +575 @@
-    assert_equal 1, trad.size
-  end
+  
+  def test_dynamic_attributes
+    login(:lion)
+    node = secure(Node) { nodes(:status) }
+    node.d_bolo = 'spaghetti bolognese'
+    assert node.save, "Can save node"
+    
+    # reload
+    node = secure(Node) { nodes(:status) }
+    assert_equal 'spaghetti bolognese', node.d_bolo
+  end
-end

trunk/test/unit/version_test.rb

@@ -146 +146 @@
-  end
-  
+  def test_dynamic_attributes
+    login(:tiger)
+    node = secure(Node) { nodes(:status) }
+    version = node.send(:redaction)
+    assert_nothing_raised { version.dyn['zucchini'] = 'courgettes' }
+    assert_nothing_raised { version.d_zucchini = 'courgettes' }
+    assert_equal 'courgettes', version.d_zucchini
+    assert node.save
+    
+    node = secure(Node) { nodes(:status) }
+    version = node.version
+    assert_equal 'courgettes', version.d_zucchini
+  end
+  
+  def test_clone
+    login(:tiger)
+    node = secure(Node) { nodes(:status) }
+    assert node.update_attributes(:d_whatever => 'no idea')
+    assert_equal 'no idea', node.d_whatever
+    version1_id = node.version[:id]
+    assert node.publish
+    
+    node = secure(Node) { nodes(:status) }
+    assert node.update_attributes(:d_other => 'funny')
+    version2_id = node.version[:id]
+    assert_not_equal version1_id, version2_id
+    assert_equal 'no idea', node.d_whatever
+    assert_equal 'funny', node.d_other
+  end
-end

trunk/vendor/plugins/ar_mysql_full_text/lib/ar_mysql_full_text.rb

@@ -51 +51 @@
-            next if row[2] == "PRIMARY" # skip the primary key
-            current_index = row[2]
-
+
+
+
-          end
-