consistent_company 0.0.3 → 0.0.4

data/README.md

@@ -6,6 +6,8 @@ This was written with the Adverting domain in mind. So many of the common advert
 handled well. Although it can work with other domains you may find need to enhance the specific company name 
 identifiers in IsCompanyName and TransformCompany.
 
+Tested with over 600,000 names from 100's of sources where an overlap of names is expected with a match rate of 40%.
+
 ## Install:
 gem install consistent_company
 

data/consistent_company.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{consistent_company}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Doug Cleven}]
-  s.date = %q{2011-09-20}
+  s.date = %q{2011-09-30}
   s.description = %q{Ruby C Extension to normalize a company name. Useful when company names come from various sources.}
   s.email = %q{dcleven@marketron.com}
   s.extensions = [%q{ext/consistent_company/extconf.rb}]

data/ext/consistent_company/consistent_company.c

@@ -7,6 +7,7 @@
 char * TransformCompany(char * inString);
 static int IsCompanyWord(char * inWord);
 char *trimwhitespace(char *str);
+char *trimsuffix(char *str, const char *suffix);
 char *str_replace(char *orig, const char *rep, const char *with);
 
 static VALUE rb_ConsistentCompany_Init(VALUE self)
@@ -18,6 +19,20 @@ static VALUE rb_ConsistentCompany_Init(VALUE self)
 static VALUE rb_CompanyNamer(VALUE self)
 {
 	char * pSelf = RSTRING_PTR(self);
+	int selfLen = strlen(pSelf)+2;
+	int workLen = selfLen;
+	char * s = pSelf;
+	
+	// calc size of work strings
+	// while processing we turn & = AND, + = PLUS
+	// and we add space at front and back
+	while (s = strpbrk(s, "&+"))
+	{	
+		workLen +=3; // worst case we add 3 chars
+		s++;
+	}
+	workLen += 2;	// add space front and back
+	//////////////
 	
 	// for company only
 	int i;
@@ -25,8 +40,8 @@ static VALUE rb_CompanyNamer(VALUE self)
 	int asc;
 	int numLefts = 0, numRights = 0;
 	int left1 = -1, right1 = -1, left2 = -1, right2 = -1;
-	char * workString = malloc(strlen(pSelf)+2);	// 2 extra chars for TransformCompany
-	char * returnString = malloc(strlen(pSelf)+2);
+	char * workString = malloc(workLen);	// 2 extra chars for TransformCompany
+	char * returnString = malloc(workLen);
 	char * inString;
 	strcpy(workString, pSelf);
 	inString = workString;
@@ -146,8 +161,17 @@ static VALUE rb_CompanyNamer(VALUE self)
 			strcat(returnString, " ");
 		}
 	}
+	// if (strlen(workString) > workLen || strlen(returnString) > workLen)
+	// {
+	// 	char buff[200];
+	// 	sprintf(buff, "workLen %d %s workString %d returnString %d %s", workLen, pSelf, strlen(workString), strlen(returnString), returnString);
+	// 	return rb_str_new2(trimwhitespace(buff));
+	// }
 	char * p;
 	str_replace(returnString, " AND ", " & ");
+	
+	int oldLen = strlen(returnString);
+//	returnString = trimsuffix(returnString, "s");	
 	returnString = trimwhitespace(returnString);
 	strcpy(returnString, TransformCompany(returnString));
 	VALUE return_value = rb_str_new2(trimwhitespace(returnString));
@@ -166,7 +190,7 @@ FIRST FEDERAL SAVINGS becomes 1ST FEDERAL SAVINGS
 char * TransformCompany(char * resultString)
 {
 	// resultString should have been allocated with 2 extra char for our padding here
-	char * buf = malloc(strlen(resultString));
+	char * buf = malloc(strlen(resultString)+3);
 	strcpy(buf, " ");
 	strcat(buf,resultString);
 	strcat(buf, " ");
@@ -203,6 +227,10 @@ char * TransformCompany(char * resultString)
 	str_replace(s, " TENTH ", " 10TH ");
 	str_replace(s, " CENTRE ", " CTR ");
 	str_replace(s, " CENTER ", " CTR ");
+	str_replace(s, " CNTR ", " CTR ");
+	str_replace(s, " CTR ", " CTR ");
+	str_replace(s, " CENT ", " CTR ");
+	str_replace(s, " CENTR ", " CTR ");
 	str_replace(s, " AUTOMOTIVE ", " AUTO ");
 	str_replace(s, " AUTOMOBILE ", " AUTO ");
 	str_replace(s, " AUTOS ", " AUTO ");
@@ -247,7 +275,7 @@ char * TransformCompany(char * resultString)
 		//spaceLoc = resultString.LastIndexOf(" ");
 		if (spaceLoc)  // Look at the last word
 		{
-			char * lastWord = malloc(strlen(spaceLoc));
+			char * lastWord = malloc(strlen(spaceLoc)+1);
 			strcpy(lastWord, spaceLoc + 1);
 			if (IsCompanyWord(lastWord))
 			{
@@ -360,6 +388,44 @@ char *trimwhitespace(char *str)
   return str;
 }
 
+char *trimsuffix(char *str, const char *suffix)
+{
+	char delims[] = " ";
+	char *result = NULL;
+	char *workString = malloc(strlen(str)+3);
+	char *workBuffer = malloc(strlen(str)+3);
+	strcpy(workString, str);
+	str[0] = '\0';
+	result = strtok(workString, delims);
+	while(result != NULL) 
+	{
+		strcpy(workBuffer, result);
+		int len = strlen(workBuffer);
+		if (len > 3)
+		{
+			if (workBuffer[len-1] == 'S')
+			{
+				char * p = strstr(workBuffer, "IES");
+				if (p && p[3] == '\0' && strcmp(workBuffer, "SERIES") != 0)
+				{
+					*p = 'Y';
+					*++p = '\0';
+				}
+				if (strcmp(workBuffer, "PLUS") != 0)
+					workBuffer[len-1] = '\0';
+			}	
+		}
+		strcat(str, workBuffer);
+	    result = strtok( NULL, delims );
+		if (result)
+			strcat(str, " ");
+	}
+	free(workString);
+	free(workBuffer);
+	return str;
+}
+
+
 // !!!! This ONLY works where rep is longer than with
 char *str_replace(char *orig, const char *rep, const char *with)
 {

data/lib/consistent_company/version.rb

@@ -2,7 +2,7 @@ module ConsistentCompany
   module Version
      MAJOR = 0
      MINOR = 0
-     PATCH = 3
+     PATCH = 4
      BUILD = nil
 
      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/test_consistent_company.rb

@@ -24,7 +24,7 @@ class TestConsistentCompany < Test::Unit::TestCase
     # empty name
     assert_equal("", "".company_namer)
     # a very long name
-    assert_equal("A"*1000, ("A"*1000).company_namer)
+    assert_equal("A"*1000+"NAMEISHERE", (" A"*1000 + 'NAME IS HERE ').company_namer)
     # parenthesis matching
     assert_equal("BBEE", ("BB(xx)EE").company_namer)
     assert_equal("BE", ("B(xx)E").company_namer)
@@ -54,6 +54,10 @@ class TestConsistentCompany < Test::Unit::TestCase
     # common name shortening
     assert_equal("TESTCTRCTRCTR", ("Test Center Center Center").company_namer)
     
+    # #singularize
+    # assert_equal("TESTNAMEHERE", (" Test Names here").company_namer)
+    # assert_equal("TESTBATTERY", ("Test Batteries").company_namer)
+    
     assert_equal("My Test Advertising Co".company_namer, "MY TEST ADV COMPANY".company_namer)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consistent_company
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-09-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70285303244580 !ruby/object:Gem::Requirement
+  requirement: &70187182156920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285303244580
+  version_requirements: *70187182156920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70285303243640 !ruby/object:Gem::Requirement
+  requirement: &70187182156220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70285303243640
+  version_requirements: *70187182156220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70285303242660 !ruby/object:Gem::Requirement
+  requirement: &70187182155600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70285303242660
+  version_requirements: *70187182155600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70285303241720 !ruby/object:Gem::Requirement
+  requirement: &70187182154960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285303241720
+  version_requirements: *70187182154960
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70285303241040 !ruby/object:Gem::Requirement
+  requirement: &70187182154360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285303241040
+  version_requirements: *70187182154360
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70285303240300 !ruby/object:Gem::Requirement
+  requirement: &70187182153680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.6
   type: :development
   prerelease: false
-  version_requirements: *70285303240300
+  version_requirements: *70187182153680
 description: Ruby C Extension to normalize a company name. Useful when company names
   come from various sources.
 email: dcleven@marketron.com
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1402416125086284082
+      hash: 3110059090780389810
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: