ruby_postal 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d43e63b273581e4224cd7f98f38d16d748bd18
-  data.tar.gz: b71cabc0305c2d9809573fc14ee31f466195e210
+  metadata.gz: 4cfed3caf5e214289a39e94df25d5d4782bc6dc2
+  data.tar.gz: ca7b10563387b3cbc01f685cfe02c1f7cae7a600
 SHA512:
-  metadata.gz: ea0532f9b5b70311ec87a0973fe2ea31d472b92e31a0532457bcb054d5ec7ea857df36454324055bfe35e252cd968d1b2ccc251c7adfdb6cda64c84fa5748748
-  data.tar.gz: 691f320be3a9c9a2f6abcba2905f42318057cdaa99173418dd6e2f58343cb7963624f5d097e9bb1030844a0e97949539a100ca67cd93e9eaae1a5ba8f6cbb7e4
+  metadata.gz: db45f5012b38d971d86401df0eda768e32b4f4978e21b6a32e676f427afc106ca1ded4c8dc48be5e6b05d2a271a50a640e17015d1eb633c14e5c6e4bc31ae14c
+  data.tar.gz: 19bdd1a4ab16c554d2e894bd98b34be24dd406fe1c45f4f0d7017ae1156f27e64aacec7cca2571d1618dfa3b9b8a576de0cebabaac967206d2549fabac0597f9

data/ext/expand/expand.c

@@ -82,7 +82,7 @@ VALUE rb_expand_address(int argc, VALUE *argv, VALUE self) {
         len_languages = (size_t)RARRAY_LEN(rb_languages);
     }
 
-    normalize_options_t options = get_libpostal_default_options();
+    libpostal_normalize_options_t options = libpostal_get_default_options();
 
     size_t i;
     char **languages = NULL;
