magic-localized_country_select 0.1.2 → 0.2.0

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+script: "bundle exec rake test"

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Rakefile

@@ -2,7 +2,7 @@
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 #load File.join(File.dirname(__FILE__), 'lib', 'tasks', 'localized_country_select_tasks.rake')
 
@@ -36,7 +36,8 @@ begin
     gemspec.description = "Localized country select list"
     gemspec.email = "mail@magiclabs.de"
     gemspec.homepage = "https://github.com/magiclabs/localized_country_select"
-    gemspec.authors = ["LIM SAS", "Damien MATHIEU", "Julien SANCHEZ", "Hervé GAUCHER"]
+    gemspec.authors = ["LIM SAS", "Damien MATHIEU", "Julien SANCHEZ", "Hervé GAUCHER", "Thomas von Deyen"]
+    gemspec.add_dependency "rails", "~> 3"
     gemspec.add_dependency "hpricot", "~> 0.8"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/localized_country_select.rb

@@ -23,23 +23,23 @@ load 'tasks/localized_country_select_tasks.rake'
 #
 module LocalizedCountrySelect
   class << self
+
     # Returns array with codes and localized country names (according to <tt>I18n.locale</tt>)
     # for <tt><option></tt> tags
-    def localized_countries_array(options={})
-      if(options[:description]==:abbreviated)
-        I18n.translate(:countries).map { |key, value| [key.to_s.upcase] }.
-          sort_by { |country| country.first }
+    def localized_countries_array(options = {})
+      if options[:description] == :abbreviated
+        I18n.translate(:countries).map { |key, value| [key.to_s.upcase] }.sort_by { |country| country.first }
       else
-        I18n.translate(:countries).map { |key, value| [value, key.to_s.upcase] }.
-          sort_by { |country| country.first }
+        I18n.translate(:countries).map { |key, value| [value, key.to_s.upcase] }.sort_by { |country| country.first }
       end
     end
+
     # Return array with codes and localized country names for array of country codes passed as argument
     # == Example
     #   priority_countries_array([:TW, :CN])
     #   # => [ ['Taiwan', 'TW'], ['China', 'CN'] ]
-    def priority_countries_array(country_codes=[],options={})
-      if(options[:description]==:abbreviated)
+    def priority_countries_array(country_codes = [], options = {})
+      if options[:description] == :abbreviated
         country_codes.map { |code| [code.to_s.upcase] }
       else
         countries = I18n.translate(:countries)
@@ -59,8 +59,7 @@ module ActionView
       # Country codes listed as an array of symbols in +priority_countries+ argument will be listed first
       # TODO : Implement pseudo-named args with a hash, not the "somebody said PHP?" multiple args sillines
       def country_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).
-          to_localized_country_select_tag(priority_countries, options, html_options)
+        InstanceTag.new(object, method, self, options.delete(:object)).to_localized_country_select_tag(priority_countries, options, html_options)
       end
 
       # Return "named" select and option tags according to given arguments.
@@ -68,17 +67,17 @@ module ActionView
       # It behaves likes older object-binded brother +localized_country_select+ otherwise
       # TODO : Implement pseudo-named args with a hash, not the "somebody said PHP?" multiple args sillines
       def country_select_tag(name, selected_value = nil, priority_countries = nil, html_options = {})
-        select_tag name.to_sym, country_options_for_select(selected_value, priority_countries), html_options.stringify_keys
+        select_tag(name.to_sym, country_options_for_select(selected_value, priority_countries), html_options.stringify_keys)
       end
 
       # Returns a string of option tags for countries according to locale. Supply the country code in upper-case ('US', 'DE') 
       # as +selected+ to have it marked as the selected option tag.
       # Country codes listed as an array of symbols in +priority_countries+ argument will be listed first
-      def country_options_for_select(selected = nil, priority_countries = nil,options={})
-        country_options = ""
-        if priority_countries
-          country_options += options_for_select(LocalizedCountrySelect::priority_countries_array(priority_countries,options), selected)
-          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+      def country_options_for_select(selected = nil, priority_countries = nil, options = {})
+        country_options = "".html_safe
+        if priority_countries.present?
+          country_options += options_for_select(LocalizedCountrySelect::priority_countries_array(priority_countries, options), selected)
+          country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n".html_safe
         end
         return country_options + options_for_select(LocalizedCountrySelect::localized_countries_array(options), selected)
       end
@@ -90,12 +89,7 @@ module ActionView
         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),
-            options, value
-          ), html_options
-        )
+        content_tag("select", add_options(country_options_for_select(value, priority_countries,options), options, value), html_options)
       end
     end
     

data/magic-localized_country_select.gemspec

@@ -5,17 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = "magic-localized_country_select"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["LIM SAS", "Damien MATHIEU", "Julien SANCHEZ", "Herv\u{e9} GAUCHER"]
-  s.date = "2012-01-19"
+  s.authors = ["LIM SAS", "Damien MATHIEU", "Julien SANCHEZ", "Herv\u{e9} GAUCHER", "Thomas von Deyen"]
+  s.date = "2012-03-08"
   s.description = "Localized country select list"
   s.email = "mail@magiclabs.de"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
+    ".travis.yml",
+    "Gemfile",
     "MIT-LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -32,18 +34,24 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/magiclabs/localized_country_select"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Localized country select list"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<magic-localized_country_select>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3"])
       s.add_runtime_dependency(%q<hpricot>, ["~> 0.8"])
     else
+      s.add_dependency(%q<magic-localized_country_select>, [">= 0"])
+      s.add_dependency(%q<rails>, ["~> 3"])
       s.add_dependency(%q<hpricot>, ["~> 0.8"])
     end
   else
+    s.add_dependency(%q<magic-localized_country_select>, [">= 0"])
+    s.add_dependency(%q<rails>, ["~> 3"])
     s.add_dependency(%q<hpricot>, ["~> 0.8"])
   end
 end

data/test/localized_country_select_test.rb

@@ -1,23 +1,15 @@
-# coding: utf-8
-$KCODE = 'u'
+# encoding: utf-8
 
 require 'test/unit'
 
 require 'rubygems'
 require 'active_support'
 require 'action_controller'
-# require 'action_controller/test_process'
 require 'action_view'
 require 'action_view/helpers'
 require 'action_view/helpers/tag_helper'
 require 'i18n'
 
-begin
-  require 'redgreen'
-rescue LoadError
-  puts "[!] Install redgreen gem for better test output ($ sudo gem install redgreen)"
-end unless ENV["TM_FILEPATH"]
-
 require 'localized_country_select'
 
 class LocalizedCountrySelectTest < Test::Unit::TestCase
@@ -27,12 +19,12 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
   include ActionView::Helpers::FormTagHelper
 
   def test_action_view_should_include_helper_for_object
-    assert ActionView::Helpers::FormBuilder.instance_methods.include?('country_select') # WTF not working with 1.9
-    assert ActionView::Helpers::FormOptionsHelper.instance_methods.include?('country_select')
+    assert ActionView::Helpers::FormBuilder.instance_methods.include?(:country_select)
+    assert ActionView::Helpers::FormOptionsHelper.instance_methods.include?(:country_select)
   end
 
   def test_action_view_should_include_helper_tag
-    assert ActionView::Helpers::FormOptionsHelper.instance_methods.include?('country_select_tag') # WTF not working with 1.9
+    assert ActionView::Helpers::FormOptionsHelper.instance_methods.include?(:country_select_tag)
   end
 
   def test_should_return_select_tag_with_proper_name_for_object
@@ -43,7 +35,6 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
   end
 
   def test_should_return_select_tag_with_proper_name
-    # puts country_select_tag( "competition_submission[data][citizenship]", nil)
     assert country_select_tag( "competition_submission[data][citizenship]", nil) =~
               Regexp.new(
               Regexp.escape('<select id="competition_submission_data_citizenship" name="competition_submission[data][citizenship]">') ),
@@ -72,7 +63,6 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
 
   def test_localized_countries_array_returns_correctly
     assert_nothing_raised { LocalizedCountrySelect::localized_countries_array() }
-    # puts LocalizedCountrySelect::localized_countries_array.inspect
     I18n.locale = 'en'
     assert_equal 243, LocalizedCountrySelect::localized_countries_array.size
     assert_equal 'Afghanistan', LocalizedCountrySelect::localized_countries_array.first[0]
@@ -103,14 +93,20 @@ class LocalizedCountrySelectTest < Test::Unit::TestCase
     assert_match Regexp.new(Regexp.escape(%Q{<option value="BT">Бутан</option>\n<option value="VU">Вануату</option>})), country_select(:user, :country)
   end
 
+  def test_country_options_for_select_string_is_html_safe
+    assert country_options_for_select.html_safe?, "country_options should be html_safe"
+  end
+
+  def test_country_options_for_select_string_with_priority_countries_is_html_safe
+    assert country_options_for_select(nil, ['DE']).html_safe?, "country_options with priority countries should be html_safe"
+  end
+
   # private
 
   def setup
     ['ru', 'en'].each do |locale|
-      # I18n.load_translations( File.join(File.dirname(__FILE__), '..', 'locale', "#{locale}.rb")  )  # <-- Old style! :)
       I18n.load_path += Dir[ File.join(File.dirname(__FILE__), '..', 'locale', "#{locale}.rb") ]
     end
-    # I18n.locale = I18n.default_locale
     I18n.locale = 'en'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic-localized_country_select
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,37 @@ authors:
 - Damien MATHIEU
 - Julien SANCHEZ
 - Hervé GAUCHER
+- Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: magic-localized_country_select
+  requirement: &70114907122320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70114907122320
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70114907121780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70114907121780
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70308313815240 !ruby/object:Gem::Requirement
+  requirement: &70114907121260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,7 +47,7 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70308313815240
+  version_requirements: *70114907121260
 description: Localized country select list
 email: mail@magiclabs.de
 executables: []
@@ -32,6 +55,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .travis.yml
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -65,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Localized country select list