geo-lite-city 0.0.2 → 0.0.3

data/lib/geo.rb

@@ -1,4 +1,5 @@
 require "geoip"
+require "ensure/encoding"
 
 module Geo
 end
@@ -23,9 +24,24 @@ module Geo
   
   private
 
+  def self.adjust_encoding(rec)
+    rec.inject({}) do |hsh, (key, value)|
+      if value.is_a?(String)
+        value = value.ensure_encoding('UTF-8',
+          :external_encoding  => [Encoding::ISO8859_1, Encoding::UTF_8],
+          :invalid_characters => :transcode
+        )
+      end
+
+      hsh.update key => value
+    end
+  end
+  
   def self.complete_city(city)
     city = city.to_hash
 
+    city = adjust_encoding(city)
+
     parts = city.values_at :city_name, :region_name, :country_name
     city_name = parts.grep(/[a-zA-Z]/).join(", ")
 
@@ -40,24 +56,20 @@ module Geo
   
   public
   
-  def self.cities(s, &block)
-    expect! s => [ Regexp, /../ ]
+  def self.cities(pattern=nil, &block)
+    expect! pattern => [ nil, Regexp, String ]
     
-    s = Regexp.compile("^" + Regexp.escape(s) + "$") unless s.is_a?(Regexp)
-
-    quietly do
-      r = []
+    pattern = Regexp.compile("^" + Regexp.escape(pattern) + "$") if pattern.is_a?(String)
 
-      instance.each.select do |rec|
-        next if rec.city_name !~ s
+    ary = []
+    collect = block || ary.method(:push)
 
-        rec = complete_city(rec)
-        yield rec if block
-        r.push rec
-      end
-
-      r
+    instance.each do |rec|
+      next if pattern && rec.city_name !~ pattern
+      collect.call complete_city(rec)
     end
+
+    block ? self : ary
   end
   
   private

data/lib/geo/etest.rb

@@ -64,5 +64,31 @@ module Geo::Etest
               :timezone => "Europe/Berlin"
     }
   end
+
+  def test_geoip_cities_callback
+    r = nil
+    Geo.cities do |rec|
+      r = rec
+      break
+    end
+    
+    assert_equal r, :area_code => nil,
+     :city_name => "",
+     :continent_code => "AS",
+     :country_code => "AS.JP",
+     :country_code2 => "JP",
+     :country_code3 => "JPN",
+     :country_name => "Japan",
+     :dma_code => nil,
+     :ip => "",
+     :latitude => 36.0,
+     :longitude => 138.0,
+     :name => "Japan",
+     :postal_code => "",
+     :region_code => "AS.JP",
+     :region_name => "",
+     :request => "",
+     :timezone => "Asia/Tokyo"
+  end
 end
 

data/lib/geo/version.rb

@@ -1,3 +1,3 @@
 module Geo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo-lite-city
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoip
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: ensure-encoding
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sometimes you just need SQL.
 email: eno@radiospiel.org
 executables: []
@@ -55,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2540758688009425679
+      hash: 4243812494533547067
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: