administrate-field-select 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f58e24ffac45ca27057850b2fcf50872125d39b
-  data.tar.gz: a196debcaf2a0fb6bc5d847647ed510ee212c6df
+  metadata.gz: c7795e86d5ca03e395741b70058a0b276df95791
+  data.tar.gz: d541cc67d30d5f1dd681866cf5f38ea1d1450f83
 SHA512:
-  metadata.gz: 731bbc98159c6a0cd66c23ff2db0d0338a7832642b364d6105c83b07edfde8443a0852b5c0f51342caf6a391b23c57a2852b4e8fdbd1fe0ec07bccd8308627b9
-  data.tar.gz: b6a3a85382d25098f359a63d2ca6bffdb19b18f605fb73cf9156aefea6cadfa0414cebe987e01163ebed51a411b57fed8348c4f364d45565726307179c0e898f
+  metadata.gz: bd526757ab59f12cd0119bde2c6f8252bacde9a860962db0d42d38729e3e726bd3b1a590c5a8c90c444eb0a8d38e5c3ac3f61cb72bffeb962fefbfe28feebd22
+  data.tar.gz: 6cbb72e22c4ccdc154a1049dbfd1b870bd97d76971ab5a8b11539693fdc90cf9c782d73b0f92a320efe11ea7a4781494c20aa80702d6cc0e08688fbc5a5e4cd2

data/README.md

@@ -5,7 +5,7 @@ Adds basic select/dropdown fields to ThoughtBot's [Administrate](https://github.
 [![Gem Version](https://img.shields.io/gem/v/administrate-field-select.svg?style=flat)](https://rubygems.org/gems/administrate-field-select)
 [![Build Status](https://img.shields.io/travis/fishpercolator/administrate-field-select/master.svg?style=flat)](https://travis-ci.org/fishpercolator/administrate-field-select)
 
-'''NOTE''': Since v0.1.15, Administrate now supports its own Field::Select with a slightly different mechanic. So this has been renamed to Field::SelectBasic. Please update your Gemfiles (as below) and rename your calls to this field.
+**NOTE**: Since v0.1.15, Administrate now supports its own Field::Select with a slightly different mechanic. So this has been renamed to Field::SelectBasic. Please update your Gemfiles (as below) and rename your calls to this field.
 
 ## Installation
 
@@ -38,13 +38,16 @@ Additional options that are available:
 
 * `include_blank`: If true or a string, includes a blank option in the dropdown (with the string as its text).
 * `prettify`: If true, passes all choices through [`titleize`](http://api.rubyonrails.org/classes/String.html#method-i-titleize) before displaying them (in all views). If a lambda, that lambda is used instead of `titleize`.
+* `i18n`: If true, passes all choices through [`i18n`](https://github.com/svenfuchs/i18n) before displaying them (in all views). 
+
+If both `prettify` and `i18n` are specified then `prettify` takes
+precedence.
 
 ## Todo
 
 Some ideas for possible enhancements:
 
-1. Support i18n instead of prettify
-2. Be more magic with enum types and reflect the choices
+1. Be more magic with enum types and reflect the choices
 
 ## Contributing
 

data/administrate-field-select.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "administrate-field-select"
-  spec.version       = "2.0.0"
+  spec.version       = "2.1.0"
   spec.authors       = ["Rich Daley"]
   spec.email         = ["rich@fishpercolator.co.uk"]
 

data/lib/administrate/field/select_basic.rb

@@ -5,33 +5,55 @@ module Administrate
   module Field
     class SelectBasic < Base
       class Engine < ::Rails::Engine
-      end      
-      
+      end
+
       def choices
-        options.fetch(:choices, []).
-          map { |o| prettify? ? [prettify(o), o] : o }
+        options.fetch(:choices, []).map { |o| convert_to_array(o) }
       end
-  
+
       def to_s
-        prettify? ? prettify(data) : data
+        convert(data)
       end
-  
+
       def include_blank
         options.fetch(:include_blank, false)
       end
-    
+
       private
-  
+
+      def convert_to_array item
+        return item if do_not_modify_contents?
+        item.respond_to?(:each) ? [convert(item.first), item.last] : [convert(item), item]
+      end
+
+      def convert item
+        return prettify(item) if prettify?
+        return internationalise(item) if i18n?
+        return item
+      end
+
+      def do_not_modify_contents?
+        !(prettify? || i18n?)
+      end
+
       def prettify?
         !!options[:prettify]
       end
-  
+
+      def i18n?
+        !!options[:i18n]
+      end
+
+      def callable_prettify?
+        options[:prettify].respond_to? :call
+      end
+
       def prettify(str)
-        if options[:prettify].respond_to? :call
-          options[:prettify].call(str)
-        else
-          str.titleize
-        end
+        callable_prettify? ? options[:prettify].call(str) : str.titleize
+      end
+
+      def internationalise item
+        return I18n.t(item)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-select
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Rich Daley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dropdown/select fields for Administrate dashboards