currency_select 0.1.2 → 0.1.3

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem 'money'
+gem 'money', '~> 5.1.1'

data/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    i18n (0.6.4)
+    money (5.1.1)
+      i18n (~> 0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  money (~> 5.1.1)

data/Rakefile

@@ -1,7 +1,7 @@
 require "rake"
 require "bundler"
 require "rake/testtask"
-require "rake/rdoctask"
+require "rdoc/task"
 
 # Gemcutter/Jeweler configuration
 # -----------------------------------------------------------------------------
@@ -17,8 +17,7 @@ begin
     gem.email = "tanordheim@gmail.com"
     gem.homepage = "http://github.com/tanordheim/currency_select"
     gem.authors = [ "Trond Arve Nordheim" ]
-
-    gem.add_bundler_dependencies
+    gem.version = File.read('VERSION').chomp
 
   end
   

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/currency_select.gemspec

@@ -1,55 +1,50 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{currency_select}
-  s.version = "0.1.2"
+  s.name = "currency_select"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Trond Arve Nordheim"]
-  s.date = %q{2011-07-22}
-  s.description = %q{Adds a currency_select helper to Ruby on Rails projects}
-  s.email = %q{tanordheim@gmail.com}
+  s.date = "2013-08-03"
+  s.description = "Adds a currency_select helper to Ruby on Rails projects"
+  s.email = "tanordheim@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "currency_select.gemspec",
-     "lib/currency_select.rb",
-     "rails/init.rb",
-     "test/helper.rb",
-     "test/test_currency_select.rb"
-  ]
-  s.homepage = %q{http://github.com/tanordheim/currency_select}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Currency Select plugin for Rails}
-  s.test_files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "currency_select.gemspec",
+    "lib/currency_select.rb",
+    "rails/init.rb",
     "test/helper.rb",
-     "test/test_currency_select.rb"
+    "test/test_currency_select.rb"
   ]
+  s.homepage = "http://github.com/tanordheim/currency_select"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Currency Select plugin for Rails"
 
   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<money>, [">= 0"])
+      s.add_runtime_dependency(%q<money>, ["~> 5.1.1"])
     else
-      s.add_dependency(%q<money>, [">= 0"])
+      s.add_dependency(%q<money>, ["~> 5.1.1"])
     end
   else
-    s.add_dependency(%q<money>, [">= 0"])
+    s.add_dependency(%q<money>, ["~> 5.1.1"])
   end
 end
 

data/lib/currency_select.rb

@@ -3,7 +3,7 @@ require "money"
 module CurrencySelect
   class << self
 
-    CURRENCIES = Money::Currency::TABLE.inject([]) do |array, (id, currency)|
+    CURRENCIES = Money::Currency::table.inject([]) do |array, (id, currency)|
       array << [ "#{currency[:name]} - #{currency[:iso_code]}", id ]
     end.sort_by { |currency| currency.first.parameterize } unless const_defined?("CURRENCIES")
 
@@ -19,7 +19,7 @@ module CurrencySelect
     #   priority_currencies_array([ "USD", "NOK" ])
     #   # => [ ['United States Dollar - USD', 'USD' ], ['Norwegian Kroner - NOK', 'NOK'] ]
     def priority_currencies_array(currency_codes = [])
-      currencies_array.select { |currency| currency_codes.include?(currency.last) }
+      currencies_array.select { |currency| currency_codes.include?(currency.last.to_s) }
     end
 
   end
@@ -28,13 +28,20 @@ end
 # CurrencySelect
 module ActionView
   module Helpers
-
     module FormOptionsHelper
 
       # Return select and option tags for the given object and method, using
       # currency_options_for_select to generate the list of option tags.
       def currency_select(object, method, priority_currencies = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_currency_select_tag(priority_currencies, options, html_options)
+        tag = if defined?(ActionView::Helpers::InstanceTag) &&
+                 ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+
+                 InstanceTag.new(object, method, self, options.delete(:object))
+              else
+                CurrencySelectTag.new(object, method, self, options)
+              end
+
+        tag.to_currency_select_tag(priority_currencies, options, html_options)
       end
 
       # Returns a string of option tags for all available currencies. Supply
@@ -43,24 +50,40 @@ module ActionView
       # +priority_currencies+, so that they will be listed above the rest of
       # the list.
       def currency_options_for_select(selected = nil, priority_currencies = nil)
+        currency_options = "".html_safe
 
-        currency_options = ""
         if priority_currencies
-          currency_options += options_for_select(CurrencySelect::priority_currencies_array(priority_currencies), selected)
-          currency_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+          currency_options += options_for_select(::CurrencySelect::priority_currencies_array(priority_currencies), selected)
+          currency_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n".html_safe
+
+          # prevents selected from being included twice in the HTML which causes
+          # some browsers to select the second selected option (not priority)
+          # which makes it harder to select an alternative priority country
+          selected = nil if priority_currencies.include?(selected)
         end
-        return currency_options + options_for_select(CurrencySelect::currencies_array - CurrencySelect::priority_currencies_array(priority_currencies), selected)
-        
-      end
 
+        # All the countries included in the country_options output.
+        return currency_options + options_for_select(::CurrencySelect::currencies_array, selected)
+      end
     end
 
-    class InstanceTag
+    module ToCurrencySelectTag
       def to_currency_select_tag(priority_currencies, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
         value = value(object)
-        content_tag("select", add_options(currency_options_for_select(value, priority_currencies), options, value), html_options)
+        content_tag('select', add_options(currency_options_for_select(value, priority_currencies), options, value), html_options)
+      end
+    end
+
+    if defined?(ActionView::Helpers::InstanceTag) &&
+        ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+      class InstanceTag
+        include ToCurrencySelectTag
+      end
+    else
+      class CurrencySelectTag < Tags::Base
+        include ToCurrencySelectTag
       end
     end
 

metadata

@@ -1,41 +1,43 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: currency_select
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Trond Arve Nordheim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: money
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id001
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.1.1
 description: Adds a currency_select helper to Ruby on Rails projects
 email: tanordheim@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -47,31 +49,26 @@ files:
 - test/test_currency_select.rb
 homepage: http://github.com/tanordheim/currency_select
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Currency Select plugin for Rails
-test_files: 
-- test/helper.rb
-- test/test_currency_select.rb
+test_files: []

data/.gitignore

@@ -1,6 +0,0 @@
-.DS_Store
-.document
-*.swp
-coverage
-rdoc
-pkg