radiant-taggable-extension 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/app/models/tag.rb

@@ -1,5 +1,4 @@
 class Tag < ActiveRecord::Base
-
   attr_accessor :cloud_band, :cloud_size
   
   belongs_to :created_by, :class_name => 'User'
@@ -64,6 +63,10 @@ class Tag < ActiveRecord::Base
     }
   }
   
+  def <=>(othertag)
+    String.natcmp(self.title, othertag.title)
+  end
+  
   def to_s
     title
   end

data/lib/natcmp.rb

@@ -0,0 +1,76 @@
+# natcmp.rb
+#
+# Natural order comparison of two strings
+# e.g. "my_prog_v1.1.0" < "my_prog_v1.2.0" < "my_prog_v1.10.0"
+# which does not follow alphabetically
+#
+# Based on Martin Pool's "Natural Order String Comparison" originally written in C
+# http://sourcefrog.net/projects/natsort/
+#
+# This implementation is Copyright (C) 2003 by Alan Davies
+# <cs96and_AT_yahoo_DOT_co_DOT_uk>
+#
+# This software is provided 'as-is', without any express or implied
+# warranty.  In no event will the authors be held liable for any damages
+# arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software
+#    in a product, an acknowledgment in the product documentation would be
+#    appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+
+class String
+
+  # 'Natural order' comparison of two strings
+  def String.natcmp(str1, str2, caseInsensitive=false)
+    str1, str2 = str1.dup, str2.dup
+    compareExpression = /^(\D*)(\d*)(.*)$/
+
+    if caseInsensitive
+      str1.downcase!
+      str2.downcase!
+    end
+
+    # Remove all whitespace
+    str1.gsub!(/\s*/, '')
+    str2.gsub!(/\s*/, '')
+
+    while (str1.length > 0) or (str2.length > 0) do
+      # Extract non-digits, digits and rest of string
+      str1 =~ compareExpression
+      chars1, num1, str1 = $1.dup, $2.dup, $3.dup
+
+      str2 =~ compareExpression
+      chars2, num2, str2 = $1.dup, $2.dup, $3.dup
+
+      # Compare the non-digits
+      case (chars1 <=> chars2)
+        when 0 # Non-digits are the same, compare the digits...
+          # If either number begins with a zero, then compare alphabetically,
+          # otherwise compare numerically
+          if (num1[0] != 48) and (num2[0] != 48)
+            num1, num2 = num1.to_i, num2.to_i
+          end
+
+          case (num1 <=> num2)
+            when -1 then return -1
+            when 1 then return 1
+          end
+        when -1 then return -1
+        when 1 then return 1
+      end # case
+
+    end # while
+
+    # Strings are naturally equal
+    return 0
+  end
+
+end # class String

data/lib/taggable_tags.rb

@@ -83,7 +83,7 @@ module TaggableTags
   tag 'tags:cloud' do |tag|
     if tag.locals.tags && tag.locals.tags.length > 1
       options = tag.attr.dup
-      tag.locals.tags = Tag.for_cloud(tag.locals.tags).sort_by{|t| t.title.downcase}                          # nb. for_cloud immediately returns list if already sized
+      tag.locals.tags = Tag.for_cloud(tag.locals.tags).sort
       result = []
       result << %{<div class="cloud">}
       tag.locals.tags.each do |t|
@@ -152,7 +152,7 @@ module TaggableTags
       tag.locals.page = found
     end
     raise TagError, "no page for tag_cloud" unless tag.locals.page
-    tag.locals.tags = tag.locals.page.tags_for_cloud(limit)   # page.tags_for_cloud does a lot of inheritance work
+    tag.locals.tags = tag.locals.page.tags_for_cloud(limit).sort   # page.tags_for_cloud does a lot of inheritance work
     tag.render('tags:cloud', options)
   end
 
@@ -176,7 +176,7 @@ module TaggableTags
       tag.locals.page = found
     end
     raise TagError, "no page for tag_list" unless tag.locals.page
-    tag.locals.tags = tag.locals.page.tags_for_cloud(limit)   # page.tags_for_cloud does a lot of inheritance work
+    tag.locals.tags = tag.locals.page.tags_for_cloud(limit).sort
     tag.render('tags:list', options)
   end
   

data/radiant-taggable-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-taggable-extension}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2011-03-13}
   s.description = %q{General purpose tagging extension: more versatile but less focused than the tags extension}
   s.email = %q{will@spanner.org}
   s.extra_rdoc_files = [
@@ -34,16 +34,16 @@ Gem::Specification.new do |s|
      "config/routes.rb",
      "db/migrate/001_create_tags.rb",
      "db/migrate/002_import_keywords.rb",
+     "lib/natcmp.rb",
+     "lib/radiant-taggable-extension.rb",
      "lib/taggable_admin_page_controller.rb",
      "lib/taggable_admin_ui.rb",
      "lib/taggable_model.rb",
      "lib/taggable_page.rb",
      "lib/taggable_tags.rb",
      "lib/tasks/taggable_extension_tasks.rake",
-     "pkg/radiant-taggable-extension-1.2.0.gem",
      "public/images/admin/new-tag.png",
      "public/images/admin/tag.png",
-     "public/images/furniture/detag.png",
      "public/stylesheets/admin/tags.css",
      "public/stylesheets/sass/tagcloud.sass",
      "radiant-taggable-extension.gemspec",

data/spec/models/tag_spec.rb

@@ -21,6 +21,20 @@ describe Tag do
     tags[2].created_at.should be_close((Time.now).utc, 10.seconds)
   end
   
+  it "should stringify as title" do
+    "#{tags(:colourless)}".should == 'colourless'
+  end
+
+  it "should <=> by title" do
+    tags = Tag.from_list('ideas,colourless,lifebelt')
+    tags.sort.first.should == tags(:colourless)
+  end
+
+  it "should sort tags naturally" do
+    tags = Tag.from_list('item2, item11, item13, item20, item1, item0')
+    tags.sort.join(' ').should == %{item0 item1 item2 item11 item13 item20}
+  end
+  
   describe "instantiated" do
     before do
       @tag = tags(:sleep)

data/taggable_extension.rb

@@ -1,9 +1,10 @@
 class TaggableExtension < Radiant::Extension
-  version "1.2.1"
+  version "1.2.2"
   description "General purpose tagging and retrieval extension: more versatile but less focused than the tags extension"
   url "http://github.com/spanner/radiant-taggable-extension"
     
   def activate
+    require 'natcmp'                                                    # a natural sort algorithm. possibly not that efficient.
     ActiveRecord::Base.send :include, TaggableModel                     # provide is_taggable for everything but don't call it for anything
     Page.send :is_taggable                                              # make pages taggable 
     Page.send :include, TaggablePage                                    # then fake the keywords column and add some inheritance

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-taggable-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - spanner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +01:00
+date: 2011-03-13 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,16 +61,16 @@ files:
 - config/routes.rb
 - db/migrate/001_create_tags.rb
 - db/migrate/002_import_keywords.rb
+- lib/natcmp.rb
+- lib/radiant-taggable-extension.rb
 - lib/taggable_admin_page_controller.rb
 - lib/taggable_admin_ui.rb
 - lib/taggable_model.rb
 - lib/taggable_page.rb
 - lib/taggable_tags.rb
 - lib/tasks/taggable_extension_tasks.rake
-- pkg/radiant-taggable-extension-1.2.0.gem
 - public/images/admin/new-tag.png
 - public/images/admin/tag.png
-- public/images/furniture/detag.png
 - public/stylesheets/admin/tags.css
 - public/stylesheets/sass/tagcloud.sass
 - radiant-taggable-extension.gemspec