@@ -95,7 +95,7 @@ VALUE rb_expand_address(int argc, VALUE *argv, VALUE self) {
             VALUE rb_lang = rb_ary_entry(rb_languages, (int)i);
             if (rb_lang != Qnil && TYPE(rb_lang) == T_STRING) {
                 size_t rb_lang_len = RSTRING_LEN(rb_lang);
-                if (rb_lang_len > 0 && rb_lang_len < MAX_LANGUAGE_LEN) {
+                if (rb_lang_len > 0 && rb_lang_len < LIBPOSTAL_MAX_LANGUAGE_LEN) {
                     char *lang = RSTRING_PTR(rb_lang);
                     languages[num_languages++] = lang;
                 }
@@ -205,7 +205,7 @@ VALUE rb_expand_address(int argc, VALUE *argv, VALUE self) {
     }
 
     size_t num_expansions = 0;
-    char **expansions = expand_address(address, options, &num_expansions);
+    char **expansions = libpostal_expand_address(address, options, &num_expansions);
 
     VALUE rb_expansions = rb_ary_new2(num_expansions);
     for (size_t i = 0; i < num_expansions; i++) {
@@ -229,20 +229,20 @@ void Init_expand() {
 
     rb_define_module_function(rb_expand, "expand_address", rb_expand_address, -1);
 
-    rb_define_global_const("ADDRESS_NONE", UINT2NUM(ADDRESS_NONE));
-    rb_define_global_const("ADDRESS_ANY", UINT2NUM(ADDRESS_ANY));
-    rb_define_global_const("ADDRESS_NAME", UINT2NUM(ADDRESS_NAME));
-    rb_define_global_const("ADDRESS_HOUSE_NUMBER", UINT2NUM(ADDRESS_HOUSE_NUMBER));
-    rb_define_global_const("ADDRESS_STREET", UINT2NUM(ADDRESS_STREET));
-    rb_define_global_const("ADDRESS_UNIT", UINT2NUM(ADDRESS_UNIT));
-    rb_define_global_const("ADDRESS_LOCALITY", UINT2NUM(ADDRESS_LOCALITY));
-    rb_define_global_const("ADDRESS_ADMIN1", UINT2NUM(ADDRESS_ADMIN1));
-    rb_define_global_const("ADDRESS_ADMIN2", UINT2NUM(ADDRESS_ADMIN2));
-    rb_define_global_const("ADDRESS_ADMIN3", UINT2NUM(ADDRESS_ADMIN3));
-    rb_define_global_const("ADDRESS_ADMIN4", UINT2NUM(ADDRESS_ADMIN4));
-    rb_define_global_const("ADDRESS_ADMIN_OTHER", UINT2NUM(ADDRESS_ADMIN_OTHER));
-    rb_define_global_const("ADDRESS_POSTAL_CODE", UINT2NUM(ADDRESS_POSTAL_CODE));
-    rb_define_global_const("ADDRESS_NEIGHBORHOOD", UINT2NUM(ADDRESS_NEIGHBORHOOD));
-    rb_define_global_const("ADDRESS_ALL", UINT2NUM(ADDRESS_ALL));
-}
+    rb_define_global_const("ADDRESS_NONE", UINT2NUM(LIBPOSTAL_ADDRESS_NONE));
+    rb_define_global_const("ADDRESS_ANY", UINT2NUM(LIBPOSTAL_ADDRESS_ANY));
+    rb_define_global_const("ADDRESS_NAME", UINT2NUM(LIBPOSTAL_ADDRESS_NAME));
+    rb_define_global_const("ADDRESS_HOUSE_NUMBER", UINT2NUM(LIBPOSTAL_ADDRESS_HOUSE_NUMBER));
+    rb_define_global_const("ADDRESS_STREET", UINT2NUM(LIBPOSTAL_ADDRESS_STREET));
+    rb_define_global_const("ADDRESS_UNIT", UINT2NUM(LIBPOSTAL_ADDRESS_UNIT));
+    rb_define_global_const("ADDRESS_LEVEL", UINT2NUM(LIBPOSTAL_ADDRESS_LEVEL));
+    rb_define_global_const("ADDRESS_STAIRCASE", UINT2NUM(LIBPOSTAL_ADDRESS_STAIRCASE));
+    rb_define_global_const("ADDRESS_ENTRANCE", UINT2NUM(LIBPOSTAL_ADDRESS_ENTRANCE));
+    rb_define_global_const("ADDRESS_CATEGORY", UINT2NUM(LIBPOSTAL_ADDRESS_CATEGORY));
+    rb_define_global_const("ADDRESS_NEAR", UINT2NUM(LIBPOSTAL_ADDRESS_NEAR));
+    rb_define_global_const("ADDRESS_TOPONYM", UINT2NUM(LIBPOSTAL_ADDRESS_TOPONYM));
+    rb_define_global_const("ADDRESS_POSTAL_CODE", UINT2NUM(LIBPOSTAL_ADDRESS_POSTAL_CODE));
+    rb_define_global_const("ADDRESS_PO_BOX", UINT2NUM(LIBPOSTAL_ADDRESS_PO_BOX));
+    rb_define_global_const("ADDRESS_ALL", UINT2NUM(LIBPOSTAL_ADDRESS_ALL));
 
+}

data/ext/parser/parser.c

@@ -74,8 +74,8 @@ VALUE rb_parse_address(int argc, VALUE *argv, VALUE self) {
 
     char *address = RSTRING_PTR(input);
 
-    address_parser_response_t *parsed;
-    address_parser_options_t options = get_libpostal_address_parser_default_options();
+    libpostal_address_parser_response_t *parsed;
+    libpostal_address_parser_options_t options = libpostal_get_address_parser_default_options();
     if (rb_language != Qnil) {
         options.language = RSTRING_PTR(rb_language);
     }
@@ -84,7 +84,7 @@ VALUE rb_parse_address(int argc, VALUE *argv, VALUE self) {
         options.country = RSTRING_PTR(rb_country);
     }
 
-    if ((parsed = parse_address(address, options))) {
+    if ((parsed = libpostal_parse_address(address, options))) {
         size_t n = parsed->num_components;
         VALUE rb_parse_result = rb_ary_new2(n);
 
@@ -96,7 +96,7 @@ VALUE rb_parse_address(int argc, VALUE *argv, VALUE self) {
             rb_ary_store(rb_parse_result, i, rb_component);
         }
 
-        address_parser_response_destroy(parsed);
+        libpostal_address_parser_response_destroy(parsed);
 
         return rb_parse_result;
     }

data/lib/ruby_postal/expand.rb

@@ -6,7 +6,12 @@ module Postal
             if not address
                 return []
             end
-            CExpand.expand_address address, options
+            if address.respond_to?(:encode)
+                address = address.encode("UTF-8")
+            end
+            expand_result = CExpand.expand_address address, options
+            expand_result.map{|s| s.force_encoding("UTF-8")}
+
         end
     end
 end

data/lib/ruby_postal/parser.rb

@@ -7,7 +7,10 @@ module Postal
                 return []
             end
             parse_result = CParser.parse_address address, options
-            parse_result.map{|s, c| {:label => c, :value => s}}
+            if address.respond_to?(:encode)
+                address = address.encode("UTF-8")
+            end
+            parse_result.map{|s, c| {:label => c, :value => s.force_encoding("UTF-8")}}
         end
     end
 end

data/lib/ruby_postal/version.rb

@@ -1,3 +1,3 @@
 module Postal
-  VERSION = "0.3.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_postal
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Al Barrentine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler