geonames_rails 0.1.1 → 0.1.2

data/lib/geonames_rails/loader.rb

@@ -1,6 +1,7 @@
 require 'geonames_rails/mappings/base'
 require 'geonames_rails/mappings/city'
 require 'geonames_rails/mappings/country'
+require 'zip/zipfilesystem'
 
 module GeonamesRails
   
@@ -15,7 +16,7 @@ module GeonamesRails
     def load_data
       @puller.pull if @puller # pull geonames files down
       
-      load_countries
+      #load_countries
       
       load_cities
       
@@ -47,8 +48,11 @@ module GeonamesRails
     def load_cities_file(city_file)
       log_message "Loading city file #{city_file}"
       cities = []
-      File.open(File.join(Rails.root, 'tmp', "#{city_file}.txt"), 'r') do |f|
-        f.each_line { |line| cities << Mappings::City.new(line) }
+
+      Zip::ZipFile.open(File.join(Rails.root, 'tmp', "#{city_file}.zip"), 'r') do |zipfile|
+        zipfile.each do |f|
+          zipfile.read(f).split(/\n/).each { |line| cities << Mappings::City.new(line) }
+        end
       end
       
       log_message "#{cities.length} cities to process"

data/lib/geonames_rails/puller.rb

@@ -19,10 +19,10 @@ module GeonamesRails
         @temp_geonames_files << target_file_name
         
         file_base_name, file_extension = file_name.split('.')
-        if file_extension == 'zip'
-          `unzip #{target_file_name} -d #{target_dir}`
-          @temp_geonames_files << File.join(target_dir, "#{file_base_name}.txt")
-        end
+        #if file_extension == 'zip'
+        #  `unzip #{target_file_name} -d #{target_dir}`
+        #  @temp_geonames_files << File.join(target_dir, "#{file_base_name}.txt")
+        #end
         
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Marius Andra
@@ -18,8 +18,33 @@ cert_chain: []
 
 date: 2012-02-18 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Fetch data from geonames.org and make the required models
 email: marius.andra@gmail.com
 executables: []