Refactor LocaleAccessors

shioyama · Jul 29, 2017 · a3658ea · a3658ea
1 parent cd6a1fe
commit a3658ea
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/lib/mobility/locale_accessors.rb b/lib/mobility/locale_accessors.rb
@@ -41,28 +41,36 @@ def self.apply(attributes, option)
     # @param [String] One or more attribute names
     # @param [Array<Symbol>] Locales
     def initialize(*attribute_names, locales: I18n.available_locales)
-      warning_message = "locale passed as option to locale accessor will be ignored".freeze
-
       attribute_names.each do |name|
         locales.each do |locale|
-          normalized_locale = Mobility.normalize_locale(locale)
-          define_method "#{name}_#{normalized_locale}" do |**options|
-            return super() if options.delete(:super)
-            warn warning_message if options.delete(:locale)
-            Mobility.with_locale(locale) { send(name, options) }
-          end
-          define_method "#{name}_#{normalized_locale}?" do |**options|
-            return super() if options.delete(:super)
-            warn warning_message if options.delete(:locale)
-            Mobility.with_locale(locale) { send("#{name}?", options) }
-          end
-          define_method "#{name}_#{normalized_locale}=" do |value, **options|
-            return super(value) if options.delete(:super)
-            warn warning_message if options.delete(:locale)
-            Mobility.with_locale(locale) { send("#{name}=", value, options) }
-          end
+          define_accessor(name, locale)
         end
       end
     end
+
+    private
+
+    def define_accessor(name, locale)
+      warning_message = "locale passed as option to locale accessor will be ignored".freeze
+      normalized_locale = Mobility.normalize_locale(locale)
+
+      define_method "#{name}_#{normalized_locale}" do |**options|
+        return super() if options.delete(:super)
+        warn warning_message if options.delete(:locale)
+        Mobility.with_locale(locale) { send(name, options) }
+      end
+
+      define_method "#{name}_#{normalized_locale}?" do |**options|
+        return super() if options.delete(:super)
+        warn warning_message if options.delete(:locale)
+        Mobility.with_locale(locale) { send("#{name}?", options) }
+      end
+
+      define_method "#{name}_#{normalized_locale}=" do |value, **options|
+        return super(value) if options.delete(:super)
+        warn warning_message if options.delete(:locale)
+        Mobility.with_locale(locale) { send("#{name}=", value, options) }
+      end
+    end
   end
 end