backports 1.6.7 → 1.6.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 6
-:patch: 7
+:patch: 8

data/lib/backports/symbol.rb

@@ -4,17 +4,34 @@ class Symbol
     Proc.new { |*args| args.shift.__send__(self, *args) }
   end unless :to_proc.respond_to?(:to_proc)
   
-  [ [%w(<=> casecmp), {:before => "return nil unless args.first.is_a? Symbol" }],
-    [%w(capitalize downcase next succ swapcase upcase), {:after => ".to_s"}],
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  [ [%w(capitalize downcase next succ swapcase upcase), {:after => ".to_sym"}],
     [%w(=~ [] empty? length match size), {}]
   ].each { |methods, options| methods.each do |method|
     module_eval <<-end_eval
       def #{method}(*args)
-        #{options[:before]}
         to_s.#{method}(*args)#{options[:after]}
       end unless method_defined? :#{method}
     end_eval
   end }
 
-  include Comparable unless ancestors.include? Comparable
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  def <=>(with)
+    return nil unless with.is_a? Symbol
+    to_s <=> with.to_s
+  end unless method_defined? :"<=>"
+
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  def casecmp(with)
+    return nil unless with.is_a? Symbol
+    to_s.casecmp(with.to_s)
+  end unless method_defined? :casecmp
+
+  # Standard in ruby 1.9. See official documentation[http://ruby-doc.org/core-1.9/classes/Symbol.html]
+  unless ancestors.include? Comparable
+    alias_method :dont_override_equal_please, :==
+    include Comparable
+    alias_method :==,  :dont_override_equal_please
+  end
+    
 end

data/test/symbol_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class SymbolTest < Test::Unit::TestCase
+  context "Symbol" do
+    context "comparison" do
+      should "work as expected" do
+        assert_equal false, :abc == :def
+        assert_equal true, :abc == :abc
+        assert_equal false, :abc == "abc"
+        assert_equal false, :abc > :def
+        assert_equal true, :abc < :def
+        assert_raise(ArgumentError) {:abc < "def"}
+      end
+    end
+
+    context "string ops" do
+      should "work as expected" do
+        assert_equal :HELLO, :hello.upcase
+        assert_equal 5, :hello.length
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backports
 version: !ruby/object:Gem::Version 
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -60,6 +60,7 @@ files:
 - test/object_test.rb
 - test/regexp_test.rb
 - test/string_test.rb
+- test/symbol_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/marcandre/backports
@@ -105,4 +106,5 @@ test_files:
 - test/object_test.rb
 - test/regexp_test.rb
 - test/string_test.rb
+- test/symbol_test.rb
 - test/test_helper.rb