Merge branch 'release/1.2.0'

Author: sdefauw

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 project(libastphonenumber)
 set(libastphonenumber_VERSION_MAJOR 1)
-set(libastphonenumber_VERSION_MINOR 1)
+set(libastphonenumber_VERSION_MINOR 2)
 
 if(UNIX)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=gnu++0x")
@@ -50,7 +50,8 @@ target_link_libraries(libastphonenumber_tester dl)
 
 add_executable(
         libastphonenumber_static_tester
-        "test/test_info.c"
+        "test/display.c"
+        "test/tester_static.c"
 )
 target_link_libraries(libastphonenumber_static_tester astphonenumber)
 

asterisk/app_numformat.c

@@ -129,7 +129,7 @@
 			</parameter>
 		</syntax>
 		<description>
-			<para>This functionn returns information about a phone number.</para>
+			<para>This function returns information about a phone number.</para>
 		</description>
 	</function>
 	<function name="REGION_INFO" language="en_US">
@@ -150,7 +150,7 @@
 			</parameter>
 		</syntax>
 		<description>
-			<para>This functionn returns information about a region.</para>
+			<para>This function returns information about a region.</para>
 		</description>
 	</function>
  ***/
@@ -254,7 +254,7 @@ static char *cli_formatnum_e164(struct ast_cli_entry *e, int cmd, struct ast_cli
 
 	memset(buf, 0, 100);
 
-	ast_cli(a->fd, "Original inforamtion\n");
+	ast_cli(a->fd, "Original information\n");
 	ast_cli(a->fd, " - Number: %s\n", number);
 	ast_cli(a->fd, " - Country: %s\n", country);
 
@@ -466,9 +466,9 @@ static int load_module(void)
 	ast_cli_register_multiple(cli_formatnum, ARRAY_LEN(cli_formatnum));
 
 	/* Load external module */
-	lib_astphonenumber_handle = dlopen("/usr/lib/libastphonenumber.so", RTLD_LAZY);
+	lib_astphonenumber_handle = dlopen("/usr/lib/libastphonenumber.so.1", RTLD_LAZY);
 	if (!lib_astphonenumber_handle){
-		ast_log(LOG_WARNING, "Unable to load libastphonenumber.so: %s\n", dlerror());
+		ast_log(LOG_WARNING, "Unable to load libastphonenumber.so.1: %s\n", dlerror());
 		return 1;
 	}
 	// Load functions
@@ -479,7 +479,7 @@ static int load_module(void)
 	get_number_type_fn = (enum phone_type (*)(char*, char*)) dlsym(lib_astphonenumber_handle, "get_number_type");
 	get_country_code_for_region_fn = (int (*)(char*)) dlsym(lib_astphonenumber_handle, "get_country_code_for_region");
 	if ((error = dlerror()) != NULL){
-		ast_log(LOG_WARNING, "Unable to load functions on libastphonenumber.so: %s\n", error);
+		ast_log(LOG_WARNING, "Unable to load functions on libastphonenumber.so.1: %s\n", error);
 		return 1;
 	}
 

debian/changelog

@@ -1,3 +1,13 @@
+libastphonenumber (1.2.0) all; urgency=medium
+
+  * Improvment: Remove some char when for some formatting
+  * Improvement: Review testing section
+  * Bugfix: Link to the right library version
+  * Bugfix: Fix debian installation issue between both packages
+  * Bugfix: Language typo issue
+
+ -- Sebastien De Fauw <sdefauw@gmail.com>  Mon, 29 Apr 2019 11:18:31 +0200
+
 libastphonenumber (1.1.0) all; urgency=low
 
   * Feature: Embeds a testing binary of the library

debian/libastphonenumber.install

@@ -1,2 +1,2 @@
-usr/lib/libast*.so
-usr/bin/libast*
+usr/lib/libast*.so.*
+usr/bin/libast*

src/formatting.cpp

@@ -7,7 +7,9 @@
 #include "phonenumbers/phonenumber.pb.h"
 #include "phonenumbers/phonenumberutil.h"
 
-#define REMOVE_SPACES(x) x.erase(std::remove(x.begin(), x.end(), ' '), x.end())
+#define REMOVE_CHAR(x, c) ((x).erase(std::remove((x).begin(), (x).end(), (c)), (x).end()))
+#define REMOVE_SPACES(x) (REMOVE_CHAR(x, ' '))
+#define REMOVE_DASHES(x) (REMOVE_CHAR(x, '-'))
 
 using i18n::phonenumbers::PhoneNumber;
 using i18n::phonenumbers::PhoneNumberUtil;
@@ -42,13 +44,17 @@ int num_format(char* number, char* country, enum phone_format type, char* format
 		case EXTERNAL_CALL:
 			phone_util.FormatOutOfCountryCallingNumber(pnumber, country, &formatted_number);
 			REMOVE_SPACES(formatted_number);
+            REMOVE_DASHES(formatted_number);
 			break;
 		case NATIONAL:
 			phone_util.Format(pnumber, PhoneNumberUtil::NATIONAL, &formatted_number);
 			break;
 		case NATIONAL_COMPACT:
 			phone_util.Format(pnumber, PhoneNumberUtil::NATIONAL, &formatted_number);
 			REMOVE_SPACES(formatted_number);
+            REMOVE_DASHES(formatted_number);
+            REMOVE_CHAR(formatted_number, ')');
+            REMOVE_CHAR(formatted_number, '(');
 			break;
 		case NATIONAL_SHORT:
 			formatted_number = std::to_string(pnumber.national_number());

test/test_info.c test/display.c

@@ -1,13 +1,4 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "../src/regioninfo.h"
-#include "../src/numinfo.h"
-#include "../src/formatting.h"
-
-#define BOOL2STR(b)     b ? "Yes" : "No"
-
+#include "display.h"
 
 void print_region_info(char* country) {
 
@@ -55,27 +46,3 @@ void print_formatted(char* num, char* country) {
 	num_format(num, country, NATIONAL_SHORT, buf);
 	printf(" - National short: %s\n", buf);
 }
-
-int main(int argc, char **argv)
-{
-	char* number;
-	char* country;
-
-	number = argv[1];
-	country = argv[2];
-
-	if (!number || !country) {
-		printf("Invalid input ! Input: <NUMBER> <COUNTRY>\n");
-		return 0;
-	}
-
-	printf("=== INPUT ===\n");
-	printf(" - Number: %s\n", number);
-	printf(" - Country: %s\n", country);
-
-	print_num_info(number, country);
-	print_region_info(country);
-	print_formatted(number, country);
-
-	return 0;
-}

test/display.h

@@ -0,0 +1,19 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../src/regioninfo.h"
+#include "../src/numinfo.h"
+#include "../src/formatting.h"
+
+
+#ifndef LIBASTPHONENUMBER_DISPLAY_H
+#define LIBASTPHONENUMBER_DISPLAY_H
+
+#define BOOL2STR(b)     b ? "Yes" : "No"
+
+void print_region_info(char* country);
+void print_num_info(char* num, char* country);
+void print_formatted(char* num, char* country);
+
+#endif //LIBASTPHONENUMBER_DISPLAY_H

test/test_lib_dyn_load.c

@@ -5,14 +5,21 @@
 
 #include "../src/formatting.h"
 
+static int (*num_format_fn)(char *, char *, enum phone_format, char *);
+static int (*is_valid_number_fn)(char* , char*, int);
+static int (*get_region_fn)(char* , char* , char *);
+static int (*get_country_code_fn)(char* , char*);
+static enum phone_type (*get_number_type_fn)(char* , char*);
+static int (*get_country_code_for_region_fn)(char* region);
+
 int main(int argc, char **argv)
 {
     void *lib_handle;
     int (*fn)(char *, char *, enum phone_format, char *);
     char *error;
     char out_num[100];
 
-    lib_handle = dlopen("/usr/lib/libastphonenumber.so", RTLD_LAZY);
+    lib_handle = dlopen("/usr/lib/libastphonenumber.so.1", RTLD_LAZY);
     if (!lib_handle)
     {
         fprintf(stderr, "dlopen: %s\n", dlerror());
@@ -32,6 +39,15 @@ int main(int argc, char **argv)
 	}
 
     (*fn)(argv[1], argv[2], PLUSE164, out_num);
+
+    num_format_fn = (int (*)(char *, char *, enum phone_format, char *)) dlsym(lib_handle, "num_format");
+    is_valid_number_fn = (int (*)(char*, char*, int)) dlsym(lib_handle, "is_valid_number");
+    get_region_fn = (int (*)(char*, char* , char *)) dlsym(lib_handle, "get_region");
+    get_country_code_fn = (int (*)(char*, char*)) dlsym(lib_handle, "get_country_code");
+    get_number_type_fn = (enum phone_type (*)(char*, char*)) dlsym(lib_handle, "get_number_type");
+    get_country_code_for_region_fn = (int (*)(char*)) dlsym(lib_handle, "get_country_code_for_region");
+
+
     printf("Formatted: %s\n",out_num);
 
     dlclose(lib_handle);

test/tester_static.c

@@ -0,0 +1,31 @@
+
+#include "display.h"
+
+#include "../src/regioninfo.h"
+#include "../src/numinfo.h"
+#include "../src/formatting.h"
+
+
+int main(int argc, char **argv)
+{
+	char* number;
+	char* country;
+
+	number = argv[1];
+	country = argv[2];
+
+	if (!number || !country) {
+		printf("Invalid input ! Input: <NUMBER> <COUNTRY>\n");
+		return 0;
+	}
+
+	printf("=== INPUT ===\n");
+	printf(" - Number: %s\n", number);
+	printf(" - Country: %s\n", country);
+
+	print_num_info(number, country);
+	print_region_info(country);
+	print_formatted(number, country);
+
+	return 0;
+}