mobility 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ff52251ec982025bdc93821a706fce97ddfb5b
-  data.tar.gz: 00cc021046e222050f8baea42bdf436d93f689b3
+  metadata.gz: e672887874e0e97c1862c468003721bcabfecb34
+  data.tar.gz: afc6154a1bb62a9e3a633ea7b65a31856441ad9a
 SHA512:
-  metadata.gz: 9b65346069fb65cb2b90fa311ce72c1c50122f30319da89e5752d72c61295bca4c83aca798e256824b324b97e1c87e9e93ef3b38faed4e9f528329eab02c47e2
-  data.tar.gz: 14f9257baed55a7de39b53b37dc3f6c07e3c415ee0f088af78ca6e548c6939b97f5c495a20966a9e39263b27f6280ceaec304843f0920c542f45bfce86b7d1e0
+  metadata.gz: 5c461d32a74de20c33103be3f038443edf0768e25fca9f654d555fbeaa2b8e1fbf7587cf8b2a39264bc602cd26278929110eb3ac71d68c2f3dda8fb3c0cbfbca
+  data.tar.gz: e59f35065d9be082c7ecb33ec2af3097b9e782b3ae3822749cb4df38fbfb0766927171b8b171f18746b64ecb477ebaa97aecc815c8117096b9d6da8f74d2b42c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.1.4)
+    mobility (0.1.5)
       i18n (>= 0.6.10)
       request_store (~> 1.0)
 

data/README.md

@@ -56,7 +56,7 @@ Mobility](http://dejimata.com/2017/3/3/translating-with-mobility).
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.1.5'
+gem 'mobility', '~> 0.1.6'
 ```
 
 To translate attributes on a model, you must include (or extend) `Mobility`,
@@ -169,8 +169,8 @@ The options hash is used to generate the backend, and has several reserved keys:
   Enable [fallbacks](#fallbacks), and optionally configure them.
 - **`dirty`** (Boolean)<br>
   Whether to enable [dirty tracking](#dirty).
-- **`accessor_locales`** (Boolean or Array)<br>
-  Enable [locale accessors](#locale_accessors) and optionally configure them.
+- **`locale_accessors`** (Boolean or Array)<br>
+  Enable [locale accessors](#locale-accessors) and optionally configure them.
 
 In addition to these, each backend may have specific configuration options. For
 example, the default key-value backend, which stores attributes and their
@@ -384,6 +384,14 @@ post.title
 Alternatively, just using `locale_accessors: true` will enable all locales in
 `I18n.available_locales`.
 
+An alternative to using the `locale_accessors` option is to use the
+`fallthrough_accessors` option (defined in {Mobility::FallthroughAccessors})
+with `fallthrough_accessors: true`. This uses +method_missing+ to implicitly
+define the same methods as above, but supporting any locale without any method
+definitions. [Dirty tracking](#dirty) enables fallthrough locales for tracking
+attribute changes. (Both locale accessors and fallthrough locales can be used
+together without conflict.)
+
 For more details, see: {Mobility::Attributes} (specifically, the private method
 `define_locale_accessors`).
 
@@ -465,11 +473,11 @@ dirty tracking is not specific to AR and works for non-persisted models as well)
 ```ruby
 class Post < ActiveRecord::Base
   include Mobility
-  translates :title, locale_accessors: [:en, :ja], dirty: true
+  translates :title, dirty: true
 end
 ```
 
-Now set the attribute in both locales:
+Now set the attribute in two locales:
 
 ```ruby
 post.title
@@ -512,9 +520,9 @@ post.previous_changes
 }
 ```
 
-You will notice that Mobility uses locale accessors to indicate which locale
-has changed; dirty tracking is implemented this way to ensure that it is clear
-what has changed in which locale, avoiding any possible ambiguity.
+You will notice that Mobility uses locale accessor methods to indicate which
+locale has changed; dirty tracking is implemented this way to ensure that it is
+clear what has changed in which locale, avoiding any possible ambiguity.
 
 For more details, see: {Mobility::Backend::Dirty}.
 

data/lib/mobility/attributes.rb

@@ -119,8 +119,12 @@ with other backends.
     #   accessors or specify locales for which accessors should be defined on
     #   this model backend. Will default to +true+ if +dirty+ option is +true+.
     # @option options_ [Boolean] cache (true) Enable cache for this model backend
-    # @option options_ [Boolean, Hash] fallbacks Enable fallbacks or specify fallbacks for this model backend
-    # @option options_ [Boolean] dirty Enable dirty tracking for this model backend
+    # @option options_ [Boolean, Hash] fallbacks Enable fallbacks or specify
+    #   fallbacks for this model backend
+    # @option options_ [Boolean] dirty Enable dirty tracking for this model
+    #   backend
+    # @option options_ [Boolean] fallthrough_accessors Enable fallthrough
+    #   locale accessors for this model backend
     # @raise [ArgumentError] if method is not reader, writer or accessor
     def initialize(method, *attributes_, **options_)
       raise ArgumentError, "method must be one of: reader, writer, accessor" unless %i[reader writer accessor].include?(method)
@@ -130,16 +134,16 @@ with other backends.
       @backend_name = options.delete(:backend) || Mobility.config.default_backend
       @backend_class = Class.new(get_backend_class(backend:     @backend_name,
                                                    model_class: model_class))
-
-      options[:locale_accessors] ||= true if options[:dirty]
+      if (options[:dirty] && options[:fallthrough_accessors] != false)
+        options[:fallthrough_accessors] = true
+      end
 
       @backend_class.configure!(options) if @backend_class.respond_to?(:configure!)
 
-      @backend_class.include Backend::Cache unless options[:cache] == false
-      @backend_class.include Backend::Dirty.for(model_class) if options[:dirty]
-      @backend_class.include Backend::Fallbacks if options[:fallbacks]
+      include_backend_modules(@backend_class, options)
+
       @accessor_locales = options[:locale_accessors]
-      @accessor_locales = Mobility.config.default_accessor_locales.call if options[:locale_accessors] == true
+      @accessor_locales = Mobility.config.default_accessor_locales if @accessor_locales == true
 
       attributes.each do |attribute|
         define_backend(attribute)
@@ -162,6 +166,13 @@ with other backends.
       end
     end
 
+    def include_backend_modules(backend_class, options)
+      backend_class.include(Backend::Cache)                            unless options[:cache] == false
+      backend_class.include(Backend::Dirty.for(options[:model_class])) if options[:dirty]
+      backend_class.include(Backend::Fallbacks)                        if options[:fallbacks]
+      backend_class.include(FallthroughAccessors.new(attributes))      if options[:fallthrough_accessors]
+    end
+
     # Add this attributes module to shared {Mobility::Wrapper} and setup model
     # with backend setup block (see {Mobility::Backend::Setup#setup_model}).
     # @param model_class [Class] Class of model

data/lib/mobility/backend/active_model/dirty.rb

@@ -23,12 +23,13 @@ value of the translated attribute if passed to it.
     module ActiveModel::Dirty
       # @!group Backend Accessors
       # @!macro backend_writer
+      # @param [Hash] options
       def write(locale, value, **options)
-        locale_accessor = "#{attribute}_#{locale}"
+        locale_accessor = Mobility.normalize_locale_accessor(attribute, locale)
         if model.changed_attributes.has_key?(locale_accessor) && model.changed_attributes[locale_accessor] == value
           model.attributes_changed_by_setter.except!(locale_accessor)
         elsif read(locale, options.merge(fallbacks: false)) != value
-          model.send(:attribute_will_change!, "#{attribute}_#{locale}")
+          model.send(:attribute_will_change!, locale_accessor)
         end
         super
       end
@@ -43,14 +44,14 @@ value of the translated attribute if passed to it.
       # methods for translated attributes onto model class.
       module ClassMethods
         # (see Mobility::Backend::Setup#setup_model)
-        def setup_model(model_class, attributes, **)
+        def setup_model(model_class, attributes, **options)
           super
           model_class.class_eval do
             %w[changed? change was will_change! previously_changed? previous_change].each do |suffix|
               attributes.each do |attribute|
                 class_eval <<-EOM, __FILE__, __LINE__ + 1
                   def #{attribute}_#{suffix}
-                    attribute_#{suffix}("#{attribute}_#\{Mobility.locale\}")
+                    attribute_#{suffix}(Mobility.normalize_locale_accessor("#{attribute}"))
                   end
                 EOM
               end
@@ -59,8 +60,8 @@ value of the translated attribute if passed to it.
 
           restore_methods = Module.new do
             attributes.each do |attribute|
-              locale_accessor = "#{attribute}_#{Mobility.locale}"
               define_method "restore_#{attribute}!" do
+                locale_accessor = Mobility.normalize_locale_accessor(attribute)
                 if attribute_changed?(locale_accessor)
                   __send__("#{attribute}=", changed_attributes[locale_accessor])
                 end
@@ -77,6 +78,8 @@ value of the translated attribute if passed to it.
             private :restore_attribute!
           end
           model_class.include restore_methods
+
+          model_class.include(FallthroughAccessors.new(*attributes))
         end
       end
     end

data/lib/mobility/backend/active_record/column.rb

@@ -4,7 +4,7 @@ module Mobility
 
 Implements the {Mobility::Backend::Column} backend for ActiveRecord models.
 
-@note This backend disables the +accessor_locales+ option, which would
+@note This backend disables the +locale_accessors+ option, which would
   otherwise interfere with column methods.
 
 @example

data/lib/mobility/backend/active_record/hash_valued.rb

@@ -11,12 +11,12 @@ Internal class used by ActiveRecord backends that store values as a hash.
       # @!group Backend Accessors
       #
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translations[locale]
       end
 
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translations[locale] = value
       end
       # @!endgroup

data/lib/mobility/backend/active_record/hstore.rb

@@ -18,7 +18,7 @@ Implements the {Mobility::Backend::Hstore} backend for ActiveRecord models.
 
       # @!group Backend Accessors
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translations[locale] = value && value.to_s
       end
       # @!endgroup

data/lib/mobility/backend/active_record/key_value.rb

@@ -28,19 +28,19 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
 
       # @!macro backend_constructor
       # @option options [Symbol] association_name Name of association
-      def initialize(model, attribute, **)
+      def initialize(model, attribute, **options)
         super
         @association_name = options[:association_name]
       end
 
       # @!group Backend Accessors
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translation_for(locale).value
       end
 
       # @!macro backend_reader
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translation_for(locale).tap { |t| t.value = value }.value
       end
       # @!endgroup

data/lib/mobility/backend/active_record/query_methods.rb

@@ -9,8 +9,7 @@ models. For details see backend-specific subclasses.
 =end
       class QueryMethods < Module
         # @param [Array<String>] attributes Translated attributes
-        # @param [Hash] options Backend options
-        def initialize(attributes, **)
+        def initialize(attributes, **_)
           @attributes = attributes
           @attributes_extractor = lambda do |opts|
             opts.is_a?(Hash) && (opts.keys.map(&:to_s) & attributes).presence

data/lib/mobility/backend/active_record/serialized.rb

@@ -28,12 +28,12 @@ Implements {Mobility::Backend::Serialized} backend for ActiveRecord models.
       # @!group Backend Accessors
       #
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translations[locale]
       end
 
       # @!macro backend_reader
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translations[locale] = value
       end
       # @!endgroup

data/lib/mobility/backend/active_record/table.rb

@@ -84,19 +84,19 @@ Implements the {Mobility::Backend::Table} backend for ActiveRecord models.
 
       # @!macro backend_constructor
       # @option options [Symbol] association_name Name of association
-      def initialize(model, attribute, **)
+      def initialize(model, attribute, **options)
         super
         @association_name = options[:association_name]
       end
 
       # @!group Backend Accessors
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translation_for(locale).send(attribute)
       end
 
       # @!macro backend_reader
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translation_for(locale).tap { |t| t.send("#{attribute}=", value) }.send(attribute)
       end
       # @!endgroup
@@ -177,7 +177,7 @@ Implements the {Mobility::Backend::Table} backend for ActiveRecord models.
       private
 
       def translation_for(locale)
-        translation = translations.find { |t| t.locale == locale.to_s }
+        translation = translations.find { |t| t.locale == locale.to_s.freeze }
         translation ||= translations.build(locale: locale)
         translation
       end

data/lib/mobility/backend/cache.rb

@@ -35,7 +35,7 @@ this).
     module Cache
       # @group Backend Accessors
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         if write_to_cache? || cache.has_key?(locale)
           cache[locale]
         else
@@ -44,7 +44,7 @@ this).
       end
 
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         cache[locale] = write_to_cache? ? value : super
       end
       # @!endgroup
@@ -56,8 +56,7 @@ this).
       module Setup
         # @param model_class Model class
         # @param [Array<String>] attributes Backend attributes
-        # @param [Hash] options Backend options
-        def setup_model(model_class, attributes, **)
+        def setup_model(model_class, attributes, **_)
           super
           model_class.include BackendResetter.for(model_class).new(attributes) { clear_cache }
         end

data/lib/mobility/backend/column.rb

@@ -22,12 +22,12 @@ be ignored if set, since it would cause a conflict with column accessors.
       # @!group Backend Accessors
       #
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         model.send(column(locale))
       end
 
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         model.send("#{column(locale)}=", value)
       end
       # @!endgroup
@@ -44,7 +44,7 @@ be ignored if set, since it would cause a conflict with column accessors.
       # @param [Symbol] locale
       # @return [String]
       def self.column_name_for(attribute, locale = Mobility.locale)
-        normalized_locale = locale.to_s.downcase.sub("-", "_")
+        normalized_locale = Mobility.normalize_locale(locale)
         "#{attribute}_#{normalized_locale}".to_sym
       end
     end

data/lib/mobility/backend/sequel/column.rb

@@ -4,7 +4,7 @@ module Mobility
 
 Implements the {Mobility::Backend::Column} backend for Sequel models.
 
-@note This backend disables the +accessor_locales+ option, which would
+@note This backend disables the +locale_accessors+ option, which would
   otherwise interfere with column methods.
 =end
     class Sequel::Column

data/lib/mobility/backend/sequel/dirty.rb

@@ -12,12 +12,12 @@ Automatically includes dirty plugin in model class when enabled.
       # @!group Backend Accessors
       # @!macro backend_writer
       def write(locale, value, **options)
-        locale_accessor = "#{attribute}_#{locale}".to_sym
+        locale_accessor = Mobility.normalize_locale_accessor(attribute, locale).to_sym
         if model.column_changes.has_key?(locale_accessor) && model.initial_values[locale_accessor] == value
           super
           [model.changed_columns, model.initial_values].each { |h| h.delete(locale_accessor) }
         elsif read(locale, options.merge(fallbacks: false)) != value
-          model.will_change_column("#{attribute}_#{locale}".to_sym)
+          model.will_change_column(locale_accessor)
           super
         end
       end
@@ -32,7 +32,7 @@ Automatically includes dirty plugin in model class when enabled.
       # methods for translated attributes onto model class.
       module ClassMethods
         # (see Mobility::Backend::Setup#setup_model)
-        def setup_model(model_class, attributes, **)
+        def setup_model(model_class, attributes, **options)
           super
           model_class.plugin :dirty
           model_class.class_eval do
@@ -40,7 +40,7 @@ Automatically includes dirty plugin in model class when enabled.
               %w[initial_value column_change column_changed? reset_column].each do |method_name|
                 define_method method_name do |column|
                   if attributes.map(&:to_sym).include?(column)
-                    super("#{column}_#{Mobility.locale}".to_sym)
+                    super(Mobility.normalize_locale_accessor(column).to_sym)
                   else
                     super(column)
                   end
@@ -49,6 +49,8 @@ Automatically includes dirty plugin in model class when enabled.
             end
             include mod
           end
+
+          model_class.include(FallthroughAccessors.new(*attributes))
         end
       end
     end

data/lib/mobility/backend/sequel/hash_valued.rb

@@ -9,12 +9,12 @@ Internal class used by Sequel backends that store values as a hash.
       include Backend
 
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translations[locale.to_s]
       end
 
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translations[locale.to_s] = value
       end
 

data/lib/mobility/backend/sequel/hstore.rb

@@ -18,7 +18,7 @@ Implements the {Mobility::Backend::Hstore} backend for Sequel models.
 
       # @!group Backend Accessors
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translations[locale.to_s] = value && value.to_s
       end
       # @!endgroup

data/lib/mobility/backend/sequel/key_value.rb

@@ -31,12 +31,12 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
 
       # @!group Backend Accessors
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translation_for(locale).value
       end
 
       # @!macro backend_writer
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translation_for(locale).tap { |t| t.value = value }.value
       end
       # @!endgroup

data/lib/mobility/backend/sequel/query_methods.rb

@@ -9,8 +9,7 @@ models. For details see backend-specific subclasses.
 =end
       class QueryMethods < Module
         # @param [Array<String>] attributes Translated attributes
-        # @param [Hash] options Backend options
-        def initialize(attributes, **)
+        def initialize(attributes, **_)
           @attributes = attributes.map! &:to_sym
           @attributes_extractor = lambda do |cond|
             cond.is_a?(Hash) && (cond.keys & attributes).presence

data/lib/mobility/backend/sequel/serialized.rb

@@ -35,12 +35,12 @@ Sequel serialization plugin.
       # @!group Backend Accessors
       #
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translations[locale]
       end
 
       # @!macro backend_reader
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translations[locale] = value
       end
       # @!endgroup

data/lib/mobility/backend/sequel/table.rb

@@ -15,19 +15,19 @@ Implements the {Mobility::Backend::Table} backend for Sequel models.
 
       # @!macro backend_constructor
       # @option options [Symbol] association_name Name of association
-      def initialize(model, attribute, **)
+      def initialize(model, attribute, **options)
         super
         @association_name = options[:association_name]
       end
 
       # @!group Backend Accessors
       # @!macro backend_reader
-      def read(locale, **)
+      def read(locale, **_)
         translation_for(locale).send(attribute)
       end
 
       # @!macro backend_reader
-      def write(locale, value, **)
+      def write(locale, value, **_)
         translation_for(locale).tap { |t| t.send("#{attribute}=", value) }.send(attribute)
       end
 

data/lib/mobility/backend.rb

@@ -87,13 +87,11 @@ On top of this, a backend will normally:
 
     # @!macro [new] backend_reader
     #   @param [Symbol] locale Locale to read
-    #   @param [Hash] options
     #   @return [Object] Value of translation
     #
     # @!macro [new] backend_writer
     #   @param [Symbol] locale Locale to write
     #   @param [Object] value Value to write
-    #   @param [Hash] options
     #   @return [Object] Updated value
 
     # Extend included class with +setup+ method

data/lib/mobility/configuration.rb

@@ -17,10 +17,17 @@ Stores shared Mobility configuration referenced by all backends.
     # @return [Symbol,Class]
     attr_accessor :default_backend
 
-    # Proc returning set of default accessor locles to use (defaults to proc
-    # returning +I18n.available_locales+)
+    # Returns set of default accessor locles to use (defaults to
+    # +I18n.available_locales+)
     # @return [Array<Symbol>]
-    attr_accessor :default_accessor_locales
+    def default_accessor_locales
+      if @default_accessor_locales.is_a?(Proc)
+        @default_accessor_locales.call
+      else
+        @default_accessor_locales
+      end
+    end
+    attr_writer :default_accessor_locales
 
     def initialize
       @accessor_method = :translates

data/lib/mobility/fallthrough_accessors.rb

@@ -0,0 +1,57 @@
+# frozen-string-literal: true
+
+module Mobility
+=begin
+
+Defines +method_missing+ and +respond_to_missing?+ methods for a set of
+attributes such that a method call using a locale accessor, like:
+
+  article.title_pt_br
+
+will return the value of +article.title+ with the locale set to +pt-BR+ around
+the method call. The class is called "FallthroughAccessors" because when
+included in a model class, locale-specific methods will be available even if
+not explicitly defined with the +locale_accessors+ option.
+
+This is a less efficient (but more open-ended) implementation of locale
+accessors, for use in cases where the locales to be used are not known when the
+model class is generated.
+
+@example Using fallthrough locales on a plain old ruby class
+  class Post
+    def title
+      "title in #{Mobility.locale}"
+    end
+    include Mobility::FallthroughAccessors.new("title")
+  end
+
+  Mobility.locale = :en
+  post = Post.new
+  post.title
+  #=> "title in en"
+  post.title_fr
+  #=> "title in fr"
+
+=end
+  class FallthroughAccessors < Module
+    # @param [Array<String>] Array of attributes
+    def initialize(*attributes)
+      method_name_regex = /\A(#{attributes.join('|'.freeze)})_([a-z]{2}(_[a-z]{2})?)(=?)\z/.freeze
+
+      define_method :method_missing do |method_name, *arguments, &block|
+        if method_name =~ method_name_regex
+          attribute = $1.to_sym
+          locale, suffix = $2.split('_'.freeze)
+          locale = "#{locale}-#{suffix.upcase}".freeze if suffix
+          Mobility.with_locale(locale) { public_send("#{attribute}#{$4}".freeze, *arguments) }
+        else
+          super(method_name, *arguments, &block)
+        end
+      end
+
+      define_method :respond_to_missing? do |method_name, include_private = false|
+        (method_name =~ method_name_regex) || super(method_name, include_private)
+      end
+    end
+  end
+end

data/lib/mobility/sequel/column_changes.rb

@@ -14,7 +14,7 @@ is called.
         define_method :mobility_set do |attribute, value, locale: Mobility.locale|
           if attributes.include?(attribute)
             column = attribute.to_sym
-            column_with_locale = :"#{attribute}_#{locale}"
+            column_with_locale = :"#{attribute}_#{Mobility.normalize_locale(locale)}"
             if mobility_get(attribute) != value
               @changed_columns << column_with_locale if !changed_columns.include?(column_with_locale)
               @changed_columns << column             if !changed_columns.include?(column)

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/mobility.rb

@@ -32,13 +32,14 @@ in backends to define gem-dependent behavior.
 
 =end
 module Mobility
-  autoload :Attributes,       "mobility/attributes"
-  autoload :Backend,          "mobility/backend"
-  autoload :BackendResetter,  "mobility/backend_resetter"
-  autoload :Configuration,    "mobility/configuration"
-  autoload :InstanceMethods,  "mobility/instance_methods"
-  autoload :Translates,       "mobility/translates"
-  autoload :Wrapper,          "mobility/wrapper"
+  autoload :Attributes,           "mobility/attributes"
+  autoload :Backend,              "mobility/backend"
+  autoload :BackendResetter,      "mobility/backend_resetter"
+  autoload :Configuration,        "mobility/configuration"
+  autoload :FallthroughAccessors, "mobility/fallthrough_accessors"
+  autoload :InstanceMethods,      "mobility/instance_methods"
+  autoload :Translates,           "mobility/translates"
+  autoload :Wrapper,              "mobility/wrapper"
 
   require "mobility/orm"
 
@@ -122,7 +123,8 @@ module Mobility
 
     # Sets Mobility locale
     # @param [Symbol] locale Locale to set
-    # @raise [InvalidLocale] if locale is nil or not in +I18n.available_locales
+    # @raise [InvalidLocale] if locale is nil or not in
+    #   +I18n.available_locales+ (if +I18n.enforce_available_locales+ is +true+)
     # @return [Symbol] Locale
     def locale=(locale)
       set_locale(locale)
@@ -185,8 +187,22 @@ module Mobility
     #   #=> "ja"
     #   Mobility.normalize_locale("pt-BR")
     #   #=> "pt_br"
-    def normalize_locale(locale)
-      "#{locale.to_s.downcase.sub("-", "_")}"
+    def normalize_locale(locale = Mobility.locale)
+      "#{locale.to_s.downcase.sub("-", "_")}".freeze
+    end
+    alias_method :normalized_locale, :normalize_locale
+
+    # Return normalized locale accessor name
+    # @param [String,Symbol] attribute
+    # @param [String,Symbol] locale
+    # @return [String] Normalized locale accessor name
+    # @example
+    #   Mobility.normalize_locale_accessor(:foo, :ja)
+    #   #=> "foo_ja"
+    #   Mobility.normalize_locale_accessor(:bar, "pt-BR")
+    #   #=> "bar_pt_br"
+    def normalize_locale_accessor(attribute, locale = Mobility.locale)
+      "#{attribute}_#{normalize_locale(locale)}".freeze
     end
 
     protected
@@ -197,7 +213,9 @@ module Mobility
 
     def set_locale(locale)
       locale = locale.to_sym if locale
-      raise Mobility::InvalidLocale.new(locale) unless I18n.available_locales.include?(locale) || locale.nil?
+      if I18n.enforce_available_locales
+        raise Mobility::InvalidLocale.new(locale) unless (I18n.available_locales.include?(locale) || locale.nil?)
+      end
       storage[:mobility_locale] = locale
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -140,8 +140,6 @@ files:
 - lib/generators/mobility/install_generator.rb
 - lib/generators/mobility/templates/create_string_translations.rb
 - lib/generators/mobility/templates/create_text_translations.rb
-- lib/generators/mobility/templates/translations.rb
-- lib/generators/mobility/translations_generator.rb
 - lib/mobility.rb
 - lib/mobility/active_model.rb
 - lib/mobility/active_model/attribute_methods.rb
@@ -176,7 +174,6 @@ files:
 - lib/mobility/backend/dirty.rb
 - lib/mobility/backend/fallbacks.rb
 - lib/mobility/backend/hstore.rb
-- lib/mobility/backend/i18n.rb
 - lib/mobility/backend/jsonb.rb
 - lib/mobility/backend/key_value.rb
 - lib/mobility/backend/null.rb
@@ -203,6 +200,7 @@ files:
 - lib/mobility/configuration.rb
 - lib/mobility/core_ext/object.rb
 - lib/mobility/core_ext/string.rb
+- lib/mobility/fallthrough_accessors.rb
 - lib/mobility/instance_methods.rb
 - lib/mobility/orm.rb
 - lib/mobility/sequel.rb

data/lib/generators/mobility/templates/translations.rb

@@ -1,46 +0,0 @@
-class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
-<%- if migration_action == 'add' -%>
-  def change
-<% attributes.each do |attribute| -%>
-  <%- if attribute.reference? -%>
-    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
-  <%- elsif attribute.token? -%>
-    add_column :<%= table_name %>, :<%= attribute.name %>, :string<%= attribute.inject_options %>
-    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
-  <%- else -%>
-    add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
-    <%- if attribute.has_index? -%>
-    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
-    <%- end -%>
-  <%- end -%>
-<%- end -%>
-  end
-<%- elsif migration_action == 'join' -%>
-  def change
-    create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
-    <%- attributes.each do |attribute| -%>
-      <%- if attribute.reference? -%>
-      t.references :<%= attribute.name %><%= attribute.inject_options %>
-      <%- else -%>
-      <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
-      <%- end -%>
-    <%- end -%>
-    end
-  end
-<%- else -%>
-  def change
-<% attributes.each do |attribute| -%>
-<%- if migration_action -%>
-  <%- if attribute.reference? -%>
-    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
-  <%- else -%>
-    <%- if attribute.has_index? -%>
-    remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
-    <%- end -%>
-    remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
-  <%- end -%>
-<%- end -%>
-<%- end -%>
-  end
-<%- end -%>
-end

data/lib/generators/mobility/translations_generator.rb

@@ -1,20 +0,0 @@
-require "rails/generators"
-require "rails/generators/active_record/migration/migration_generator"
-
-module Mobility
-  class TranslationsGenerator < ::Rails::Generators::NamedBase
-    include Rails::Generators::Migration
-
-    argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
-    source_root File.expand_path("../templates", __FILE__)
-    class_option(
-      :backend,
-      type: :string,
-      desc: "Backend to use for translations (defaults to Mobility.default_backend)"
-    )
-
-    def self.next_migration_number(dirname)
-      ::ActiveRecord::Generators::Base.next_migration_number(dirname)
-    end
-  end
-end

data/lib/mobility/backend/i18n.rb

@@ -1,28 +0,0 @@
-# module Mobility
-#   module Backend
-#     class I18n
-#       include Backend
-
-#       attr_reader :i18n_key
-#       attr_reader :mapping
-
-#       def initialize(model, attribute, **)
-#         super
-#         @key_map = options[:key_map]
-#       end
-
-#       def read(locale, **)
-#         I18n.t(i18n_key)
-#       end
-
-#       def self.configure!(options)
-#         raise ArgumentError, "missing key_map" unless options[:key_map].present?
-#       end
-
-#       private
-
-#       def i18n_key
-#         key_map.call(model, attribute))
-#       end
-#     end
-#   end