0
@@ -1,5 +1,9 @@
0
 * SVN *
0
 
0
+* 0.7.1 PRE-RELEASE *
0
+
0
+* add more robust tagging [Moritz Angermann]
0
+
0
 * Fixed duplicate body bug in default Simpla theme when article has no excerpt
0
 
0
 * Show excerpt by default on admin edit if the article has one

0
@@ -52,7 +52,7 @@ class MetaWeblogService < XmlRpcService
0
       :categories        => article.sections.collect { |c| c.name },
0
       :mt_text_more      => article.body.to_s,
0
       :mt_excerpt        => article.excerpt.to_s,
0
-      # :mt_keywords       => article.keywords.to_s,
0
+      :mt_keywords       => article.tag,
0
       # :mt_allow_comments => article.allow_comments? ? 1 : 0,
0
       # :mt_allow_pings    => article.allow_pings? ? 1 : 0,
0
       # :mt_convert_breaks => (article.text_filter.name.to_s rescue ''),
0
@@ -72,6 +72,9 @@ class MetaWeblogService < XmlRpcService
0
       # if no categories are supplied do not attempt to set any.
0
       article.section_ids = Section.find(:all, :conditions => ['name IN (?)', struct['categories']]).collect(&:id) if struct['categories']
0
       article.attributes = {:updater => @user, :body => struct['description'].to_s, :title => struct['title'].to_s, :excerpt => struct['mt_excerpt'].to_s}
0
+      # Keywords/Tags support
0
+      Tagging.set_on article, struct['mt_keywords'] if struct['mt_keywords'] # set/modify keywords _only_ if they are supplied. mt_keywords _overwrite_ not alter the ``tags''
0
+
0
       utc_date = Time.utc(struct['dateCreated'].year, struct['dateCreated'].month, struct['dateCreated'].day, struct['dateCreated'].hour, struct['dateCreated'].sec, struct['dateCreated'].min) rescue article.published_at || Time.now.utc
0
       article.published_at = publish == true ? utc_date : nil
0
       article.save!

0
@@ -12,9 +12,17 @@ class Tag < ActiveRecord::Base
0
     #   # => ['a', 'b', 'c']
0
     def parse(list)
0
       return list if list.is_a?(Array)
0
-      list.split(',').collect! { |s| s.gsub(/[^\w\ ]+/, '').downcase.strip }.delete_if { |s| s.blank? }
0
+      # more robust does handle all kinds of different tags. (comma seperated, space seperated (in quotation marks))
0
+      # should handle most the common keyword formats.
0
+      # e.g.: b'log, emacs fun, rails, ruby => "b'log", "emacs fun", "rails", "ruby"
0
+      #       "b'log" "emacs fun" "rails" "ruby" => "b'log", "emacs fun", "rails", "ruby"
0
+      #       'b\'log' 'emacs fun' 'rails' 'ruby' => "b'log", "emacs fun", "rails", "ruby"
0
+      #
0
+      list.scan(/((?: |)['"]{0,1})['"]?(.*?)(?:[,'"]|$)(?:\1(?: |$))/).collect{ |tag| tag.last }.uniq.delete_if{ |tag| tag == "" }
0
+      # the old version for legacy comparison.
0
+      #list.split(',').collect! { |s| s.gsub(/[^\w\ ]+/, '').downcase.strip }.delete_if { |s| s.blank? }
0
     end
0
-    
0
+
0
     # Parses comma separated tag list and returns tags for them.
0
     #
0
     #   Tag.parse_to_tags('a, b, c')
0
@@ -22,9 +30,9 @@ class Tag < ActiveRecord::Base
0
     def parse_to_tags(list)
0
       find_or_create(parse(list))
0
     end
0
-    
0
+
0
     # Returns Tags from an array of tag names
0
-    # 
0
+    #
0
     #   Tag.find_or_create(['a', 'b', 'c'])
0
     #   # => [Tag, Tag, Tag]
0
     def find_or_create(tag_names)
0
@@ -38,8 +46,8 @@ class Tag < ActiveRecord::Base
0
   def ==(comparison_object)
0
     super || name == comparison_object.to_s
0
   end
0
-  
0
+
0
   def to_s()     name end
0
   alias to_param  to_s
0
   alias to_liquid to_s
0
-end
0
\ No newline at end of file
0
+end

0
@@ -151,6 +151,54 @@ class BackendControllerTest < Test::Unit::TestCase
0
     end
0
   end
0
 
0
+  def test_meta_weblog_new_post_tags
0
+    # test weather we can create a new post, set tags and get away with it...
0
+    tags = 'blog, emacs, fun, rails, ruby'
0
+    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
0
+
0
+    args = [ 1, 'quentin', 'test', article, 1 ]
0
+
0
+    result = invoke_layered :metaWeblog, :newPost, *args
0
+    # assert result
0
+    new_post = Article.find(result)
0
+    assert_equal Tag.parse_to_tags(tags).collect(&:name).sort, new_post.tags.collect(&:name).sort
0
+  end
0
+
0
+  def test_meta_weblog_edit_post_tags
0
+    # changing tags
0
+    tags = 'blog, emacs, fun, rails, ruby'
0
+    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
0
+    args = [ 1, 'quentin', 'test', article, 1 ]
0
+    post_id = invoke_layered :metaWeblog, :newPost, *args
0
+
0
+    new_post = Article.find(post_id)
0
+    assert_equal Tag.parse_to_tags(tags).collect(&:name).sort, new_post.tags.collect(&:name).sort
0
+
0
+    tags = 'bar, baz, foo'
0
+    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
0
+    args = [ post_id, 'quentin', 'test', article, 1]
0
+    edit_result = invoke_layered :metaWeblog, :editPost, *args
0
+    assert_equal true, edit_result
0
+
0
+    new_post = Article.find(post_id)
0
+    assert_equal Tag.parse_to_tags(tags).collect(&:name).sort, new_post.tags.collect(&:name).sort
0
+  end
0
+
0
+  def test_meta_weblog_get_post_with_tags
0
+    # set tags and see if we recive them!
0
+    tags = 'blog, emacs, fun, rails, ruby'
0
+    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
0
+
0
+    args = [ 1, 'quentin', 'test', article, 1 ]
0
+    post_id = invoke_layered :metaWeblog, :newPost, *args
0
+
0
+    args = [ post_id, 'quentin', 'test' ]
0
+    result = invoke_layered :metaWeblog, :getPost, *args
0
+
0
+    assert_equal tags, result['mt_keywords']
0
+  end
0
+
0
+
0
   def test_meta_weblog_new_post_min
0
     # This is going to test weather a post is correctly submited or not without the published_at field!
0
     # See http://www.xmlrpc.com/metaWeblogApi#theStruct or
0
@@ -195,7 +243,6 @@ class BackendControllerTest < Test::Unit::TestCase
0
         assert_equal 'This is a title', new_post.title
0
         assert_equal c[:expect], new_post.status
0
       end
0
-
0
     end
0
   end
0
 
0
@@ -253,5 +300,4 @@ class BackendControllerTest < Test::Unit::TestCase
0
         'bits' => Base64.encode64(File.open(File.expand_path(RAILS_ROOT) + '/public/images/mephisto/shadow.png', 'rb') { |f| f.read })
0
       ))
0
     end
0
-
0
 end

0
@@ -5,6 +5,23 @@ class TagTest < Test::Unit::TestCase
0
 
0
   def test_should_parse_comma_separated_tags
0
     assert_equal %w(a b c), Tag.parse('a, b, c')
0
+    assert_equal %w(a b\ c), Tag.parse('a, b c')
0
+  end
0
+
0
+  def test_should_parse_simple_tags
0
+    assert_equal %w(a b c), Tag.parse("'a' 'b' 'c'")
0
+    assert_equal %w(a b c), Tag.parse('"a" "b" "c"')
0
+  end
0
+
0
+  def test_should_parse_more_complicated_tags
0
+    # with quotation marks _in_ the string.
0
+    assert_equal %w(tagging it's weirdness), Tag.parse('tagging, it\'s, weirdness')
0
+    assert_equal %w(tagging it"s weirdness), Tag.parse('tagging, it"s, weirdness')
0
+    assert_equal %w(tagging it's weirdness), Tag.parse('"tagging" "it\'s" "weirdness"')
0
+    assert_equal %w(tagging it's weirdness), Tag.parse("'tagging' 'it's' 'weirdness'")
0
+    # with spaces...
0
+    assert_equal %w(tagging it's\ weirdness), Tag.parse("'tagging' 'it's weirdness'")
0
+    assert_equal %w(tagging it's\ weirdness), Tag.parse('"tagging" "it\'s weirdness"')
0
   end
0
 
0
   def test_should_return_tag_array
0
@@ -22,12 +39,12 @@ class TagTest < Test::Unit::TestCase
0
       Tag.parse_to_tags 'ruby, a, b, rails, c'
0
     end
0
   end
0
-  
0
+
0
   def test_tag_equality
0
     assert_equal tags(:ruby), 'ruby'
0
     assert_equal Tag.find_by_name('ruby'), tags(:ruby)
0
   end
0
-  
0
+
0
   def test_should_select_tags_by_name
0
     assert_equal tags(:ruby), Tag[:ruby]
0
   end

0
@@ -24,7 +24,7 @@ context "Asset Tagging" do
0
     end
0
     assert_equal [], assets(:gif).reload.tags
0
   end
0
-  
0
+
0
   specify "should change tags" do
0
     assert_difference Tagging, :count, 2 do
0
       assert_difference Tag, :count do
0
@@ -63,7 +63,7 @@ context "Article Tagging" do
0
     end
0
     assert_equal [], contents(:another).reload.tags
0
   end
0
-  
0
+
0
   specify "should change tags" do
0
     assert_difference Tagging, :count, 2 do
0
       assert_difference Tag, :count do