0
@@ -1,7 +1,8 @@
0
 class CommentObserver < ArticleObserver
0
+  cattr_accessor :disabled
0
   def after_save(record)
0
     @event.update_attributes :title => record.article.title, :body => record.body, :site => record.article.site,
0
-      :article => record.article, :author => record.author, :comment => record if record.approved?
0
+      :article => record.article, :author => record.author, :comment => record if record.approved? && !disabled
0
   end
0
 
0
   def after_destroy(record)

0
@@ -1,5 +1,8 @@
0
 class Article < Content
0
   class CommentNotAllowed < StandardError; end
0
+  
0
+  include Mephisto::TaggableMethods
0
+  
0
   validates_presence_of :title, :user_id, :site_id
0
 
0
   before_validation { |record| record.set_default_filter! }
0
@@ -107,7 +110,8 @@ class Article < Content
0
   end
0
 
0
   def filter=(new_filter)
0
-    @old_filter ||= read_attribute :filter
0
+    return if new_filter == read_attribute(:filter)
0
+    @old_filter ||= read_attribute(:filter)
0
     write_attribute :filter, new_filter
0
   end
0
 
0
@@ -167,11 +171,13 @@ class Article < Content
0
     
0
     def pass_filter_to_comments
0
       return unless @old_filter
0
-      self.record_timestamps = false
0
+      self.record_timestamps  = false
0
+      CommentObserver.disabled = true
0
       comments.each { |c| c.update_attributes(:filter => filter) }
0
       @old_filter = nil
0
       true
0
     ensure
0
-      self.record_timestamps = true
0
+      self.record_timestamps   = true
0
+      CommentObserver.disabled = false
0
     end
0
 end
0
\ No newline at end of file

0
@@ -27,7 +27,7 @@ class Tagging < ActiveRecord::Base
0
     #   Tagging.add_to taggable, [Tag, Tag, Tag]
0
     def add_to(taggable, tags)
0
       (tags - taggable.tags).each do |tag|
0
-        create! :taggable => taggable, :tag => tag
0
+        tg= create! :taggable => taggable, :tag => tag
0
       end unless tags.empty?
0
     end
0
   end

0
@@ -9,6 +9,8 @@
0
     <dd id="x-body" style="display:none"><%= form.text_area :excerpt, :rows => '8', :class => 'fat'  %></dd>
0
     <dt><label for="article_body">Write your article</label> <span class="hint">(<%= link_to_function 'Add an excerpt', %(Element.toggle('x-lbl', 'x-body')) %>)</span></dt>
0
     <dd><%= form.text_area :body, :class => 'fat'  %></dd>
0
+    <dt><label for="article_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma.</span></dt>
0
+    <dd><%= form.text_field :tag %></dd>
0
   </dl>
0
 </div>
0
 <!-- /end required fields -->

0
@@ -1,7 +1,7 @@
0
 <dl class="group">
0
   <dt><label for="asset_title">Title</label></dt>
0
   <dd><%= form.text_field :title %></dd>
0
-  <dt><label for="asset_tag">Tag</label></dt>
0
+  <dt><label for="asset_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma.</span></dt>
0
   <dd><%= form.text_field :tag %></dd>
0
   <dt><label for="asset_uploaded_data">Upload</label></dt>
0
   <dd><%= form.file_field :uploaded_data %></dd>

0
@@ -2,7 +2,7 @@
0
 # migrations feature of ActiveRecord to incrementally modify your database, and
0
 # then regenerate this schema definition.
0
 
0
-ActiveRecord::Schema.define(:version => 46) do
0
+ActiveRecord::Schema.define(:version => 47) do
0
 
0
   create_table "assets", :force => true do |t|
0
     t.column "content_type", :string

0
@@ -131,6 +131,23 @@ class ArticleTest < Test::Unit::TestCase
0
     assert_equal User.find_with_deleted(3), contents(:another).user
0
   end
0
 
0
+  def test_should_set_tags
0
+    assert_equal '', contents(:welcome).tag
0
+    assert_difference Tagging, :count, 2 do
0
+      contents(:welcome).update_attribute :tag, 'ruby, rails'
0
+    end
0
+    assert_equal 'rails, ruby', contents(:welcome).reload.tag
0
+  end
0
+
0
+  def test_should_set_tags_upon_article_creation
0
+    a = nil
0
+    assert_difference Tagging, :count, 2 do
0
+      a = create_article :tag => 'ruby, rails', :body => 'foo'
0
+      assert_valid a
0
+    end
0
+    assert_equal 'rails, ruby', a.reload.tag
0
+  end
0
+
0
   protected
0
     def create_article(options = {})
0
       Article.create options.reverse_merge(:user_id => 1, :site_id => 1, :title => 'foo')

0
@@ -15,8 +15,10 @@ class EventTest < Test::Unit::TestCase
0
   end
0
 
0
   def test_should_create_edit_article_event
0
-    assert_event_created_for :welcome, 'edit' do |article|
0
-      article.update_attributes :title => 'foo', :body => 'bar', :updater => users(:quentin)
0
+    assert_difference Event, :count do
0
+      assert_event_created_for :welcome, 'edit' do |article|
0
+        article.update_attributes :title => 'foo', :body => 'bar', :updater => users(:quentin), :filter => 'markdown_filter'
0
+      end
0
     end
0
   end
0