countries 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/countries.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{countries}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hexorx"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "countries.gemspec",
      "lib/countries.rb",
+     "lib/countries/select_helper.rb",
      "lib/data/addresses.yaml",
      "lib/data/countries.yaml",
      "lib/data/import.rb",

data/lib/countries.rb

@@ -1,6 +1,9 @@
+require File.join(File.dirname(__FILE__), 'countries', 'select_helper.rb')
+
 class Country
   Data = YAML.load_file(File.join(File.dirname(__FILE__), 'data', 'countries.yaml')) || {}
-  Names = Data.map {|code,data| data['name']}.sort
+  Names = Data.map {|k,v| [v['name'],k]}.sort
+  NameIndex = Hash[*Names.flatten]
   
   attr_reader :number, :alpha2, :alpha3, :name, :names, :latitude, :longitude, :region, :subregion, :country_code, :national_destination_code_lengths, :national_number_lengths, :international_prefix, :national_prefix
 
@@ -38,47 +41,4 @@ class Country
   def subdivisions?
     File.exist?(File.join(File.dirname(__FILE__), 'data', 'subdivisions', "#{alpha2}.yaml"))
   end
-end
-
-# CountrySelect - stolen from http://github.com/rails/iso-3166-country-select
-module ActionView
-  module Helpers
-    module FormOptionsHelper
-
-      def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
-      end
-
-      def country_options_for_select(selected = nil, priority_countries = nil)
-        country_options = ""
-
-        if priority_countries
-          country_options += options_for_select(priority_countries, selected)
-          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
-        end
-
-        return country_options + options_for_select(Country::Names, selected)
-      end
-    end
-    
-    class InstanceTag
-      def to_country_select_tag(priority_countries, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-        value = value(object)
-        content_tag("select",
-          add_options(
-            country_options_for_select(value, priority_countries),
-            options, value
-          ), html_options
-        )
-      end
-    end
-    
-    class FormBuilder
-      def country_select(method, priority_countries = nil, options = {}, html_options = {})
-        @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
-      end
-    end
-  end
 end

data/lib/countries/select_helper.rb

@@ -0,0 +1,43 @@
+# CountrySelect - stolen from http://github.com/rails/iso-3166-country-select
+module ActionView
+  module Helpers
+    module FormOptionsHelper
+
+      def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
+        InstanceTag.new(object, method, self, options.delete(:object)).to_country_select_tag(priority_countries, options, html_options)
+      end
+
+      def country_options_for_select(selected = nil, priority_countries = nil)
+        country_options = ""
+
+        if priority_countries
+          priority_countries.map! {|x| [x,Country::NamesIndex[x]] }
+          country_options += options_for_select(priority_countries, selected)
+          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+        end
+
+        return country_options + options_for_select(Country::Names, selected)
+      end
+    end
+    
+    class InstanceTag
+      def to_country_select_tag(priority_countries, options, html_options)
+        html_options = html_options.stringify_keys
+        add_default_name_and_id(html_options)
+        value = value(object)
+        content_tag("select",
+          add_options(
+            country_options_for_select(value, priority_countries),
+            options, value
+          ), html_options
+        )
+      end
+    end
+    
+    class FormBuilder
+      def country_select(method, priority_countries = nil, options = {}, html_options = {})
+        @template.country_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: countries
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - hexorx
@@ -50,6 +50,7 @@ files:
 - VERSION
 - countries.gemspec
 - lib/countries.rb
+- lib/countries/select_helper.rb
 - lib/data/addresses.yaml
 - lib/data/countries.yaml
 - lib/data/import.rb