rails_language_select 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0116d225f2e2792658cebe7c7d7be4d01ce04ed
-  data.tar.gz: abd750ed8ae9f3cb934feacc10c47e9391bcfcd0
+  metadata.gz: fc15627b7ee27b37f8a8e46b12879ca9e144aa9b
+  data.tar.gz: 980a6a6d3a9ca81360acc680ceeb728d582f8812
 SHA512:
-  metadata.gz: 67b6dbeddaf542690039e0c930b5fc7725e0c741a9e898eaa61a65c571844cbcef449c25995c07cea006ac1e9687a112e503799a2c728c6271b2556a118de405
-  data.tar.gz: 6dc819530af66219692b6e143a2962aa97d18403faff09bc2ba26b11a38d81b1333ed49420a293383918f43dbbc1c8cec13f55792481f3f3c3ccc2129c5af231
+  metadata.gz: 7627ab704a37e9bb1184403d7f82be9b64d60857f3772586d6551629e14ec8581952ad58f1368ca6d9228ccf5147e73ce13939edc85ec43b87616fa89b0dfc57
+  data.tar.gz: ddd705452a0440081429625b4eaab26abfa48775654da436c2cba995fa067ec2ef876cee98550be49091d90aa3317ab01cdc107e90bb475630246c6ddf04bc91

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_language_select (0.1.2)
+    rails_language_select (0.2.0)
       i18n_data (~> 0.7.0)
       sort_alphabetical (~> 1.0)
 
@@ -39,7 +39,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    psych (2.2.2)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    psych (2.2.3)
     racc (1.4.14)
     rack (1.4.7)
     rack-cache (1.7.0)
@@ -280,6 +282,7 @@ PLATFORMS
 DEPENDENCIES
   actionpack (~> 3)
   pry (~> 0)
+  pry-nav
   psych
   racc
   rails_language_select!

data/README.md

@@ -1,10 +1,10 @@
 # Rails Language Select
 
-Provides a simple helper to get a localised `<select>` of languages using the ISO 369 standard.
+Helper for displaying a localised `<select>` of languages using the ISO 369 standard or your own custom data source.
 
-Based on the code of https://github.com/stefanpenner/country_select
+Based on the code of: https://github.com/stefanpenner/country_select
 
-Uses language data from https://github.com/grosser/i18n_data
+By default uses language data from: https://github.com/grosser/i18n_data
 
 ## Installation
 
@@ -63,14 +63,59 @@ Supplying additional html options:
 language_select("user", "language", { priority_languages: ["EN", "FR"], selected: "EN" }, { class: 'form-control', data: { attribute: "value" } })
 ```
 
+### Using a custom data source
+
+You can override the default data source, or define a new custom data source which will receive `code_or_name`
+```ruby
+# config/initializers/language_select.rb
+
+# example overriding default data source
+RailsLanguageSelect::DATA_SOURCE[:default] = lambda do |code_or_name|
+  languages = I18nData.languages(I18n.locale.to_s).slice("EN", "FR", "ES")
+  if code_or_name.nil?
+    languages.keys
+  else
+    if (language = languages[code_or_name.to_s.upcase])
+      code = code_or_name
+    elsif (code = I18nData.language_code(code_or_name))
+      language = languages[code]
+    end
+    return language, code
+  end
+end
+
+# example defining a new custom data source
+RailsLanguageSelect::DATA_SOURCE[:custom_data] = lambda do |code_or_name|
+  custom_data = {yay: "YAY!", wii: 'Yippii!'}
+  if code_or_name.nil?
+    custom_data.keys
+  else
+    if (language = custom_data[code_or_name])
+      code = code_or_name
+    elsif (code = custom_data.key(code_or_name))
+      language = code_or_name
+    end
+    return language, code
+  end
+end
+```
+
+```ruby
+language_select("user", "language", data_source: :custom_data)
+```
+
 ### Using a custom formatter
 
 You can override the default formatter, or define a new custom formatter which will receive `language` (localised language name) and `code`
 ```ruby
 # config/initializers/language_select.rb
+
+# example overriding default formatter
 RailsLanguageSelect::FORMATS[:default] = lambda do |language, code|
   [language, code.downcase] # use lower case code instead of upper case
 end
+
+# example defining a new custom formatter
 RailsLanguageSelect::FORMATS[:with_code] = lambda do |language, code|
   "#{language} (#{code})"
 end

data/lib/rails_language_select.rb

