world-flags 0.4.7 → 0.4.8.2

data/Gemfile

@@ -1,7 +1,10 @@
 source :rubygems
 
-gem 'hashie', '~> 1.2'
-gem 'i18n',   '~> 0.6'
+gem "mechanize"
+gem "resourceful",  "~> 1.0.1"
+gem "rubyzip",      "~> 0.9.8"
+gem 'hashie',       '~> 1.2'
+gem 'i18n',         '~> 0.6'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -28,14 +28,19 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.2.8)
     arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
+    domain_name (0.5.3)
+      unf (~> 0.0.3)
     erubis (2.7.0)
+    fattr (2.2.1)
     geoip (1.1.2)
     git (1.2.5)
     hashie (1.2.0)
     hike (1.2.1)
+    httpauth (0.1)
     i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
@@ -48,8 +53,22 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    mechanize (2.5.1)
+      domain_name (~> 0.5, >= 0.5.1)
+      mime-types (~> 1.17, >= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (~> 2.5, >= 2.5.2)
+      nokogiri (~> 1.4)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (~> 0.0, >= 0.0.9)
     mime-types (1.17.2)
     multi_json (1.1.0)
+    net-http-digest_auth (1.2.1)
+    net-http-persistent (2.6)
+    nokogiri (1.5.2)
+    ntlm-http (0.1.1)
+    options (2.3.0)
+      fattr
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -76,6 +95,10 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    resourceful (1.0.1)
+      addressable (>= 2.1.0)
+      httpauth
+      options (>= 2.1.1)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -84,6 +107,7 @@ GEM
     rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    rubyzip (0.9.8)
     simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -98,6 +122,10 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.32)
+    unf (0.0.5)
+      unf_ext
+    unf_ext (0.0.4)
+    webrobots (0.0.13)
 
 PLATFORMS
   ruby
@@ -108,7 +136,10 @@ DEPENDENCIES
   hashie (~> 1.2)
   i18n (~> 0.6)
   jeweler (>= 1.8.3)
+  mechanize
   rails (>= 3.1)
   rdoc (>= 3.12)
+  resourceful (~> 1.0.1)
   rspec (>= 2.8.0)
+  rubyzip (~> 0.9.8)
   simplecov (>= 0.5)

data/README.md

@@ -142,6 +142,14 @@ Extract and put latest `GeoIP.dat` file in `db/GeoIP.dat` of your Rails app. Alt
 
 The _world-flags_ engine comes pre-packaged with a recent version of `GeoIP.dat` in the `db` folder of the engine itself.
 
+### GeoIP generator
+
+Copy WorldFlags GeoIP.dat to Rails app '/db/GeoIP.dat'
+
+TODO: Should optimally fetch the one from maxmind.com
+
+`rails g world_flags:geoip`
+
 ### Localhosts filtering
 
 Also set `WorldFlags.localhost_list` if you have localhosts other than the default `127.0.0.1`.
@@ -160,7 +168,7 @@ Code extract of the locale source logic for browser IP country code detection:
 
 ```ruby
 when :ip
-  ip_country_code(browser_ip)
+  country_code_from_ip browser_ip
 ```
 
 ## TODO for version 1.0

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8.2

data/lib/generators/world_flags/geoip_generator.rb

@@ -0,0 +1,87 @@
+# require 'generators/world_flags/redirect_follower'
+require 'resourceful'
+require 'mechanize'
+require 'zip/zip'
+require 'fileutils'
+
+module WorldFlags
+  module Generators
+    class GeoipGenerator < ::Rails::Generators::Base
+      desc "Copy IP database - GeoIP.dat"
+
+      class_option :local, :type => :boolean, :default => true, :desc => 'Use local cached GeoIP or retrieve latest from maxmind.com'
+
+      source_root File.dirname(__FILE__)
+
+      def main_flow
+        puts "local: #{local?}"
+        local? ? copy_local : download_latest
+      end
+
+      protected
+
+      def local?
+        !(options[:local] == false)
+      end
+
+      def copy_local
+        copy_file "GeoIP.dat", "db/GeoIP.dat"
+      end
+
+      def download_latest 
+        # http = ::Resourceful::HttpAccessor.new
+        # resource = http.resource( zip_adr )
+        # # resource.on_redirect { |req, resp| resp.header['Location'] =~ /example.com/ }
+        # resp = resource.get  # Will only follow the redirect if the new location is example.com
+
+        puts "get: #{file_name} from #{zip_adr}"
+
+        agent = Mechanize.new  { |agent| agent.user_agent_alias = 'Mac Safari'}
+        agent.robots = false
+
+        # puts "robots allowed? #{agent.robots_allowed?}"
+
+        agent.pluggable_parser.default = Mechanize::Download
+        agent.get(zip_adr).save(file_name)
+
+        # File.open(file_name, 'w+') do |zip_file|
+        #   zip_file.write(resp.body)
+        # end
+        #zf is an instance of class Tempfile
+        puts "zip path: #{zf.path}"
+
+        Zip::ZipFile.open(file_name) do |zipfile|
+          puts "zipfile: #{zipfile}"
+          #zipfile.class is Zip::ZipFile
+          zipfile.each do |e|
+            #e is an instance of Zip::ZipEntry
+            fpath = File.join file_name, e.to_s
+            FileUtils.mkdir_p File.dirname(target_location)
+            #the block is for handling an existing file. returning true will overwrite the files.
+            zipfile.extract(e, target_location) { true }
+          end
+        end
+        FileUtils.rm(file_name) # if options[:cleanup]
+      end
+
+      def agent_options
+        {"User-Agent" => "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100402 Ubuntu/9.10 (karmic) Firefox/3.5.9", "From" => "foo@bar.com", "Referer" => "http://www.foo.bar/"}
+      end
+
+      def target_location
+        ::Rails.root.join 'db', 'GeoIP.dat'
+      end
+
+      def zip_adr
+        "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/#{file_name}"
+      end
+
+      def file_name
+        'GeoIP.dat.gz'
+      end
+    end
+  end
+end
+
+
+

data/lib/world_flags/helper/geo.rb

@@ -3,11 +3,11 @@ module WorldFlags
 
   module Helper
   	module Geo
-  		def self.ip_country_code ip = nil
+  		def self.country_code_from_ip ip = nil
         ip ||= request.remote_ip
         raise WorldFlags::GeoIPError, "IP address #{ip} is a localhost address" if local_ip?(ip)
         
-        @geoip ||= GeoIP.new WorldFlags.geo_ip_db_path
+        @geoip ||= ::GeoIP.new WorldFlags.geo_ip_db_path
         country = @geoip.country(ip)
         return country[2] unless country.nil?
         raise WorldFlags::GeoIPError, "No country code could be found for IP: #{ip}"
@@ -17,8 +17,8 @@ module WorldFlags
         WorldFlags.localhost_list.include?(ip)
       end
 
-  		def ip_country_code ip = nil
-      	WorldFlags::Helper::Geo.ip_country_code ip
+  		def country_code_from_ip ip = nil
+      	WorldFlags::Helper::Geo.country_code_from_ip ip
       end
     end
   end

data/lib/world_flags/helper/locale.rb

@@ -35,7 +35,7 @@ module WorldFlags
         when :browser
           browser_locale # http://www.metamodpro.com/browser-language-codes
         when :ip
-          ip_country_code(browser_ip)
+          country_code_from_ip(browser_ip)
         when :default
           I18n.default_locale
         end

data/lib/world_flags/util/config.rb

@@ -6,7 +6,7 @@ module WorldFlags
       attr_writer   :locale_source_priority, :geo_ip_db_path, :localhost_list
 
       def geo_ip_db_path
-        @geo_ip_db_path ||= "#{Rails.root}/db/GeoIP.dat"
+        @geo_ip_db_path ||= ::Rails.root.join 'db', 'GeoIP.dat'
       end
 
       def localhost_list

data/world-flags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.4.7"
+  s.version = "0.4.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-05-16"
+  s.date = "2012-05-21"
   s.description = "Use world flag icons in your Rails app"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
     "config/languages/locale_languages.en.json",
     "config/locale_map/locale_to_country_code.json",
     "db/GeoIP.dat",
+    "lib/generators/world_flags/GeoIP.dat",
+    "lib/generators/world_flags/geoip_generator.rb",
     "lib/generators/world_flags/init_generator.rb",
     "lib/generators/world_flags/templates/world_flags.erb",
     "lib/world-flags.rb",
@@ -95,6 +97,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mechanize>, [">= 0"])
+      s.add_runtime_dependency(%q<resourceful>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<rubyzip>, ["~> 0.9.8"])
       s.add_runtime_dependency(%q<hashie>, ["~> 1.2"])
       s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
@@ -103,6 +108,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
+      s.add_dependency(%q<mechanize>, [">= 0"])
+      s.add_dependency(%q<resourceful>, ["~> 1.0.1"])
+      s.add_dependency(%q<rubyzip>, ["~> 0.9.8"])
       s.add_dependency(%q<hashie>, ["~> 1.2"])
       s.add_dependency(%q<i18n>, ["~> 0.6"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
@@ -112,6 +120,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0.5"])
     end
   else
+    s.add_dependency(%q<mechanize>, [">= 0"])
+    s.add_dependency(%q<resourceful>, ["~> 1.0.1"])
+    s.add_dependency(%q<rubyzip>, ["~> 0.9.8"])
     s.add_dependency(%q<hashie>, ["~> 1.2"])
     s.add_dependency(%q<i18n>, ["~> 0.6"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  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'
+- !ruby/object:Gem::Dependency
+  name: resourceful
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +192,8 @@ files:
 - config/languages/locale_languages.en.json
 - config/locale_map/locale_to_country_code.json
 - db/GeoIP.dat
+- lib/generators/world_flags/GeoIP.dat
+- lib/generators/world_flags/geoip_generator.rb
 - lib/generators/world_flags/init_generator.rb
 - lib/generators/world_flags/templates/world_flags.erb
 - lib/world-flags.rb
@@ -213,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3422486010185457987
+      hash: 2155340704912814203
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: