rogdl 0.1.3 → 0.1.6

data/lib/string.rb

@@ -7,17 +7,19 @@ class String
   
   def upper_camel_case
     str = self
-    str.gsub!(/[^a-zA-Z_\- ]/," ")
-    str = " " + str.split.join(" ")
-    str.gsub!(/ (.)/) { $1.upcase }
     
-    str.gsub!(/[^a-zA-Z_\- ]/,"_")
+    str.gsub!(/-/,"_")
+    str.gsub!(/ /,"_")
+    str.gsub!(/[^a-zA-Z0-9_\- ]/,"_")
     str = "_" + str.split.join("_")
     str.gsub!(/_(.)/) { $1.upcase }
     
     return str
+
   end
   
+  
+  
   def pluralize
 #  TODO: replace with call to Inflector.pluralize
     return self + 's' if self[length-1, length] != 's'

data/test/test_string.rb

@@ -6,14 +6,29 @@ class TestString < Test::Unit::TestCase
   include Rogdl
 
   def test_camel_case
+    assert_equal 'someText', 'Some Text'.camel_case
+    assert_equal 'someText', 'Some text'.camel_case
+    
     assert_equal 'someText', 'some text'.camel_case
     assert_equal 'someText', 'some_text'.camel_case
+    assert_equal 'someText', 'some-text'.camel_case
+
+    assert_equal 'someText1', 'some text 1'.camel_case
+    assert_equal 'someText1', 'some_text_1'.camel_case
+    assert_equal 'someText1', 'some-text-1'.camel_case
   end
 
   def test_upper_camel_case
     assert_equal 'SomeText', 'some text'.upper_camel_case
     assert_equal 'SomeText', 'some_text'.upper_camel_case
+    assert_equal 'SomeText', 'some-text'.upper_camel_case
+
+    assert_equal 'SomeText1', 'some text 1'.upper_camel_case
+    assert_equal 'SomeText1', 'some_text_1'.upper_camel_case
+    assert_equal 'SomeText1', 'some-text-1'.upper_camel_case
   end
+  
+  
 
   def test_pluralize
     assert_equal 'dogs', 'dog'.pluralize

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rogdl
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-08-21 00:00:00 -05:00
+  version: 0.1.6
+date: 2007-08-22 00:00:00 -05:00
 summary: Rogdl is a package for parsing OGDL files.
 require_paths: 
 - lib