@@ -4,6 +4,7 @@ require 'i18n_data'
 require 'sort_alphabetical'
 
 require 'rails_language_select/version'
+require 'rails_language_select/data_source'
 require 'rails_language_select/formats'
 require 'rails_language_select/tag_helper'
 

data/lib/rails_language_select/data_source.rb

@@ -0,0 +1,17 @@
+module RailsLanguageSelect
+  DATA_SOURCE = {}
+
+  DATA_SOURCE[:default] = lambda do |code_or_name = nil|
+    languages = I18nData.languages(I18n.locale.to_s)
+    if code_or_name.nil?
+      languages.keys
+    else
+      if (language = languages[code_or_name.to_s.upcase])
+        code = code_or_name
+      elsif (code = I18nData.language_code(code_or_name))
+        language = languages[code]
+      end
+      return language, code
+    end
+  end
+end

data/lib/rails_language_select/tag_helper.rb

@@ -47,12 +47,16 @@ module RailsLanguageSelect
       @options[:format] || :default
     end
 
+    def data_source
+      @options[:data_source] || :default
+    end
+
     def language_options
       language_options_for(all_language_codes, true)
     end
 
     def all_language_codes
-      codes = I18nData.languages.keys
+      codes = ::RailsLanguageSelect::DATA_SOURCE[data_source].call
 
       if only_language_codes.present?
         codes & only_language_codes.map{|code| code.to_s.upcase}
@@ -66,11 +70,7 @@ module RailsLanguageSelect
     def language_options_for(language_codes, sorted=true)
       I18n.with_locale(locale) do
         language_list = language_codes.map do |code_or_name|
-          if language = I18nData.languages(I18n.locale.to_s)[code_or_name.to_s.upcase]
-            code = code_or_name
-          elsif code = I18nData.language_code(code_or_name)
-            language = code_or_name
-          end
+          language, code = ::RailsLanguageSelect::DATA_SOURCE[data_source].call(code_or_name)
 
           unless language.present?
             msg = "Could not find Language with string '#{code_or_name}'"

data/lib/rails_language_select/version.rb

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

data/rails_language_select.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email = ["kasparsj@gmail.com"]
   s.homepage = "https://github.com/kasparsj/rails_language_select"
   s.summary = "Helper for displaying a localised <select> of languages"
-  s.description = "Helper for displaying a localised <select> of languages using the ISO 369 standard."
+  s.description = "Helper for displaying a localised <select> of languages using the ISO 369 standard or your own custom data source."
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'actionpack', '~> 3'
   s.add_development_dependency 'pry', '~> 0'
+  s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'wwtd'

data/spec/rails_language_select_spec.rb

@@ -147,7 +147,7 @@ describe "RailsLanguageSelect" do
     it "supports the language names as provided by default in Formtastic" do
       tag = options_for_select([
                                    ["Dzongkha", "DZ"],
-                                   ["Spanish", "ES"],
+                                   ["Spanish; Castilian", "ES"],
                                    ["Danish", "DA"],
                                    ["English", "EN"]
                                ])
@@ -202,4 +202,27 @@ describe "RailsLanguageSelect" do
       expect(t).to include(tag)
     end
   end
+
+  describe "custom data source" do
+    it "accepts a custom data source" do
+      ::RailsLanguageSelect::DATA_SOURCE[:custom_data] = lambda do |code_or_name = nil|
+        custom_data = {yay: "YAY!", wii: 'Yippii!'}
+        if code_or_name.nil?
+          custom_data.keys
+        else
+          if (language = custom_data[code_or_name])
+            code = code_or_name
+          elsif (code = custom_data.key(code_or_name))
+            language = code_or_name
+          end
+          return language, code
+        end
+      end
+
+      tag = options_for_select([['YAY!', 'yay'], ['Yippii!', 'wii']], 'wii')
+      walrus.language_code = 'wii'
+      t = builder.language_select(:language_code, data_source: :custom_data)
+      expect(t).to include(tag)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_language_select
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Kaspars Jaudzems
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Helper for displaying a localised <select> of languages using the ISO
-  369 standard.
+  369 standard or your own custom data source.
 email:
 - kasparsj@gmail.com
 executables: []
@@ -124,6 +138,7 @@ files:
 - README.md
 - Rakefile
 - lib/rails_language_select.rb
+- lib/rails_language_select/data_source.rb
 - lib/rails_language_select/formats.rb
 - lib/rails_language_select/language_select_helper.rb
 - lib/rails_language_select/rails3/language_select_helper.rb