Pr0d1r2-geokit 1.3.2.8 → 1.3.2.9

data/lib/geokit/cached/model.rb

@@ -14,12 +14,13 @@ module Geokit
 
       def cache!(attributes)
         self.attributes = attributes
+        self.city = convert_to_utf8(self.city)
         save if new_record? || changed?
       end
 
       def update!
         if !by_google? && geo.success
-          self.lat, self.lng, self.provider, self.city = geo.lat, geo.lng, geo.provider, geo.city
+          self.lat, self.lng, self.provider, self.city = geo.lat, geo.lng, geo.provider, convert_to_utf8(geo.city)
           save if changed?
         end
       end
@@ -67,6 +68,15 @@ module Geokit
         !!(lat and lng)
       end
 
+      def convert_to_utf8(str)
+        begin
+          Iconv.new('UTF-8', 'UTF-8').iconv(str)
+        rescue Iconv::Failure => iconv_exception
+          Iconv.new('UTF-8', 'ISO-8859-1').iconv(str)
+          iconv_exception.success
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pr0d1r2-geokit
 version: !ruby/object:Gem::Version 
-  version: 1.3.2.8
+  version: 1.3.2.9
 platform: ruby
 authors: 
 - Andre Lewis and Bill Eisenhauer and Pr0d1r2 (Marcin Nowicki)