traco 1.2.3 → 1.2.4

data/lib/traco/translates.rb

@@ -1,40 +1,61 @@
 module Traco
   module Translates
-    TRACO_INSTANCE_METHODS_MODULE_NAME = "TracoInstanceMethods"
-
     def translates(*attributes)
       options = attributes.extract_options!
-      set_up_once
-      store_as_translatable_attributes attributes.map(&:to_sym), options
+      attributes = attributes.map(&:to_sym)
+      AttributeSetup.new(self).set_up(attributes, options)
+    end
+  end
+end
+
+ActiveRecord::Base.send :extend, Traco::Translates
+
+
+module Traco
+  class AttributeSetup
+    INSTANCE_METHODS_MODULE_NAME = "TracoInstanceMethods"
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def set_up(attributes, options)
+      ensure_class_methods
+      ensure_attribute_list
+      ensure_instance_methods_module
+      add_attributes attributes, options
     end
 
     private
 
+    def ensure_class_methods
+      klass.extend Traco::ClassMethods
+    end
+
     # Only called once per class or inheritance chain (e.g. once
     # for the superclass, not at all for subclasses). The separation
     # is important if we don't want to overwrite values if running
     # multiple times in the same class or in different classes of
     # an inheritance chain.
-    def set_up_once
-      return if respond_to?(:translatable_attributes)
-
-      class_attribute :translatable_attributes
-
-      self.translatable_attributes = []
-      extend Traco::ClassMethods
+    def ensure_attribute_list
+      return if klass.respond_to?(:translatable_attributes)
+      klass.class_attribute :translatable_attributes
+      klass.translatable_attributes = []
     end
 
-    def store_as_translatable_attributes(attributes, options)
-      fallback = options.fetch(:fallback, true)
-
-      self.translatable_attributes |= attributes
-
+    def ensure_instance_methods_module
       # Instance methods are defined on an included module, so your class
       # can just redefine them and call `super`, if you need to.
       # http://thepugautomatic.com/2013/07/dsom/
-      unless const_defined?(TRACO_INSTANCE_METHODS_MODULE_NAME, _search_ancestors = false)
-        include const_set(TRACO_INSTANCE_METHODS_MODULE_NAME, Module.new)
+      unless klass.const_defined?(INSTANCE_METHODS_MODULE_NAME, _search_ancestors = false)
+        klass.send :include, klass.const_set(INSTANCE_METHODS_MODULE_NAME, Module.new)
       end
+    end
+
+    def add_attributes(attributes, options)
+      fallback = options.fetch(:fallback, true)
+
+      klass.translatable_attributes |= attributes
 
       attributes.each do |attribute|
         define_localized_reader attribute, :fallback => fallback
@@ -45,27 +66,27 @@ module Traco
     def define_localized_reader(attribute, options)
       fallback = options[:fallback]
 
-      traco_instance_methods_module.module_eval do
-        define_method(attribute) do
-          @localized_readers ||= {}
-          @localized_readers[attribute] ||= Traco::LocalizedReader.new(self, attribute, :fallback => fallback)
-          @localized_readers[attribute].value
-        end
+      custom_define_method(attribute) do
+        @localized_readers ||= {}
+        @localized_readers[attribute] ||= Traco::LocalizedReader.new(self, attribute, :fallback => fallback)
+        @localized_readers[attribute].value
       end
     end
 
     def define_localized_writer(attribute)
-      traco_instance_methods_module.module_eval do
-        define_method("#{attribute}=") do |value|
-          send("#{attribute}_#{I18n.locale}=", value)
-        end
+      custom_define_method("#{attribute}=") do |value|
+        send("#{attribute}_#{I18n.locale}=", value)
       end
     end
 
-    def traco_instance_methods_module
-      const_get(TRACO_INSTANCE_METHODS_MODULE_NAME)
+    def custom_define_method(name, &block)
+      klass.const_get(INSTANCE_METHODS_MODULE_NAME).module_eval do
+        define_method(name, &block)
+      end
+    end
+
+    def klass
+      @klass
     end
   end
 end
-
-ActiveRecord::Base.send :extend, Traco::Translates

data/lib/traco/version.rb

@@ -1,3 +1,3 @@
 module Traco
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traco
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors: