administrate-field-i18n_enum 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91afa83fc36ca7dc720c6e1efa606cd623dfef35
-  data.tar.gz: d366c4f3291bb4b8cd490a6b7cbc82267bce99d6
+  metadata.gz: bd586046fb49894408339db9e4a9ed3ece5abb24
+  data.tar.gz: 6fd50b5a8ed5fad7fb4af2add1b9589041038f15
 SHA512:
-  metadata.gz: c9430c87e11389d50a690667b149261d4ad901dee99f41d58e3bda16483513feaea0309bebed3056657bb66f772b4e6b6e62b73ee67cdb203ff14ac11a29773e
-  data.tar.gz: f3d02d7eb506ba3ed7dc23f06c25a52bcf1a485de2a10a54f135a813d2642e9ef9abd229c38ee2212f24bf82b8785ddc9567fb653be89fc040ebcc9505845845
+  metadata.gz: bb2407208179e0be3890d04d38662798dbe354f3b74902b6a5388214c79f23aef3d9b32520951c70d4f38061694274eb7cf898f6e3425e28f96d735f71da1fba
+  data.tar.gz: ad39cfe9d026139a7cbd45a86000f09a727ab8f3db9795ac6cc389261904f690e5fdd85c06444a248fc0538d44362d2d3d957f596a8d3b40f6268ab1326b0aa4

data/administrate-field-i18n_enum.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "administrate-field-i18n_enum"
-  spec.version       = '0.1.5'
+  spec.version       = '0.1.6'
   spec.authors       = ["iwasaki_d"]
   spec.email         = ["d.iwasaki.g@gmail.com"]
 

data/app/views/fields/i18n_enum/_form.html.erb

@@ -2,8 +2,5 @@
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.select(
-        field.attribute,
-        field.enum_options
-      ) %>
+  <%= f.select(field.attribute, field.selectable_options) %>
 </div>

data/app/views/fields/i18n_enum/_index.html.erb

@@ -1 +1 @@
-<%= field.data.nil? ? '' : field.translate(field.class_name, field.attribute, field.data) %>
+<%= field.data.nil? ? '' : field.translate(field.data) %>

data/app/views/fields/i18n_enum/_show.html.erb

@@ -1,2 +1 @@
-<%= field.data.nil? ? '' : field.translate(field.class_name, field.attribute, field.data) %>
-
+<%= field.data.nil? ? '' : field.translate(field.data) %>

data/lib/administrate/field/i18n_enum.rb

@@ -7,24 +7,25 @@ module Administrate
       class Engine < ::Rails::Engine
       end
 
-      def enum_options
+      def selectable_options
         enums = collection.map do |k, v|
-          [translate(class_name, @attribute, k), k]
+          label, value = translate(k), k
+          [label, value]
         end
         enums.unshift(['', nil]) if @options.fetch(:null, false) == true
         enums
       end
 
-      def class_name
-        @options.fetch(:class_name, '').camelcase.downcase
-      end
-
-      def translate(class_name, attribute, value)
-        I18n.t("#{class_name}.#{attribute}.#{value}", scope: @options.fetch(:scope, nil), default: value)
+      def translate(value)
+        I18n.t("#{class_name}.#{@attribute}.#{value}", scope: @options.fetch(:scope, nil), default: value)
       end
 
       private
 
+      def class_name
+        @options.fetch(:class_name, '').camelcase.downcase
+      end
+
       def collection
         super
         method_name = @attribute.to_s.pluralize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-i18n_enum
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - iwasaki_d
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate