localized_country_select 0.9.7 → 0.9.8

data/README.rdoc

@@ -22,7 +22,7 @@ See http://github.com/rails/country_select/tree/master/lib/country_select.rb
 
 In your Gemfile add:
 
-    gem 'localized_country_select', '>= 0.9.7'
+    gem 'localized_country_select', '>= 0.9.8'
 
 == Rails 2.3
 

data/lib/localized_country_select/version.rb

@@ -1,3 +1,3 @@
 module LocalizedCountrySelect
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/lib/tasks/localized_country_select_tasks.rake

@@ -14,6 +14,7 @@ require 'active_support/inflector'
 #   LOCALE (required): Sets the locale to use. Output file name will include this.
 #   FORMAT (optional): Output format, either 'rb' or 'yml'. Defaults to 'rb' if not specified.
 #   WEB_LOCALE (optional): Forces a locale code to use when querying the Unicode.org CLDR archive.
+#   PARSER (optional): Forces parser to use. Available are nokogiri, hpricot and libxml.
 #
 # == Examples
 #   rake import:country_select LOCALE=de
@@ -25,15 +26,8 @@ require 'active_support/inflector'
 
 namespace :import do
 
-  desc "Import country codes and names for various languages from the Unicode.org CLDR archive. Depends on Hpricot gem."
+  desc "Import country codes and names for various languages from the Unicode.org CLDR archive."
   task :country_select do
-    begin
-      require 'hpricot'
-    rescue LoadError
-      puts "Error: Hpricot library required to use this task (import:country_select)"
-      exit
-    end
-
     # TODO : Implement locale import chooser from CLDR root via Highline
 
     # Setup variables
@@ -52,33 +46,20 @@ namespace :import do
     # ----- Get the CLDR HTML     --------------------------------------------------
     begin
       puts "... getting the HTML file for locale '#{web_locale}'"
-      doc = Hpricot( open("http://www.unicode.org/cldr/data/charts/summary/#{web_locale}.html") )
+      url = "http://www.unicode.org/cldr/data/charts/summary/#{web_locale}.html"
+      html = open(url).read
     rescue => e
       puts "[!] Invalid locale name '#{web_locale}'! Not found in CLDR (#{e})"
       exit 0
     end
 
 
-    # ----- Parse the HTML with Hpricot     ----------------------------------------
-    puts "... parsing the HTML file"
-    countries = []
-    imported_codes = []
-    doc.search("//tr").each do |row|
-      n = row.search("td[@class='n']")
-      g = row.search("td")
-      if n && n.inner_html =~ /NamesTerritories/ && g.count>=7 && g[4].inner_html =~ /^[A-Z]{2}/
-        code   = g[4].inner_text
-        code   = code[-code.size, 2].to_sym
-        name   = row.search("td[@class='v']").inner_text
-        unless imported_codes.member?(code)
-          imported_codes << code
-          countries << { :code => code, :name => name.to_s }
-        end
-        print " ... #{code}: #{name}"
-      end
-    end
-    puts "\n\n... imported countries: #{countries.count}"
-    puts countries.sort{|a,b| a[:code]<=>b[:code]}.inspect
+    set_parser(ENV['PARSER']) if ENV['PARSER']
+    puts "... parsing the HTML file using #{parser.name.split("::").last}"
+    countries = parser.parse(html).inject([]) { |arr, (code, attrs)| arr << attrs }
+    countries.sort_by! { |c| c[:code] }
+    puts "\n\n... imported #{countries.count} countries:"
+    puts countries.map { |c| "#{c[:code]}: #{c[:name]}" }.join(", ")
 
 
     # ----- Prepare the output format     ------------------------------------------
@@ -129,4 +110,113 @@ TAIL
     # ------------------------------------------------------------------------------
   end
 
+  module LocalizedCountrySelectTasks
+    class Parser
+      attr_reader :html
+
+      def initialize(html)
+        @html = html
+      end
+
+      def self.parse(html)
+        self.new(html).parse
+      end
+
+      def parse
+        raise NotImplementedError, "#parse method need to be implemented in child class!"
+      end
+    end
+
+    class NokogiriParser < Parser
+      def document
+        @document ||= Nokogiri::HTML(html)
+      end
+
+      def parse
+        document.search("//tr").inject({}) do |hash, row|
+          n = row.search("td[@class='n']")
+          g = row.search("td")
+          if n.inner_html =~ /NamesTerritories/ && g.count >= 7 && g[4].inner_html =~ /^[A-Z]{2}/
+            code = g[4].inner_text
+            code = code[-code.size, 2].to_sym
+            name = row.search("td[@class='v']").inner_text
+
+            hash[code] = {:code => code, :name => name.to_s}
+          end
+          hash
+        end
+      end
+    end
+
+    class HpricotParser < NokogiriParser
+      def document
+        @document ||= Hpricot(html)
+      end
+    end
+
+    class LibXMLParser < Parser
+      def document
+        @document ||= LibXML::XML::HTMLParser.string(html, options: LibXML::XML::HTMLParser::Options::RECOVER).parse
+      end
+
+      def parse
+        document.find("//tr").inject({}) do |hash, row|
+          n = row.find("td[@class='n']")
+          g = row.find("td")
+          if n.map(&:content).join =~ /NamesTerritories/ && g.count >= 7 && g[4].inner_xml =~ /^[A-Z]{2}/
+            code = g[4].content
+            code = code[-code.size, 2].to_sym
+            name = row.find("td[@class='v']").map(&:content).join
+
+            hash[code] ||= {:code => code, :name => name.to_s}
+          end
+          hash
+        end
+      end
+    end
+
+    REQUIREMENTS_MAP = [
+        ['nokogiri', :Nokogiri],
+        ['hpricot', :Hpricot],
+        ['libxml', :LibXML]
+    ]
+
+    def self.detect_parser
+      REQUIREMENTS_MAP.each do |library, klass|
+        return const_get(:"#{klass}Parser") if const_defined?(klass)
+      end
+
+      REQUIREMENTS_MAP.each do |library, klass|
+        begin
+          require library
+          return const_get(:"#{klass}Parser")
+        rescue LoadError
+        end
+      end
+
+      raise StandardError, "One of nokogiri, hpricot or libxml-ruby gem is required! Add \"gem 'nokogiri'\" to your Gemfile to resolve this issue."
+    end
+  end
+
+  def parser
+    @parser ||= LocalizedCountrySelectTasks.detect_parser
+  end
+
+  def set_parser(arg)
+    @parser = begin
+      parser = nil
+      requirements = LocalizedCountrySelectTasks::REQUIREMENTS_MAP
+      found = requirements.detect { |library, _| library == arg }
+      raise ArgumentError, "Can't find parser for #{arg}! Supported parsers are: #{requirements.map(&:first).join(", ")}." unless found
+      library, klass = found
+      begin
+        require library
+        parser = LocalizedCountrySelectTasks.const_get(:"#{klass}Parser")
+      rescue LoadError
+        gem_name = library == 'libxml' ? 'libxml-ruby' : library
+        raise ArgumentError, "Can't find #{library} library! Add \"gem '#{gem_name}'\" to Gemfile."
+      end
+      parser
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localized_country_select
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -33,22 +33,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Localized "country_select" helper with Rake task for downloading locales