macker 0.1.3 → 0.1.4

data/lib/macker.rb

@@ -334,7 +334,7 @@ module Macker
   # Get remote content and store in cache
   # @return [String] text content
   def read_from_url
-    text = open_url
+    text = open_url.force_encoding(Encoding::UTF_8)
     store_in_cache(text) if text && config.cache
     text
   end
@@ -396,12 +396,14 @@ module Macker
     { name: base16_fields[-1]
         .strip
         .gsub(/\s+/, ' ')
+        .gsub(/[,;](?![\s])/, ', ')
+        .gsub(/[,;]+$/, '')
         .sub(/^./, &:upcase),
       address: address[2..-1].map { |a| a
         .strip
         .gsub(/\s+/, ' ')
-        .gsub(/,(?![\s])/, ', ')
-        .gsub(/\,+$/, '')
+        .gsub(/[,;](?![\s])/, ', ')
+        .gsub(/[,;]+$/, '')
         .sub(/^./, &:upcase)
       },
       iso_code: iso_code.length == 2 ? iso_code.upcase : nil

data/lib/macker/version.rb

@@ -3,5 +3,5 @@
 # Macker namespace
 module Macker
   # Macker version
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Egon Zemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- data/oui_1499162218.txt
+- data/oui_1500995445.txt
 - lib/macker.rb
 - lib/macker/address.rb
 - lib/macker/config.rb