string_case_pl 0.0.6 → 0.1.0

data/Rakefile

@@ -19,7 +19,8 @@ end
 
 desc "Run tests"
 task :test do
-  sh "ruby test/*"
+  sh "ruby test/test_character_case_change.rb"
+  sh "ruby test/test_comparison.rb"
 end
 
 desc "Clean"

data/lib/string_case_pl.rb

@@ -14,11 +14,11 @@ class String
   PL_WINDOWS_1250_LOWER = PL_UTF_8_LOWER.encode(WINDOWS_CP1250_ENCODING)
   PL_WINDOWS_1250_UPPER = PL_UTF_8_UPPER.encode(WINDOWS_CP1250_ENCODING)
 
-  alias old_downcase_wo_pl downcase!
-  alias old_upcase_wo_pl upcase!
+  alias old_downcase_wo_pl downcase
+  alias old_upcase_wo_pl upcase
   alias old_capitalize_wo_pl capitalize
 
-  def downcase!
+  def downcase
     case self.encoding.name
     when UTF_8_ENCODING
       self.tr!(PL_UTF_8_UPPER,PL_UTF_8_LOWER)
@@ -30,13 +30,7 @@ class String
     self.old_downcase_wo_pl
   end
 
-  def downcase
-    str = self.dup
-    str.downcase!
-    str
-  end
-
-  def upcase!
+  def upcase
     case self.encoding.name
     when UTF_8_ENCODING
       self.tr!(PL_UTF_8_LOWER, PL_UTF_8_UPPER)
@@ -48,12 +42,6 @@ class String
     self.old_upcase_wo_pl
   end
 
-  def upcase
-    str = self.dup
-    str.upcase!
-    str
-  end
-
   def capitalize
     s = self.dup
     s[0] = s[0].upcase
@@ -68,4 +56,3 @@ class String
   end
 
 end
-

data/lib/string_cmp_pl.rb

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+require 'string_case_pl'
+
+class String
+  PL_LETTER_ORDER = {}
+
+  ("AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ" +
+   "aąbcćdeęfghijklłmnńoópqrsśtuvwxyzźż").force_encoding(UTF_8_ENCODING).
+   each_char.with_index do |char,index|
+    PL_LETTER_ORDER[char] = index
+  end
+
+  alias old_cmp_wo_pl <=>
+
+  def <=>(other)
+    if !other.is_a?(String)
+      old_cmp_wo_pl(other)
+    elsif self.encoding.name != UTF_8_ENCODING ||
+      other.encoding.name != UTF_8_ENCODING
+      case self.encoding.name
+      when UTF_8_ENCODING
+        case other.encoding.name
+        when ISO_8859_2_ENCODING,WINDOWS_CP1250_ENCODING
+          self.<=>(other.encode(UTF_8_ENCODING))
+        else
+          old_cmp_wo_pl(other)
+        end
+      when ISO_8859_2_ENCODING
+        case other.encoding.name
+        when UTF_8_ENCODING
+          self.encode(UTF_8_ENCODING) <=> other
+        when ISO_8859_2_ENCODING,WINDOWS_CP1250_ENCODING
+          self.encode(UTF_8_ENCODING) <=> other.encode(UTF_8_ENCODING)
+        else
+          old_cmp_wo_pl(other)
+        end
+      when WINDOWS_CP1250_ENCODING
+        case other.encoding.name
+        when UTF_8_ENCODING
+          self.encode(UTF_8_ENCODING) <=> other
+        when ISO_8859_2_ENCODING,WINDOWS_CP1250_ENCODING
+          self.encode(UTF_8_ENCODING) <=> other.encode(UTF_8_ENCODING)
+        else
+          old_cmp_wo_pl(other)
+        end
+      else
+        old_cmp_wo_pl(other)
+      end
+    else
+      self.each_char.with_index do |char,index|
+        position1 = PL_LETTER_ORDER[char]
+        position2 = PL_LETTER_ORDER[other[index]]
+        if position1 && position2
+          if position1 != position2
+            return (position1 < position2 ? -1 : 1)
+          end
+        else
+          if other[index]
+            if char.old_cmp_wo_pl(other[index]) != 0
+              return char.old_cmp_wo_pl(other[index])
+            end
+          else
+            return 1
+          end
+        end
+      end
+      # all equal, compare length
+      if self.length == other.length
+        return 0
+      elsif self.length < other.length
+        return -1
+      else
+        return 1
+      end
+    end
+  end
+end

data/string_case_pl.gemspec

@@ -1,15 +1,14 @@
 Gem::Specification.new do |s|
   s.name = "string_case_pl"
-  s.version = "0.0.6"
-  s.required_ruby_version = '>= 1.9.2'
-  s.date = "2011-08-02"
+  s.version = "0.1.0"
+  s.date = "2011-01-11"
   s.summary = "Additional support for Polish encodings in Ruby 1.9"
   s.email = "apohllo@o2.pl"
-  s.homepage = "http://apohllo.pl/blog"
-  s.description = "Polish extensions for Ruby 1.9 String #upcase(!), #downcase(!) and #capitalize(!) supporting polish diacritics"
+  s.homepage = "https://github.com/apohllo/string_pl"
+  s.description = "Polish extensions for Ruby 1.9 String #upcase, #downcase and #capitalize supporting polish diacritics"
   s.require_path = "lib"
   s.has_rdoc = false
-  s.authors = ['Aleksander Pohl']
+  s.authors = ['Aleksander Pohl',"hosiawak","sebcioz"]
   s.files = ["Rakefile", "string_case_pl.gemspec", 'lib/string_case_pl.rb'] +
     Dir.glob("lib/**/*")
   s.test_files = Dir.glob("{test}/**/*")

data/test/test_character_case_change.rb

@@ -38,112 +38,23 @@ class TestCharacterCaseChange < Test::Unit::TestCase
   def test_windows_1250_upcase
     assert_equal(@windows_upper, @windows_lower.upcase)
   end
-
+  
   def test_utf_8_capitalize
     assert_equal(@utf_capitalized, @utf_lower.capitalize)
   end
-
+  
   def test_windows_1250_capitalize
     assert_equal(@windows_capitalized, @windows_lower.capitalize)
   end
-
+  
   def test_iso_8859_2_capitalize
     assert_equal(@iso_capitalized, @iso_lower.capitalize)
   end
-
-  def test_preserve_utf_lower_case
-    original = @utf_lower.dup
-    @utf_lower.upcase
-    assert_equal(original,@utf_lower)
-  end
-
-  def test_preserve_utf_upper_case
-    original = @utf_upper.dup
-    @utf_upper.downcase
-    assert_equal(original,@utf_upper)
-  end
-
-  def test_preserve_iso_lower_case
-    original = @iso_lower.dup
-    @iso_lower.upcase
-    assert_equal(original,@iso_lower)
-  end
-
-  def test_preserve_iso_upper_case
-    original = @iso_upper.dup
-    @iso_upper.downcase
-    assert_equal(original,@iso_upper)
-  end
-
-  def test_preserve_windows_lower_case
-    original = @windows_lower.dup
-    @windows_lower.upcase
-    assert_equal(original,@windows_lower)
-  end
-
-  def test_preserve_windows_upper_case
-    original = @windows_upper.dup
-    @windows_upper.downcase
-    assert_equal(original,@windows_upper)
-  end
-
-  def test_same_case
-    copy = @utf_lower.dup
-    assert_equal(@utf_lower,copy.downcase)
-  end
-
-  def test_same_case_bang
-    copy = @utf_lower.dup
-    assert_equal(nil,copy.downcase!)
-    assert_equal(copy,@utf_lower)
-  end
-
-  def test_change_utf_lower_case
-    copy = @utf_lower.dup
-    copy.upcase!
-    assert_equal(copy,@utf_upper)
-  end
-
-  def test_change_utf_upper_case
-    copy = @utf_upper.dup
-    copy.downcase!
-    assert_equal(copy,@utf_lower)
-  end
-
-  def test_change_iso_lower_case
-    copy = @iso_lower.dup
-    copy.upcase!
-    assert_equal(copy,@iso_upper)
-  end
-
-  def test_change_iso_upper_case
-    copy = @iso_upper.dup
-    copy.downcase!
-    assert_equal(copy,@iso_lower)
-  end
-
-  def test_change_windows_lower_case
-    copy = @windows_lower.dup
-    copy.upcase!
-    assert_equal(copy,@windows_upper)
-  end
-
-  def test_change_windows_upper_case
-    copy = @windows_upper.dup
-    copy.downcase!
-    assert_equal(copy,@windows_lower)
-  end
-
-  def test_capitalize
-    original = @utf_lower.dup
-    assert_equal(original.capitalize, @utf_capitalized)
-    assert_equal(original, @utf_lower)
-  end
-
+  
   def test_capitalize!
-    copy = @utf_lower.dup
-    assert_equal(copy.capitalize!, @utf_capitalized)
-    assert_equal(copy.capitalize!, nil)
+    d = @utf_lower.dup
+    assert_equal(d.capitalize!, @utf_capitalized)
+    assert_equal(d.capitalize!, nil)
   end
-
+  
 end

data/test/test_comparison.rb

@@ -0,0 +1,107 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + "/test_helper")
+
+class TestCharacterCaseChange < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_each_small_letter_comparison
+    assert_equal("a" <=> "b",-1)
+    assert_equal("a" <=> "ą",-1)
+    assert_equal("ą" <=> "a",1)
+    assert_equal("ą" <=> "ą",0)
+    assert_equal("b" <=> "ą",1)
+    assert_equal("b" <=> "ć",-1)
+    assert_equal("ć" <=> "ć",0)
+    assert_equal("ć" <=> "e",-1)
+    assert_equal("ć" <=> "b",1)
+    assert_equal("ę" <=> "e",1)
+    assert_equal("ę" <=> "f",-1)
+    assert_equal("ł" <=> "l",1)
+    assert_equal("ł" <=> "m",-1)
+    assert_equal("ń" <=> "n",1)
+    assert_equal("ń" <=> "o",-1)
+    assert_equal("ó" <=> "o",1)
+    assert_equal("ó" <=> "p",-1)
+    assert_equal("ś" <=> "s",1)
+    assert_equal("ś" <=> "t",-1)
+    assert_equal("ź" <=> "z",1)
+    assert_equal("ź" <=> "ż",-1)
+    assert_equal("ż" <=> "ź",1)
+  end
+
+  def test_each_big_letter_comparison
+    assert_equal("A" <=> "B",-1)
+    assert_equal("A" <=> "Ą",-1)
+    assert_equal("Ą" <=> "A",1)
+    assert_equal("Ą" <=> "Ą",0)
+    assert_equal("B" <=> "Ą",1)
+    assert_equal("B" <=> "Ć",-1)
+    assert_equal("Ć" <=> "Ć",0)
+    assert_equal("Ć" <=> "E",-1)
+    assert_equal("Ć" <=> "B",1)
+    assert_equal("Ę" <=> "E",1)
+    assert_equal("Ę" <=> "F",-1)
+    assert_equal("Ł" <=> "L",1)
+    assert_equal("Ł" <=> "M",-1)
+    assert_equal("Ń" <=> "N",1)
+    assert_equal("Ń" <=> "O",-1)
+    assert_equal("Ó" <=> "O",1)
+    assert_equal("Ó" <=> "P",-1)
+    assert_equal("Ś" <=> "S",1)
+    assert_equal("Ś" <=> "T",-1)
+    assert_equal("Ź" <=> "Z",1)
+    assert_equal("Ź" <=> "Ż",-1)
+    assert_equal("Ż" <=> "Ź",1)
+  end
+
+  def test_non_string_comparison
+    assert_equal("a" <=> nil,nil)
+    assert_equal("ą" <=> nil,nil)
+    assert_equal(nil <=> "a",nil)
+    assert_equal(nil <=> "ą",nil)
+  end
+
+  def test_cross_encoding_comparison
+    assert_equal("a" <=> "b".encode("iso-8859-2"),-1)
+    assert_equal("a".encode("iso-8859-2") <=> "ą",-1)
+    assert_equal("a" <=> "ą".encode("iso-8859-2"),-1)
+    assert_equal("ą".encode("iso-8859-2") <=> "a".encode("iso-8859-2"),1)
+    assert_equal("a".encode("iso-8859-2") <=> "ą".encode("iso-8859-2"),-1)
+    assert_equal("ą".encode("iso-8859-2") <=> "ą".encode("iso-8859-2"),0)
+    assert_equal("b".encode("Windows-1250") <=> "ą".encode("iso-8859-2"),1)
+    assert_equal("b".encode("iso-8859-2") <=> "ć".encode("Windows-1250"),-1)
+    assert_equal("b".encode("iso-8859-2") <=> "b".encode("Windows-1250"),0)
+    assert_equal("ć".encode("Windows-1250") <=> "ć".encode("Windows-1250"),0)
+    assert_equal("ć".encode("Windows-1250") <=> "e".encode("Windows-1250"),-1)
+    assert_equal("ć" <=> "b".encode("Windows-1250"),1)
+    assert_equal("ę".encode("Windows-1250") <=> "e",1)
+    assert_equal("ę" <=> "ę".encode("Windows-1250"),0)
+    assert_equal("ę".encode("Windows-1250") <=> "ę",0)
+  end
+
+  def test_multiletter_comparison
+    assert_equal("" <=> "ał",-1)
+    assert_equal("ał" <=> "",1)
+    assert_equal("a" <=> "ał",-1)
+    assert_equal("ał" <=> "a",1)
+    assert_equal("ał" <=> "ał",0)
+    assert_equal("ó" <=> "ów",-1)
+    assert_equal("ów" <=> "ó",1)
+  end
+
+  def test_sort
+    assert_equal(
+      ["ała","ama","ala"].sort,
+      ["ala","ała","ama"])
+  end
+
+  def test_case_comparison
+    assert_equal("Ą" <=> "ą",-1)
+    assert_equal("ą" <=> "Ą",1)
+    assert_equal("a" <=> "Ą",1)
+    assert_equal("Ą" <=> "a",-1)
+  end
+
+end

data/test/test_helper.rb

@@ -2,3 +2,4 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'test/unit'
 require 'string_case_pl'
+require 'string_cmp_pl'

metadata

@@ -2,18 +2,21 @@
 name: string_case_pl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Aleksander Pohl
+- hosiawak
+- sebcioz
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 Z
+date: 2011-01-11 00:00:00 +01:00
+default_executable: 
 dependencies: []
 
-description: "Polish extensions for Ruby 1.9 String #upcase(!), #downcase(!) and #capitalize(!) supporting polish diacritics"
+description: "Polish extensions for Ruby 1.9 String #upcase, #downcase and #capitalize supporting polish diacritics"
 email: apohllo@o2.pl
 executables: []
 
@@ -25,9 +28,12 @@ files:
 - Rakefile
 - string_case_pl.gemspec
 - lib/string_case_pl.rb
+- lib/string_cmp_pl.rb
+- test/test_comparison.rb
 - test/test_character_case_change.rb
 - test/test_helper.rb
-homepage: http://apohllo.pl/blog
+has_rdoc: true
+homepage: https://github.com/apohllo/string_pl
 licenses: []
 
 post_install_message: 
@@ -40,7 +46,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.9.2
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -50,10 +56,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Additional support for Polish encodings in Ruby 1.9
 test_files: 
+- test/test_comparison.rb
 - test/test_character_case_change.rb
 - test/test_helper.rb