country-select-engine 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5d9eefe4d98c7206992dc7d72e72d5d68d05b6cb
+  data.tar.gz: d5c3e5fb95d3f285d35b68d23c6745a4df322344
+SHA512:
+  metadata.gz: 069e38875ec1335daeec5b769e765bdd57d825272566b6a1d9dd69c8a199ded2f8ba27b3304fdfdbacf03855e2cbde4cd4186e298c7fdb02322b9658be79357e
+  data.tar.gz: 32ef6e8cfe422a0f3a625de8943d43b4e99a5d3b9645f8dfa7beac3d225c42833281925136647afc4b4e9e60971d2ac496f31a316c6f12a512aa633f7a807b70

checksums.yaml.gz.sig

@@ -0,0 +1,3 @@
+�-��Y��uVQ�V-���"o|�;q
+���V�_��+Ʃ�d�VJ�ܥv��WH%����lۮ�rT�f�{!m7���X�=&��G�)pnȧh����;�r�/� +W{o?��u%�ں���]�jԒs�$�ru�~=�@.
T�����%ePp]���N��w8�Xa���
+�vD�ZӲ<�@�{��5��0��ݔ3��)-��2�sB$ĭ�	�:������d����y������]�p&,���'�\��

data/.gitignore

@@ -13,7 +13,7 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
-/spec/dummy/tmp
+/test/dummy/tmp
 /public/assets/
 /config/secret_settings.yml
 

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Declare your gem's dependencies in country-select-engine.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/Gemfile.lock

@@ -1,92 +1,87 @@
 PATH
   remote: .
   specs:
-    country-select-engine (0.1.1)
-      rails (~> 3.2.3)
+    country-select-engine (0.1.3)
+      rails (>= 4.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.5)
-      actionpack (= 3.2.5)
-      mail (~> 2.4.4)
-    actionpack (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
-      builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-    activesupport (3.2.5)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.10)
+    builder (3.1.4)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.3)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    hike (1.2.3)
+    i18n (0.6.4)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.23)
+    minitest (4.7.5)
+    multi_json (1.7.7)
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
+    rack (1.5.2)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.5)
-      actionmailer (= 3.2.5)
-      actionpack (= 3.2.5)
-      activerecord (= 3.2.5)
-      activeresource (= 3.2.5)
-      activesupport (= 3.2.5)
-      bundler (~> 1.0)
-      railties (= 3.2.5)
-    railties (3.2.5)
-      actionpack (= 3.2.5)
-      activesupport (= 3.2.5)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    sprockets (2.1.3)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.15.2)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,10 +14,21 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
 
 Bundler::GemHelper.install_tasks
 
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task default: :test

data/{script → bin}/rails

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/country-select-engine/engine', __FILE__)

data/country-select-engine.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/yjchen/country-select-engine"
   s.summary     = "Rails engine for localized_country_select."
   s.description = "Provide a list of localized countries, currencies and time zones"
+  s.license = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -20,9 +21,7 @@ Gem::Specification.new do |s|
   s.signing_key = File.join(Dir.home,'/.gem/trust/gem-private_key.pem')
   s.cert_chain = ['gem-public_cert.pem']
 
-  s.add_dependency "rails", "~> 3.2.3"
-  # s.add_dependency "hpricot"
-  # s.add_dependency "jquery-rails"
+  s.add_dependency "rails", ">= 4.0.0"
 
   s.add_development_dependency "sqlite3"
 end

data/lib/country-select-engine.rb

@@ -105,8 +105,14 @@ module ActionView
       categories.each do |category|
       class_eval %Q{
       def localized_#{category.singularize}_select(object, method, priority_countries = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).
-          to_localized_#{category.singularize}_select_tag(priority_countries, options, html_options)
+        choices = CountrySelectEngine.localized_#{category}_array
+        if priority_countries
+          priority = CountrySelectEngine::priority_#{category}_array(priority_countries)
+          priority << ['--------', nil]
+          choices = priority + choices
+        end
+
+        Tags::Select.new(object, method, self, choices, options, html_options).render
       end
       }
       end
@@ -146,31 +152,12 @@ module ActionView
 
     end
 
-    class InstanceTag
-      categories = ['currencies', 'countries', 'languages', 'timezones']
-      categories.each do |category|
-      class_eval %Q{
-      def to_localized_#{category.singularize}_select_tag(priority_countries, options, html_options)
-        html_options = html_options.stringify_keys
-        add_default_name_and_id(html_options)
-        value = options.has_key?(:selected) ? options[:selected] : value(object)
-        content_tag("select",
-          add_options(
-            localized_#{category.singularize}_options_for_select(value, priority_countries, options).html_safe,
-            options, value
-          ), html_options
-        )
-      end
-      }
-      end
-    end
-
     class FormBuilder
       categories = ['currencies', 'countries', 'languages', 'timezones']
       categories.each do |category|
       class_eval %Q{
       def localized_#{category.singularize}_select(method, priority_countries = nil, options = {}, html_options = {})
-        @template.localized_#{category.singularize}_select(@object_name, method, priority_countries, options.merge(:object => @object), html_options)
+        @template.localized_#{category.singularize}_select(@object_name, method, priority_countries, objectify_options(options), @default_options.merge(html_options))
       end
       }
       end

data/lib/country-select-engine/version.rb

@@ -1,3 +1,3 @@
 module CountrySelectEngine
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/{spec → test}/dummy/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

data/{spec → test}/dummy/app/assets/javascripts/application.js

@@ -5,11 +5,9 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/{spec → test}/dummy/app/assets/stylesheets/application.css

@@ -10,4 +10,4 @@
  *
  *= require_self
  *= require_tree .
-*/
+ */

data/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/{spec → test}/dummy/app/controllers/dummy_controller.rb

@@ -1,4 +1,6 @@
 class DummyController < ApplicationController
   def index
+    @selected = User.new
+    @selected.country = 'US'
   end
 end

data/test/dummy/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/{spec → test}/dummy/app/views/dummy/index.html.erb

@@ -1,3 +1,4 @@
+<div>
 <p><b>In English</b></p>
 <p>
 Translation of US is <%= t('US', :scope => 'countries') %>
@@ -8,6 +9,8 @@ Translation of US is <%= t('US', :scope => 'countries') %>
 <%= localized_currency_select(:user, :country, [], :include_blank => 'Please choose...') %>
 <%= localized_timezone_select(:user, :country, [], :include_blank => 'Please choose...') %>
 </p>
+</div>
+<div>
 <p><b>In Deutsch (Germany)</b></p>
 <% I18n.locale = :de %>
 <p>
@@ -18,6 +21,8 @@ Translation of US is <%= t('US', :scope => 'countries') %>
 <%= localized_language_select(:user, :country, [], :include_blank => 'Please choose...') %>
 <%= localized_currency_select(:user, :country, [], :include_blank => 'Please choose...') %>
 </p>
+</div>
+<div>
 <p><b>In Traditional Chinese</b></p>
 <% I18n.locale = :'zh-TW' %>
 <p>
@@ -29,3 +34,12 @@ Translation of US is <%= t('US', :scope => 'countries') %>
 <%= localized_currency_select(:user, :country, [], {:include_blank => 'Please choose...', :symbol => :prepend}) %>
 <%= localized_timezone_select(:user, :country, [], {:include_blank => 'Please choose...', :sort => false, :timezone => :prepend}) %>
 </p>
+</div>
+<div>
+  <% I18n.locale = :en %>
+  <%= form_for @selected do |f| %>
+    <%= f.localized_country_select(:country, [:TW, :CN]) %>
+    <hr/>
+    <%= f.select(:country, localized_country_options_for_select(@selected.country).html_safe) %>
+  <% end %>
+</div>