decisionpatterns · wibeasley · Dec 21, 2017 · Dec 21, 2017 · Dec 21, 2017 · Dec 21, 2017
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -47,6 +47,5 @@ Collate:
     'utils.R'
     'zzz.R'
 VignetteBuilder: knitr
-RoxygenNote: 5.0.1.9000
+RoxygenNote: 6.0.1
 Repository: CRAN
-
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,12 @@ lettercase
 ====
 
 
+2018-?-? : Version 0.15.0 
+----
+- New Features:
+-- CamelCase to snake_case (Issue #1)
+
+
 2016-03-03 : Version 0.13.0 
 ----
 First CRAN Release
@@ -10,3 +16,4 @@ First CRAN Release
 -- Update README.md
 -- Improve vignettes
 - Ready for CRAN release
+
diff --git a/R/str_snake_case.R b/R/str_snake_case.R
@@ -14,6 +14,8 @@
 #' * multiple adjacent undescores are replaced by single underscore 
 #' * Underscores at beginning or end of names are dropped  
 #' 
+#' @note The CamelCase conversion is adapted from an approach described on [Stack Overflow](https://stackoverflow.com/questions/1175208/elegant-python-function-to-convert-camelcase-to-snake-case/1176023#1176023).
+#' 
 #' @examples
 #'   str_snake_case( "One Flew Over The Cuckoo's Nest" )
 #'   str_snake_case( "Catch-22" )  # catch_22
@@ -22,6 +24,10 @@
 #'   str_snake_case( "Catch  22" )
 #'   str_snake_case( " Catch 22 " )
 #'   
+#'   str_snake_case( "patient.dob" )
+#'   str_snake_case( "patientDob" )
+#'   str_snake_case( "PatientDob" )
+#'   
 #' @rdname str_snake_case
 #' @aliases str_snake_case
 #' @export
@@ -35,6 +41,10 @@ str_snake_case <- function(
 
   # for( ac in acronyms )  string <- gsub( tolower(ac), ac, string )
 
+  # The first two lines accommodate CamelCase: https://stackoverflow.com/questions/1175208/elegant-python-function-to-convert-camelcase-to-snake-case/1176023#1176023
+  string <- gsub("(.)([A-Z][a-z]+)" , "\\1_\\2", string, perl=TRUE )                 # Separate w/ dashes based on capitalization
+  string <- gsub("([a-z0-9])([A-Z])", "\\1_\\2", string, perl=TRUE )
+
   string <- gsub( '[^\\w\\s-\\.]', '', string, perl=TRUE )
   string <- tolower(string)
   string <- gsub( pattern_separators, '_', string, perl=TRUE )

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ Lettercase
 [![Downloads](http://cranlogs.r-pkg.org/badges/lettercase?color=brightgreen)](http://www.r-pkg.org/pkg/lettercase)
 [![](http://cranlogs.r-pkg.org/badges/grand-total/lettercase)](http://cran.rstudio.com/web/packages/lettercase/index.html)
 [![software impact](http://depsy.org/api/package/r/lettercase/badge.svg)](http://depsy.org/package/r/lettercase)
+[![Build Status](https://travis-ci.org/decisionpatterns/lettercase.svg?branch=dev)](https://travis-ci.org/decisionpatterns/lettercase)
 
 
 Utilities for formatting strings and character vectors to for capitalization,

diff --git a/man/lettercase.Rd b/man/lettercase.Rd
diff --git a/man/make_names.Rd b/man/make_names.Rd
diff --git a/man/make_str_replace.Rd b/man/make_str_replace.Rd
diff --git a/man/patterns.Rd b/man/patterns.Rd
diff --git a/man/str_cap_words.Rd b/man/str_cap_words.Rd
diff --git a/man/str_collapse_whitespace.Rd b/man/str_collapse_whitespace.Rd
diff --git a/man/str_delete.Rd b/man/str_delete.Rd
diff --git a/man/str_is.Rd b/man/str_is.Rd
diff --git a/man/str_sentence_case.Rd b/man/str_sentence_case.Rd
diff --git a/man/str_snake_case.Rd b/man/str_snake_case.Rd
diff --git a/man/str_spine_case.Rd b/man/str_spine_case.Rd
diff --git a/man/str_title_case.Rd b/man/str_title_case.Rd
diff --git a/man/str_transform.Rd b/man/str_transform.Rd
diff --git a/man/str_ucfirst.Rd b/man/str_ucfirst.Rd
diff --git a/man/str_uppercase.Rd b/man/str_uppercase.Rd
diff --git a/man/string_transformations.Rd b/man/string_transformations.Rd
diff --git a/tests/testthat/test-snake_case.r b/tests/testthat/test-snake_case.r
@@ -8,8 +8,19 @@ str_snake_case( 'mission_of_burma' ) %>% expect_equal( 'mission_of_burma' )
 str_snake_case( 'mission-of-burma' ) %>% expect_equal( 'mission_of_burma' )
 str_snake_case( 'mission.of.burma' ) %>% expect_equal( 'mission_of_burma' )
 str_snake_case( 'Mission of Burma' ) %>% expect_equal( 'mission_of_burma' )
+str_snake_case( 'MissionOfBurma'   ) %>% expect_equal( 'mission_of_burma' )
+str_snake_case( 'missionOfBurma'   ) %>% expect_equal( 'mission_of_burma' )
 str_snake_case( ' .mission.of.burma. ' ) %>% expect_equal( 'mission_of_burma' )
 
-# str_snake_case( 'mission-of-burma' ) %>% expect_equal( 'mission_of_burma' )
-# str_snake_case( 'mission_of_burma' ) %>% expect_equal( 'mission_of_burma' )
-# str_snake_case( 'MissionOfBurma' )   %>% expect_equal( 'mission_of_burma' )
+str_snake_case( 'mission' )         %>% expect_equal( 'mission' )
+str_snake_case( 'Mission' )         %>% expect_equal( 'mission' )
+
+str_snake_case( "Catch-22" )        %>% expect_equal( 'catch_22' ) 
+str_snake_case( "Catch.22" )        %>% expect_equal( 'catch_22' )
+str_snake_case( "Catch_22" )        %>% expect_equal( 'catch_22' )
+str_snake_case( "Catch  22" )       %>% expect_equal( 'catch_22' )
+str_snake_case( " Catch 22 " )      %>% expect_equal( 'catch_22' )
+
+str_snake_case( "patient.dob" )     %>% expect_equal( 'patient_dob' )
+str_snake_case( "patientDob" )      %>% expect_equal( 'patient_dob' )
+str_snake_case( "PatientDob" )      %>% expect_equal( 'patient_dob' )