cities 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64631b89c2b6965439122572da459540640ce4b7
-  data.tar.gz: 2a31495c7dd9d0eca0eb32e5abec183740c5c627
+  metadata.gz: ab72ed08fe9ed9e33ef2b321d6270b69c2339fa4
+  data.tar.gz: 23fda3f4b11eaaa7f40702fb09df2849e89d7ab7
 SHA512:
-  metadata.gz: eec6a0b21efd84fa91b956e6053024baca225017d8aeefbca76a8e726cb1e114ac9fcf05ab2f434a1715fd20a842c198faeb8ffbfa5a15607765c5a2ad46348b
-  data.tar.gz: 5f3df5ca14fa8dfc0b2b818a7cef9ff72463da5dafe7195a0a346f7ccb305edc47162e15c2429bd7185a1fbdba17c75d5ca52d46e5736ccacc80d39beaff7122
+  metadata.gz: be553ef9cf9346b438382885761c864d43f5a27eef8385610e5e9e8612996e62313f77014d830e4b5c4cb8795083b194c08946b437c838e77afcc28524151542
+  data.tar.gz: bad30692ded928e405cf03b94820b55851c00ad3a184b79a7f03e623a3c70de03c2ac2b704c588e83408365d214569cdf53b0a31616615c3508b5864c7bf5353

data/README.md

@@ -16,7 +16,7 @@ $ tar -xzf cities.tar.gz
 ```
 
 ```ruby
-City.data_path = '/path/to/cities'
+Cities.data_path = '/path/to/cities'
 ```
 
 ## Usage
@@ -24,7 +24,7 @@ City.data_path = '/path/to/cities'
 Countries are identified by their [ISO 3166-1 alpha-2](http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) codes.
 
 ```ruby
-cities = City.cities_in_country('GB')
+cities = Cities.cities_in_country('GB')
   #=> { "abberley"=> #<City:0x000001049b9ba0>, "abberton"=> #<City:0x000001049b9b50>, ... }
 
 mcr = cities['manchester']
@@ -43,7 +43,7 @@ mcr.latlong
 The database is exhaustive and certainly stretches the definition of the word "city".
 
 ```ruby
-City.cities_in_country('GB')['buchlyvie'].population
+Cities.cities_in_country('GB')['buchlyvie'].population
   #=> 448
 ```
 
@@ -59,7 +59,7 @@ us.cities?
   #=> true
 
 us.cities
-  #=> { "abanda" => #<City:0x00000114b34a38>, ...  }
+  #=> { "abanda" => #<Cities::City:0x00000114b34a38>, ...  }
 ```
 
 ## Credits

data/lib/cities.rb

@@ -1,5 +1,42 @@
+require 'multi_json'
 require 'cities/city'
 require 'cities/country'
 
 module Cities
+  class << self
+    attr_accessor :data_path
+
+    def cities_in_country?(code)
+      File.exist?(path_for_country(code))
+    end
+    
+    def cities_in_country(code)
+      if self.cities_in_country?(code)
+        json = File.read(path_for_country(code))
+        country_data = MultiJson.load(json)
+        country_data.reduce({}) do |cities, city_data|
+          cities[city_data.first] = City.new(city_data.last)
+          cities
+        end
+      else
+        {}
+      end
+    end
+
+    private
+    def has_data?
+      data_path && Dir.exists?(data_path)
+    end
+
+    def path_for_country(code)
+      raise DataNotFound.new unless has_data?
+      File.join(data_path, "#{code}.json")
+    end
+  end
+
+  class DataNotFound < StandardError
+    def message
+      'JSON data not found. See README.md for installation instructions.'
+    end
+  end
 end

data/lib/cities/city.rb

@@ -1,80 +1,42 @@
-require 'multi_json'
+module Cities
 
-class City
-  
-  def initialize(data)
-    @data = data
-  end
-
-  def name
-    @data['accentcity']
-  end
-
-  def latitude
-    return nil if @data['latitude'].nil?
-    @data['latitude'].to_f
-  end
-
-  def longitude
-    return nil if @data['longitude'].nil?
-    @data['longitude'].to_f
-  end
-
-  def latlong?
-    latitude && longitude
-  end
-
-  def latlong
-    latlong? ? [latitude, longitude] : nil
-  end
-
-  def population
-    return nil if @data['population'].nil?
-    @data['population'].to_i
-  end
-
-  def region
-    @data['region']
-  end
-
-  class << self
-
-    attr_accessor :data_path
+  class City
+    
+    def initialize(data)
+      @data = data
+    end
 
-    def cities_in_country?(code)
-      File.exist?(path_for_country(code))
+    def name
+      @data['accentcity']
     end
-    
-    def cities_in_country(code)
-      if self.cities_in_country?(code)
-        json = File.read(path_for_country(code))
-        country_data = MultiJson.load(json)
-        country_data.reduce({}) do |cities, city_data|
-          cities[city_data.first] = City.new(city_data.last)
-          cities
-        end
-      else
-        {}
-      end
+
+    def latitude
+      return nil if @data['latitude'].nil?
+      @data['latitude'].to_f
     end
 
-    private
+    def longitude
+      return nil if @data['longitude'].nil?
+      @data['longitude'].to_f
+    end
 
-      def has_data?
-        data_path && Dir.exists?(data_path)
-      end
+    def latlong?
+      latitude && longitude
+    end
 
-      def path_for_country(code)
-        raise DataNotFound.new unless has_data?
-        File.join(data_path, "#{code}.json")
-      end
+    def latlong
+      latlong? ? [latitude, longitude] : nil
+    end
 
-  end
+    def population
+      return nil if @data['population'].nil?
+      @data['population'].to_i
+    end
 
-  class DataNotFound < StandardError
-    def message
-      'JSON data not found. See README.md for installation instructions.'
+    def region
+      @data['region']
     end
+
   end
 
 end

data/lib/cities/country.rb

@@ -3,11 +3,11 @@ module ISO3166
   class Country
 
     def cities
-      City.cities_in_country(alpha2)
+      Cities.cities_in_country(alpha2)
     end
 
     def cities?
-      City.cities_in_country?(alpha2)
+      Cities.cities_in_country?(alpha2)
     end
 
   end

data/lib/cities/version.rb

@@ -1,3 +1,3 @@
 module Cities
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cities
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Joe Corcoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: World cities in Ruby