mobility 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e672887874e0e97c1862c468003721bcabfecb34
-  data.tar.gz: afc6154a1bb62a9e3a633ea7b65a31856441ad9a
+  metadata.gz: 2c83db6c82d88d2972c328ea414426416b57aee7
+  data.tar.gz: b058744cc114446d2d641046b3d14cbc843eef8f
 SHA512:
-  metadata.gz: 5c461d32a74de20c33103be3f038443edf0768e25fca9f654d555fbeaa2b8e1fbf7587cf8b2a39264bc602cd26278929110eb3ac71d68c2f3dda8fb3c0cbfbca
-  data.tar.gz: e59f35065d9be082c7ecb33ec2af3097b9e782b3ae3822749cb4df38fbfb0766927171b8b171f18746b64ecb477ebaa97aecc815c8117096b9d6da8f74d2b42c
+  metadata.gz: 5d44c71b7381046f0fc63ea7cb7aed5506aa2860324dced1a6d58c07d3b1aa9fe9c10d337d17d42e4807a722a78faca46b2e386611b4e2a984176daaf90efdd3
+  data.tar.gz: 3e29ad8f1a11cb343291dbe0fa63633433e2463a40e70b85834898f808064b85fb129fba59db7588471743e4ee90c2bf276a8f50f90b8c9993cc2b1870d39107

data/CHANGELOG.md

@@ -2,30 +2,47 @@
 
 ## 0.1
 
+### 0.1.7
+* Allow passing fallback locale or locales to getter method
+  ([#9](https://github.com/shioyama/mobility/pull/9))
+* Add missing indices on key-value string/text translation tables
+  ([1e00e0](https://github.com/shioyama/mobility/commit/1e00e0d957478f2408fbac1ee853f829489263e2),
+  [574172](https://github.com/shioyama/mobility/commit/574172dc88823a35c60ff963ff9c40b7c05771d7))
+
+### 0.1.6
+* Return accessor locales instead of Proc from default_accessor_locales
+  ([825f75](https://github.com/shioyama/mobility/commit/825f75de6107287a5de70db439d8aec5e4a47977))
+* Fix support for locales in dirty modules
+  ([0b40d6](https://github.com/shioyama/mobility/commit/0b40d66ea0c816d4fb57deceff9344f5128a593f))
+* Add FallthroughAccessors for use in dirty modules
+  ([#4](https://github.com/shioyama/mobility/pull/4))
+* Only raise InvalidLocale exception if I18n.enforce_available_locales is true
+  ([979c36](https://github.com/shioyama/mobility/commit/979c365794d3df90a2d23ad50519ff354686a493))
+
 ### 0.1.5
-* Add `accessor_method` to default initializer ([d4a9da98cae71de2fb9ee3d29c64decef5a16010](https://github.com/shioyama/mobility/commit/d4a9da98cae71de2fb9ee3d29c64decef5a16010))
-* Include AR version in generated migrations ([ac3dfbbc053089b01dcc73d0b617fefaeaaa85cb](https://github.com/shioyama/mobility/commit/ac3dfbbc053089b01dcc73d0b617fefaeaaa85cb))
-* Add `untranslated_attributes` method ([50e97f12ea219321ef9f61792e909299f570ba23](https://github.com/shioyama/mobility/commit/50e97f12ea219321ef9f61792e909299f570ba23))
-* Do not require `active_support/core_ext/nil` ([39e24596482f03302542e524ca6f17275a778644](https://github.com/shioyama/mobility/commit/39e24596482f03302542e524ca6f17275a778644))
-* Handle false values correctly when getting and setting ([bdf6f199aaa8318a73c5aa6332aee8d7aad254f6](https://github.com/shioyama/mobility/commit/bdf6f199aaa8318a73c5aa6332aee8d7aad254f6))
-* Use proc to define accessor locales from `I18n.available_locales` ([3cd786814d8044ae5d64f939c3a7b5c49b322bc6](https://github.com/shioyama/mobility/commit/3cd786814d8044ae5d64f939c3a7b5c49b322bc6))
+* Add `accessor_method` to default initializer ([d4a9da](https://github.com/shioyama/mobility/commit/d4a9da98cae71de2fb9ee3d29c64decef5a16010))
+* Include AR version in generated migrations ([ac3dfb](https://github.com/shioyama/mobility/commit/ac3dfbbc053089b01dcc73d0b617fefaeaaa85cb))
+* Add `untranslated_attributes` method ([50e97f](https://github.com/shioyama/mobility/commit/50e97f12ea219321ef9f61792e909299f570ba23))
+* Do not require `active_support/core_ext/nil` ([39e245](https://github.com/shioyama/mobility/commit/39e24596482f03302542e524ca6f17275a778644))
+* Handle false values correctly when getting and setting ([bdf6f1](https://github.com/shioyama/mobility/commit/bdf6f199aaa8318a73c5aa6332aee8d7aad254f6))
+* Use proc to define accessor locales from `I18n.available_locales` ([3cd786](https://github.com/shioyama/mobility/commit/3cd786814d8044ae5d64f939c3a7b5c49b322bc6))
 * Do not mark attribute as changed if value is the same (fixed in [#2](https://github.com/shioyama/mobility/pull/2))
 * Pass on any args to original reload method when overriding (fixed in [#3](https://github.com/shioyama/mobility/pull/3))
 
 ### 0.1.4
-* Fix configuration reload issue ([#1](https://github.com/shioyama/mobility/issues/1), fixed in [478b669dae90edf9feb7c011ae93e8157dc4e2b4](https://github.com/shioyama/mobility/commit/478b669dae90edf9feb7c011ae93e8157dc4e2b4))
-* Code refactoring/cleanup ([e4dcc791c246e377352b9ac154d2b1c4aec8e98e](https://github.com/shioyama/mobility/commit/e4dcc791c246e377352b9ac154d2b1c4aec8e98e), [64f434ea7a46c9353c3638c58a3258f0fcb81821](https://github.com/shioyama/mobility/commit/64f434ea7a46c9353c3638c58a3258f0fcb81821), [8df2bbdead883725d2c87020f836b644b4d28e5c](https://github.com/shioyama/mobility/commit/8df2bbdead883725d2c87020f836b644b4d28e5c), [326a0977c98348dad85a927c20dd69fe5acb2a9e](https://github.com/shioyama/mobility/commit/326a0977c98348dad85a927c20dd69fe5acb2a9e))
-* Allow using Sequel `plugin` to include Mobility in model ([b0db7cc28a47e13c6888ef263260e8dff281543d](https://github.com/shioyama/mobility/commit/b0db7cc28a47e13c6888ef263260e8dff281543d))
+* Fix configuration reload issue ([#1](https://github.com/shioyama/mobility/issues/1), fixed in [478b66](https://github.com/shioyama/mobility/commit/478b669dae90edf9feb7c011ae93e8157dc4e2b4))
+* Code refactoring/cleanup ([e4dcc7](https://github.com/shioyama/mobility/commit/e4dcc791c246e377352b9ac154d2b1c4aec8e98e), [64f434](https://github.com/shioyama/mobility/commit/64f434ea7a46c9353c3638c58a3258f0fcb81821), [8df2bb](https://github.com/shioyama/mobility/commit/8df2bbdead883725d2c87020f836b644b4d28e5c), [326a09](https://github.com/shioyama/mobility/commit/326a0977c98348dad85a927c20dd69fe5acb2a9e))
+* Allow using Sequel `plugin` to include Mobility in model ([b0db7c](https://github.com/shioyama/mobility/commit/b0db7cc28a47e13c6888ef263260e8dff281543d))
 
 ### 0.1.3
 
 * Add homepage to gemspec
 * Pass backend class as context to `translates`
-  ([adf93e3c6bb314b73fbd43b221819310a1407c4d](https://github.com/shioyama/mobility/commit/adf93e3c6bb314b73fbd43b221819310a1407c4d))
+  ([adf93e](https://github.com/shioyama/mobility/commit/adf93e3c6bb314b73fbd43b221819310a1407c4d))
 
 ### 0.1.2
 
 * Fix issues with querying in ActiveRecord jsonb and hstore backends
-  ([527908d9317daee6bf91e3e1a188fb64365f7bab](https://github.com/shioyama/mobility/commit/527908d9317daee6bf91e3e1a188fb64365f7bab)
+  ([527908](https://github.com/shioyama/mobility/commit/527908d9317daee6bf91e3e1a188fb64365f7bab)
   and
-  [5e6addd6f01cf255f5e71666324502ace96d3eac](https://github.com/shioyama/mobility/commit/5e6addd6f01cf255f5e71666324502ace96d3eac))
+  [5e6add](https://github.com/shioyama/mobility/commit/5e6addd6f01cf255f5e71666324502ace96d3eac))

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    mobility (0.1.5)
+    mobility (0.1.6)
       i18n (>= 0.6.10)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activemodel (5.0.1)
-      activesupport (= 5.0.1)
-    activerecord (5.0.1)
-      activemodel (= 5.0.1)
-      activesupport (= 5.0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -36,7 +36,7 @@ GEM
     builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.4)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.5.3)
     diff-lcs (1.3)
     erubis (2.7.0)
@@ -92,9 +92,9 @@ GEM
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.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.6'
+gem 'mobility', '~> 0.1.7'
 ```
 
 To translate attributes on a model, you must include (or extend) `Mobility`,
@@ -386,7 +386,7 @@ Alternatively, just using `locale_accessors: true` will enable all locales in
 
 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
+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
@@ -427,6 +427,9 @@ class Post < ActiveRecord::Base
 end
 ```
 
+Internally, Mobility assigns the fallbacks hash to an instance of
+`I18n::Locale::Fallbacks.new`.
+
 By setting fallbacks for English and French to Japanese, values will fall
 through to the Japanese value if none is present for either of these locales:
 
@@ -445,17 +448,29 @@ post.title_fr
 
 You can optionally disable fallbacks to get the real value for a given locale
 (for example, to check if a value in a particular locale is set or not) by
-passing `fallbacks: false` to the getter method:
+passing `fallback: false` (note that the key is the *singular*, not plural) to
+the getter method:
 
 ```ruby
-post.title(fallbacks: false)
+post.title(fallback: false)
 #=> nil
-post.title_fr(fallbacks: false)
+post.title(locale: :fr, fallback: false)
 #=> nil
 ```
 
-(Mobility assigns the fallbacks hash to an instance of
-`I18n::Locale::Fallbacks.new`.)
+You can also set the fallback locales for a single read by passing one or more
+locales, like this:
+
+```ruby
+post.title_fr = "mobilité: aptitude à bouger, à se déplacer, à changer, à évoluer"
+post.save
+post.title
+#=> nil
+post.title(fallback: :fr)
+#=> "mobilité: aptitude à bouger, à se déplacer, à changer, à évoluer"
+post.title(fallback: [:ja, :fr])
+#=> "Mobility(名詞):動きやすさ、可動性"
+```
 
 For more details, see: {Mobility::Backend::Fallbacks}.
 

data/lib/generators/{mobility → rails/mobility}/templates/create_string_translations.rb

@@ -10,6 +10,7 @@ class CreateStringTranslations < ActiveRecord::Migration[<%= ActiveRecord::Migra
       t.timestamps
     end
     add_index :mobility_string_translations, [:translatable_id, :translatable_type, :locale, :key], unique: true, name: :index_mobility_string_translations_on_keys
-    add_index :mobility_string_translations, [:translatable_id, :translatable_type], name: :index_mobility_string_translations_on_translatable
+    add_index :mobility_string_translations, [:translatable_id, :translatable_type, :key], name: :index_mobility_string_translations_on_translatable_attribute
+    add_index :mobility_string_translations, [:translatable_type, :key, :value, :locale], name: :index_mobility_string_translations_on_query_keys
   end
 end

data/lib/generators/{mobility → rails/mobility}/templates/create_text_translations.rb

@@ -10,6 +10,6 @@ class CreateTextTranslations < ActiveRecord::Migration[<%= ActiveRecord::Migrati
       t.timestamps
     end
     add_index :mobility_text_translations, [:translatable_id, :translatable_type, :locale, :key], unique: true, name: :index_mobility_text_translations_on_keys
-    add_index :mobility_text_translations, [:translatable_id, :translatable_type], name: :index_mobility_text_translations_on_translatable
+    add_index :mobility_text_translations, [:translatable_id, :translatable_type, :key], name: :index_mobility_text_translations_on_translatable_attribute
   end
 end

data/lib/mobility.rb

@@ -58,10 +58,9 @@ module Mobility
 
   begin
     require "rails"
-    autoload :InstallGenerator, "generators/mobility/install_generator"
     Loaded::Rails = true
+    require "mobility/rails"
   rescue LoadError
-    class InstallGenerator; end
     Loaded::Rails = false
   end
 

data/lib/mobility/backend.rb

@@ -76,12 +76,11 @@ On top of this, a backend will normally:
     # @!macro [new] backend_constructor
     #   @param model Model on which backend is defined
     #   @param [String] attribute Backend attribute
-    #   @option options [Hash] fallbacks Fallbacks hash
-    def initialize(model, attribute, **options)
+    #   @param [Hash] fallbacks Fallbacks hash
+    def initialize(model, attribute, fallbacks: nil, **options)
       @model = model
       @attribute = attribute
       @options = options
-      fallbacks = options[:fallbacks]
       @fallbacks = I18n::Locale::Fallbacks.new(fallbacks) if fallbacks.is_a?(Hash)
     end
 

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

@@ -28,7 +28,7 @@ value of the translated attribute if passed to it.
         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
+        elsif read(locale, options.merge(fallback: false)) != value
           model.send(:attribute_will_change!, locale_accessor)
         end
         super

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

@@ -21,7 +21,7 @@ Implements the {Mobility::Backend::Column} backend for ActiveRecord models.
 =end
     class ActiveRecord::Column
       include Backend
-      include Mobility::Backend::Column
+      include Backend::Column
 
       autoload :QueryMethods, 'mobility/backend/active_record/column/query_methods'
 

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

@@ -20,6 +20,7 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
 =end
     class ActiveRecord::KeyValue
       include Backend
+      include Backend::KeyValue
 
       autoload :QueryMethods, 'mobility/backend/active_record/key_value/query_methods'
 
@@ -51,13 +52,9 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
       # @option options [String,Class] class_name ({Mobility::ActiveRecord::TextTranslation}) Translation class
       # @raise [ArgumentError] if type is not either :text or :string
       def self.configure!(options)
-        options[:type]             ||= :text
-        case type = options[:type].to_sym
-        when :text, :string
-          options[:class_name]     ||= Mobility::ActiveRecord.const_get("#{type.capitalize}Translation")
-        else
-          raise ArgumentError, "type must be one of: [text, string]"
-        end
+        super
+        type = options[:type]
+        options[:class_name] ||= Mobility::ActiveRecord.const_get("#{type.capitalize}Translation")
         options[:class_name] = options[:class_name].constantize if options[:class_name].is_a?(String)
         options[:association_name] ||= options[:class_name].table_name.to_sym
         %i[type association_name].each { |key| options[key] = options[key].to_sym }

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

@@ -1,37 +1,12 @@
 module Mobility
   module Backend
     class ActiveRecord::KeyValue::QueryMethods < ActiveRecord::QueryMethods
-      def initialize(attributes, **options)
+      def initialize(attributes, association_name: nil, class_name: nil, **_)
         super
-        association_name, translations_class = options[:association_name], options[:class_name]
-        @association_name    = association_name
-        attributes_extractor = @attributes_extractor
-
-        define_method :"join_#{association_name}" do |*attributes, **options|
-          attributes.inject(self) do |relation, attribute|
-            t = translations_class.arel_table.alias(:"#{attribute}_#{association_name}")
-            m = arel_table
-            join_type = options[:outer_join] ? Arel::Nodes::OuterJoin : Arel::Nodes::InnerJoin
-            relation.joins(m.join(t, join_type).
-                           on(t[:key].eq(attribute).
-                              and(t[:locale].eq(Mobility.locale).
-                                  and(t[:translatable_type].eq(name).
-                                      and(t[:translatable_id].eq(m[:id]))))).join_sources)
-          end
-        end
+        @association_name = association_name
 
-        define_method :where! do |opts, *rest|
-          if i18n_keys = attributes_extractor.call(opts)
-            opts = opts.with_indifferent_access
-            i18n_nulls = i18n_keys.select { |key| opts[key].nil? }
-            i18n_keys.each { |attr| opts["#{attr}_#{association_name}"] = { value: opts.delete(attr) }}
-            super(opts, *rest).
-              send("join_#{association_name}", *(i18n_keys - i18n_nulls)).
-              send("join_#{association_name}", *i18n_nulls, outer_join: true)
-          else
-            super(opts, *rest)
-          end
-        end
+        define_join_method(association_name, class_name)
+        define_query_methods(association_name)
 
         attributes.each do |attribute|
           define_method :"find_by_#{attribute}" do |value|
@@ -58,6 +33,40 @@ module Mobility
         end
         relation.model.mobility_where_chain.prepend(mod)
       end
+
+      private
+
+      def define_join_method(association_name, translation_class)
+        define_method :"join_#{association_name}" do |*attributes, **options|
+          attributes.inject(self) do |relation, attribute|
+            t = translation_class.arel_table.alias(:"#{attribute}_#{association_name}")
+            m = arel_table
+            join_type = options[:outer_join] ? Arel::Nodes::OuterJoin : Arel::Nodes::InnerJoin
+            relation.joins(m.join(t, join_type).
+                           on(t[:key].eq(attribute).
+                              and(t[:locale].eq(Mobility.locale).
+                                  and(t[:translatable_type].eq(name).
+                                      and(t[:translatable_id].eq(m[:id]))))).join_sources)
+          end
+        end
+      end
+
+      def define_query_methods(association_name)
+        attributes_extractor = @attributes_extractor
+
+        define_method :where! do |opts, *rest|
+          if i18n_keys = attributes_extractor.call(opts)
+            opts = opts.with_indifferent_access
+            i18n_nulls = i18n_keys.select { |key| opts[key].nil? }
+            i18n_keys.each { |attr| opts["#{attr}_#{association_name}"] = { value: opts.delete(attr) }}
+            super(opts, *rest).
+              send("join_#{association_name}", *(i18n_keys - i18n_nulls)).
+              send("join_#{association_name}", *i18n_nulls, outer_join: true)
+          else
+            super(opts, *rest)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,16 +1,45 @@
 module Mobility
   module Backend
     class ActiveRecord::Table::QueryMethods < ActiveRecord::QueryMethods
-      def initialize(attributes, **options)
+      def initialize(attributes, association_name: nil, model_class: nil, subclass_name: nil, **options)
         super
-        association_name     = options[:association_name]
-        foreign_key          = options[:foreign_key]
-        @association_name    = association_name
+
+        @association_name  = association_name
+        @translation_class = translation_class = model_class.const_get(subclass_name)
+
+        define_join_method(association_name, translation_class, **options)
+        define_query_methods(association_name, translation_class, **options)
+
+        attributes.each do |attribute|
+          define_method :"find_by_#{attribute}" do |value|
+            find_by(attribute.to_sym => value)
+          end
+        end
+      end
+
+      def extended(relation)
+        super
+        association_name     = @association_name
         attributes_extractor = @attributes_extractor
-        translation_class    = options[:model_class].const_get(options[:subclass_name])
-        @translation_class   = translation_class
-        table_name           = options[:table_name]
+        translation_class    = @translation_class
+
+        mod = Module.new do
+          define_method :not do |opts, *rest|
+            if i18n_keys = attributes_extractor.call(opts)
+              opts = opts.with_indifferent_access
+              i18n_keys.each { |attr| opts["#{translation_class.table_name}.#{attr}"] = opts.delete(attr) }
+              super(opts, *rest).send("join_#{association_name}")
+            else
+              super(opts, *rest)
+            end
+          end
+        end
+        relation.model.mobility_where_chain.prepend(mod)
+      end
+
+      private
 
+      def define_join_method(association_name, translation_class, foreign_key: nil, table_name: nil, **_)
         define_method :"join_#{association_name}" do |**options|
           return self if (@__mobility_table_joined || []).include?(table_name)
           (@__mobility_table_joined ||= []) << table_name
@@ -21,6 +50,10 @@ module Mobility
                 on(t[foreign_key].eq(m[:id]).
                    and(t[:locale].eq(Mobility.locale))).join_sources)
         end
+      end
+
+      def define_query_methods(association_name, translation_class, **_)
+        attributes_extractor = @attributes_extractor
 
         # Note that Mobility will try to use inner/outer joins appropriate to the query,
         # so for example:
@@ -59,32 +92,6 @@ module Mobility
             super(opts, *rest)
           end
         end
-
-        attributes.each do |attribute|
-          define_method :"find_by_#{attribute}" do |value|
-            find_by(attribute.to_sym => value)
-          end
-        end
-      end
-
-      def extended(relation)
-        super
-        association_name     = @association_name
-        attributes_extractor = @attributes_extractor
-        translation_class    = @translation_class
-
-        mod = Module.new do
-          define_method :not do |opts, *rest|
-            if i18n_keys = attributes_extractor.call(opts)
-              opts = opts.with_indifferent_access
-              i18n_keys.each { |attr| opts["#{translation_class.table_name}.#{attr}"] = opts.delete(attr) }
-              super(opts, *rest).send("join_#{association_name}")
-            else
-              super(opts, *rest)
-            end
-          end
-        end
-        relation.model.mobility_where_chain.prepend(mod)
       end
     end
   end

data/lib/mobility/backend/fallbacks.rb

@@ -13,9 +13,14 @@ defaults to an instance of +I18n::Locale::Fallbacks+, but can be configured
 If a hash is passed to the +fallbacks+ option, a new fallbacks instance will be
 created for the model with the hash defining additional fallbacks. 
 
-In addition, fallbacks can be disabled when reading by passing `fallbacks:
-false` to the reader method. This can be useful to determine the actual value
-of the translated attribute, including a possible +nil+ value.
+In addition, fallbacks can be disabled when reading by passing <tt>fallback:
+false</tt> to the reader method. This can be useful to determine the actual
+value of the translated attribute, including a possible +nil+ value. You can
+also pass a locale or array of locales to the +fallback+ option to use that
+locale or locales that read, e.g. <tt>fallback: :fr</tt> would fetch the French
+translation if the value in the current locale was +nil+, whereas <tt>fallback:
+[:fr, :es]</tt> would try French, then Spanish if the value in the current
+locale was +nil+.
 
 @see https://github.com/svenfuchs/i18n/wiki/Fallbacks I18n Fallbacks
 
@@ -52,28 +57,37 @@ of the translated attribute, including a possible +nil+ value.
   post.title
   #=> "bar"
 
-@example Disabling fallbacks when reading value
+@example Passing fallback option when reading value
   class Post
     translates :title, fallbacks: true
   end
 
   I18n.default_locale = :en
   Mobility.locale = :en
-  post = Post.new(title: "foo")
+  post = Post.new(title: "Mobility")
+  Mobility.with_locale(:fr) { post.title = "Mobilité" }
 
   Mobility.locale = :ja
   post.title
-  #=> "foo"
-  post.title(fallbacks: false)
+  #=> "Mobility"
+  post.title(fallback: false)
   #=> nil
+  post.title(fallback: :fr)
+  #=> "Mobilité"
 =end
     module Fallbacks
       # @!group Backend Accessors
       # @!macro backend_reader
-      # @option options [Boolean] fallbacks +false+ to disable fallbacks on lookup
-      def read(locale, **options)
-        return super if options[:fallbacks] == false
-        fallbacks[locale].detect do |locale|
+      # @param [Boolean,Symbol,Array] fallback
+      #   +false+ to disable fallbacks on lookup, or a locale or array of
+      #   locales to set fallback(s) for this lookup.
+      def read(locale, fallback: nil, **_)
+        if !options[:fallbacks].nil?
+          warn "You passed an option with key 'fallbacks', which will be
+            ignored. Did you mean 'fallback'?"
+        end
+        return super if fallback == false
+        (fallback ? [locale, *fallback] : fallbacks[locale]).detect do |locale|
           value = super(locale)
           break value if value.present?
         end

data/lib/mobility/backend/key_value.rb

@@ -41,6 +41,20 @@ class.
     module KeyValue
       include OrmDelegator
 
+      def self.included(backend)
+        backend.extend ClassMethods
+      end
+
+      module ClassMethods
+        # @!group Backend Configuration
+        # @option options [Symbol,String] type (:text) Column type to use
+        # @raise [ArgumentError] if type is not either :text or :string
+        def configure!(options)
+          options[:type] = (options[:type] || :text).to_sym
+          raise ArgumentError, "type must be one of: [text, string]" unless [:text, :string].include?(options[:type])
+        end
+      end
+
       # Simple cache to memoize translations as a hash so they can be fetched
       # quickly.
       class TranslationsCache

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

@@ -9,7 +9,7 @@ Implements the {Mobility::Backend::Column} backend for Sequel models.
 =end
     class Sequel::Column
       include Backend
-      include Mobility::Backend::Column
+      include Backend::Column
 
       autoload :QueryMethods, 'mobility/backend/sequel/column/query_methods'
 

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

@@ -11,12 +11,13 @@ Automatically includes dirty plugin in model class when enabled.
     module Sequel::Dirty
       # @!group Backend Accessors
       # @!macro backend_writer
+      # @param [Hash] options
       def write(locale, value, **options)
         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
+        elsif read(locale, options.merge(fallback: false)) != value
           model.will_change_column(locale_accessor)
           super
         end

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

@@ -11,6 +11,7 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
 =end
     class Sequel::KeyValue
       include Backend
+      include Backend::KeyValue
 
       autoload :QueryMethods, 'mobility/backend/sequel/key_value/query_methods'
 
@@ -42,20 +43,16 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
       # @!endgroup
 
       # @!group Backend Configuration
-      # @option options [Symbol] type (:text) Column type to use
+      # @option options [Symbol,String] type (:text) Column type to use
       # @option options [Symbol] associaiton_name (:mobility_text_translations) Name of association method
       # @option options [Symbol] class_name ({Mobility::Sequel::TextTranslation}) Translation class
       # @raise [CacheRequired] if cache is disabled
       # @raise [ArgumentError] if type is not either :text or :string
       def self.configure!(options)
+        super
         raise CacheRequired, "Cache required for Sequel::KeyValue backend" if options[:cache] == false
-        options[:type]             ||= :text
-        case type = options[:type].to_sym
-        when :text, :string
-          options[:class_name]     ||= Mobility::Sequel.const_get("#{type.capitalize}Translation")
-        else
-          raise ArgumentError, "type must be one of: [text, string]"
-        end
+        type = options[:type]
+options[:class_name] ||= Mobility::Sequel.const_get("#{type.capitalize}Translation")
         options[:class_name] = options[:class_name].constantize if options[:class_name].is_a?(String)
         options[:association_name] ||= options[:class_name].table_name.to_sym
         %i[type association_name].each { |key| options[key] = options[key].to_sym }

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

@@ -1,16 +1,27 @@
 module Mobility
   module Backend
     class Sequel::KeyValue::QueryMethods < Sequel::QueryMethods
-      def initialize(attributes, **options)
+      def initialize(attributes, association_name: nil, class_name: nil, **_)
         super
-        attributes_extractor = @attributes_extractor
-        association_name, translations_class = options[:association_name], options[:class_name]
 
+        define_join_method(association_name, class_name)
+        define_query_methods(association_name)
+
+        attributes.each do |attribute|
+          define_method :"first_by_#{attribute}" do |value|
+            where(attribute => value).select_all(model.table_name).first
+          end
+        end
+      end
+
+      private
+
+      def define_join_method(association_name, translation_class)
         define_method :"join_#{association_name}" do |*attributes, **options|
           attributes.inject(self) do |relation, attribute|
             join_type = options[:outer_join] ? :left_outer : :inner
             relation.join_table(join_type,
-                                translations_class.table_name,
+                                translation_class.table_name,
                                 {
                                   key: attribute.to_s,
                                   locale: Mobility.locale.to_s,
@@ -20,9 +31,14 @@ module Mobility
                                 table_alias: "#{attribute}_#{association_name}")
           end
         end
+      end
 
+      def define_query_methods(association_name)
         # TODO: find a better way to do this that doesn't involve overriding
         # a private method...
+        #
+        attributes_extractor = @attributes_extractor
+
         define_method :_filter_or_exclude do |invert, clause, *cond, &block|
           if i18n_keys = attributes_extractor.call(cond.first)
             cond = cond.first.dup
@@ -37,11 +53,6 @@ module Mobility
         end
         private :_filter_or_exclude
 
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(attribute => value).select_all(model.table_name).first
-          end
-        end
       end
     end
   end

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

@@ -60,8 +60,8 @@ Sequel serialization plugin.
         plugin :serialization
         plugin :serialization_modification_detection
 
-        attributes.each do |_attribute|
-          attribute = _attribute.to_sym
+        attributes.each do |attribute_|
+          attribute = attribute_.to_sym
           self.serialization_map[attribute] = Serialized.serializer_for(format)
           self.deserialization_map[attribute] = Serialized.deserializer_for(format)
         end
@@ -87,13 +87,13 @@ Sequel serialization plugin.
       # Returns deserialized column value
       # @return [Hash]
       def translations
-        _attribute = attribute.to_sym
-        if model.deserialized_values.has_key?(_attribute)
-          model.deserialized_values[_attribute]
+        attribute_ = attribute.to_sym
+        if model.deserialized_values.has_key?(attribute_)
+          model.deserialized_values[attribute_]
         elsif model.frozen?
-          deserialize_value(_attribute, serialized_value)
+          deserialize_value(attribute_, serialized_value)
         else
-          model.deserialized_values[_attribute] = deserialize_value(_attribute, serialized_value)
+          model.deserialized_values[attribute_] = deserialize_value(attribute_, serialized_value)
         end
       end
 

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

@@ -1,16 +1,21 @@
 module Mobility
   module Backend
     class Sequel::Table::QueryMethods < Sequel::QueryMethods
-      def initialize(attributes, **options)
+      def initialize(attributes, association_name: nil, model_class: nil, subclass_name: nil, **options)
         super
-        association_name     = options[:association_name]
-        @association_name    = association_name
-        foreign_key          = options[:foreign_key]
-        attributes_extractor = @attributes_extractor
-        translation_class    = options[:model_class].const_get(options[:subclass_name])
-        @translation_class   = translation_class
-        table_name           = options[:table_name]
+        translation_class = model_class.const_get(subclass_name)
+
+        define_join_method(association_name, translation_class, **options)
+        define_query_methods(association_name, translation_class, **options)
+
+        attributes.each do |attribute|
+          define_method :"first_by_#{attribute}" do |value|
+            where(attribute => value).select_all(model.table_name).first
+          end
+        end
+      end
 
+      def define_join_method(association_name, translation_class, table_name: nil, foreign_key: nil, **_)
         define_method :"join_#{association_name}" do |**options|
           return self if (@__mobility_table_joined || []).include?(table_name)
           (@__mobility_table_joined ||= []) << table_name
@@ -22,6 +27,10 @@ module Mobility
                        foreign_key => ::Sequel[model.table_name][:id]
                      })
         end
+      end
+
+      def define_query_methods(association_name, translation_class, **_)
+        attributes_extractor = @attributes_extractor
 
         # See note in AR Table QueryMethods class about limitations of
         # query methods on translated attributes when searching on nil values.
@@ -36,12 +45,6 @@ module Mobility
             super(invert, clause, *cond, &block)
           end
         end
-
-        attributes.each do |attribute|
-          define_method :"first_by_#{attribute}" do |value|
-            where(attribute => value).select_all(model.table_name).first
-          end
-        end
       end
     end
   end

data/lib/mobility/rails.rb

@@ -0,0 +1,2 @@
+require "rails/generators"
+require_relative "../generators/rails/mobility/install_generator"

data/lib/mobility/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -137,9 +137,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/generators/mobility/install_generator.rb
-- lib/generators/mobility/templates/create_string_translations.rb
-- lib/generators/mobility/templates/create_text_translations.rb
+- lib/generators/rails/mobility/install_generator.rb
+- lib/generators/rails/mobility/templates/create_string_translations.rb
+- lib/generators/rails/mobility/templates/create_text_translations.rb
 - lib/mobility.rb
 - lib/mobility/active_model.rb
 - lib/mobility/active_model/attribute_methods.rb
@@ -203,6 +203,7 @@ files:
 - lib/mobility/fallthrough_accessors.rb
 - lib/mobility/instance_methods.rb
 - lib/mobility/orm.rb
+- lib/mobility/rails.rb
 - lib/mobility/sequel.rb
 - lib/mobility/sequel/backend_resetter.rb
 - lib/mobility/sequel/column_changes.rb