spec/support/models.rb in closure_tree-4.1.0 vs spec/support/models.rb in closure_tree-4.2.0

- old
+ new

@@ -1,11 +1,11 @@ require 'uuidtools' class Tag < ActiveRecord::Base acts_as_tree :dependent => :destroy, :order => "name" before_destroy :add_destroyed_tag - attr_accessible :name if _ct.use_attr_accessible? + attr_accessible :name, :title if _ct.use_attr_accessible? def to_s name end def add_destroyed_tag # Proof for the tests that the destroy rather than the delete method was called: @@ -16,11 +16,11 @@ class UUIDTag < ActiveRecord::Base self.primary_key = :uuid before_create :set_uuid acts_as_tree :dependent => :destroy, :order => 'name', :parent_column_name => 'parent_uuid' before_destroy :add_destroyed_tag - attr_accessible :name if _ct.use_attr_accessible? + attr_accessible :name, :title if _ct.use_attr_accessible? def set_uuid self.uuid = UUIDTools::UUID.timestamp_create.to_s end @@ -32,14 +32,12 @@ # Proof for the tests that the destroy rather than the delete method was called: DestroyedTag.create(:name => name) end end -USE_ATTR_ACCESSIBLE = Tag._ct.use_attr_accessible? - class DestroyedTag < ActiveRecord::Base - attr_accessible :name if USE_ATTR_ACCESSIBLE + attr_accessible :name if Tag._ct.use_attr_accessible? end class User < ActiveRecord::Base acts_as_tree :parent_column_name => "referrer_id", :name_column => 'email', @@ -50,11 +48,11 @@ def indirect_contracts Contract.where(:user_id => descendant_ids) end - attr_accessible :email, :referrer if USE_ATTR_ACCESSIBLE + attr_accessible :email, :referrer if _ct.use_attr_accessible? def to_s email end end @@ -63,13 +61,14 @@ belongs_to :user end class Label < ActiveRecord::Base # make sure order doesn't matter - attr_accessible :name if USE_ATTR_ACCESSIBLE acts_as_tree :order => :sort_order, # <- LOOK IT IS A SYMBOL OMG :parent_column_name => "mother_id", :dependent => :destroy + + attr_accessible :name if _ct.use_attr_accessible? def to_s "#{self.class}: #{name}" end end