mobility 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d5bbeab96e1792e6240d3f1854e302c5845689b
-  data.tar.gz: 0a821c40d9b1c3e6202a92e6194307fb0698c12c
+  metadata.gz: 461e43683e242cc5055cd76569443b0d5df9e966
+  data.tar.gz: 4f3035a319e5d910d466513a9d90e36a3584edc6
 SHA512:
-  metadata.gz: 8cc59378dff919de4592e35b1a73e11ab808616ed1b6a9cdc84737e447a97a50d2503d348a41d3c8645f129a0f65554705a5696041c89950e5e7dd3b98b4f357
-  data.tar.gz: ed3e03d952e333bd04e4d366b0a9e6d523981e8270c1e5d7d36213e15806383ca3c6c0cd245e72b304420e725bcfbe400f4e3a28b32d64394a7ba29bf4f3004b
+  metadata.gz: c5a346cb7c05ac59ecc1cfb834e47e3471c66734a7a0e1655bd4064f51811a07ff789199154102b7123569aff8b6228562127b4b8bf599792d6b88215ded2b7a
+  data.tar.gz: 73e5e46907ae6315682f14dc0344180a72a95192808167339928ae10b99d6d4e5f4f1bd7c2b05fbc3922ddd9181ac53fd5fe19de76336ae4270df4b0cdcb8a34

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## 0.1
 
+### 0.1.13 (April 19, 2017)
+* Allow passing `cache: false` to disable cache in getter
+  ([b4858a](https://github.com/shioyama/mobility/commit/b4858acfb0cf5dae0761672269c248d0e3762bab))
+  and setter
+  ([6085d7](https://github.com/shioyama/mobility/commit/6085d791a98de7870bdd78fe6b792cbb3f96c1f4))
+* Rename `configure!` method to `configure`
+  ([4e35c54](https://github.com/shioyama/mobility/commit/4e35c54cd62033d1ce7b631a1f62efaf4ffa2565))
+* Make query scope method configurable ([#22](https://github.com/shioyama/mobility/pull/22))
+* Do not memoize scopes/datasets ([#24](https://github.com/shioyama/mobility/pull/24))
+
 ### 0.1.12
 * Extract presence filter into `Mobility::Backend::Presence` class
   ([7d654](https://github.com/shioyama/mobility/commit/7d65479c832ca154a45a548b64d27016486d34df),

data/Gemfile.lock

@@ -1,19 +1,50 @@
 PATH
   remote: .
   specs:
-    mobility (0.1.11)
+    mobility (0.1.12)
       i18n (>= 0.6.10)
       request_store (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    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.2)
+      activesupport (= 5.0.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      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.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    builder (3.2.3)
     byebug (9.0.6)
     coderay (1.1.1)
+    concurrent-ruby (1.0.5)
     database_cleaner (1.5.3)
     diff-lcs (1.3)
+    erubis (2.7.0)
     ffi (1.9.18)
     formatador (0.2.5)
+    generator_spec (0.9.3)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     guard (2.14.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -33,10 +64,16 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     lumberjack (1.0.11)
     method_source (0.8.2)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
     mysql2 (0.3.21)
     nenv (0.3.0)
+    nokogiri (1.7.1)
+      mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -48,6 +85,20 @@ GEM
     pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
+    rack (2.0.1)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
@@ -62,9 +113,6 @@ GEM
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
@@ -74,14 +122,19 @@ GEM
     slop (3.6.0)
     sqlite3 (1.3.13)
     thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
     yard (0.9.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 5.0, < 5.1)
   bundler (~> 1.12)
   database_cleaner (~> 1.5.3)
+  generator_spec (~> 0.9.3)
   guard-rspec
   mobility!
   mysql2 (~> 0.3.10)
@@ -89,7 +142,6 @@ DEPENDENCIES
   pry-byebug
   rake (~> 10.0)
   rspec (~> 3.0)
-  rspec-its (~> 1.2.0)
   sqlite3
   yard (~> 0.9.0)
 

data/README.md

@@ -46,7 +46,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.1.12'
+gem 'mobility', '~> 0.1.13'
 ```
 
 To translate attributes on a model, include (or extend) `Mobility`, then call
@@ -534,6 +534,9 @@ class Word < ApplicationRecord
 end
 ```
 
+You can also turn off the cache for a single fetch by passing `cache: false` to
+the getter method, i.e. `post.title(cache: false)`.
+
 The cache is normally just a hash with locale keys and string (translation)
 values, but some backends (e.g. KeyValue and Table backends) have slightly more
 complex implementations.
@@ -758,6 +761,12 @@ can be changed, see the shared examples for details.
 Backends are also each tested against specialized specs targeted at their
 particular implementations.
 
+Integrations
+------------
+
+* [friendly_id-mobility](https://github.com/shioyama/friendly_id-mobility): Use
+  Mobility with [FriendlyId](https://github.com/norman/friendly_id).
+
 More Information
 ----------------
 

data/lib/generators/rails/mobility/install_generator.rb

@@ -21,10 +21,7 @@ module Mobility
     end
 
     def create_initializer
-      create_file(
-        "config/initializers/mobility.rb",
-        "Mobility.configure do |config|\n  config.default_backend = :key_value\n  config.accessor_method = :translates\nend"
-      )
+      copy_file "initializer.rb", "config/initializers/mobility.rb"
     end
 
     def self.next_migration_number(dirname)

data/lib/generators/rails/mobility/templates/initializer.rb

@@ -0,0 +1,5 @@
+Mobility.configure do |config|
+  config.default_backend = :key_value
+  config.accessor_method = :translates
+  config.query_method    = :i18n
+end

data/lib/mobility.rb

@@ -38,7 +38,6 @@ module Mobility
   autoload :Configuration,        "mobility/configuration"
   autoload :FallthroughAccessors, "mobility/fallthrough_accessors"
   autoload :LocaleAccessors,      "mobility/locale_accessors"
-  autoload :InstanceMethods,      "mobility/instance_methods"
   autoload :Translates,           "mobility/translates"
   autoload :Wrapper,              "mobility/wrapper"
 
@@ -81,23 +80,29 @@ module Mobility
     def extended(model_class)
       return if model_class.respond_to? :mobility_accessor
       model_class.class_eval do
-        def self.mobility
-          @mobility ||= Mobility::Wrapper.new(self)
-        end
-        def self.translated_attribute_names
-          mobility.translated_attribute_names
+        # Fetch backend for an attribute
+        # @param [String] attribute Attribute
+        def mobility_backend_for(attribute)
+          send(Backend.method_name(attribute))
         end
 
         class << self
           include Translates
+
           if translates = Mobility.config.accessor_method
             alias_method translates, :mobility_accessor
           end
+
+          def mobility
+            @mobility ||= Mobility::Wrapper.new(self)
+          end
+
+          def translated_attribute_names
+            mobility.translated_attribute_names
+          end
         end
       end
 
-      model_class.include(InstanceMethods)
-
       if Loaded::ActiveRecord
         model_class.include(ActiveRecord)                   if model_class < ::ActiveRecord::Base
         model_class.include(ActiveModel::AttributeMethods)  if model_class.ancestors.include?(::ActiveModel::AttributeMethods)
@@ -157,6 +162,9 @@ module Mobility
 
     # (see Mobility::Configuration#accessor_method)
     # @!method accessor_method
+    #
+    # (see Mobility::Configuration#query_method)
+    # @!method query_method
 
     # (see Mobility::Configuration#default_fallbacks)
     # @!method default_fallbacks
@@ -166,7 +174,7 @@ module Mobility
 
     # (see Mobility::Configuration#default_accessor_locales)
     # @!method default_accessor_locales
-    %w[accessor_method default_backend default_accessor_locales].each do |method_name|
+    %w[accessor_method query_method default_backend default_accessor_locales].each do |method_name|
       define_method method_name do
         config.public_send(method_name)
       end

data/lib/mobility/active_record.rb

@@ -31,7 +31,7 @@ Module loading ActiveRecord-specific classes for Mobility models.
 
     module ClassMethods
       # @return [ActiveRecord::Relation] relation extended with Mobility query methods.
-      def i18n
+      define_method ::Mobility.query_method do
         all
       end
     end

data/lib/mobility/attributes.rb

@@ -84,8 +84,8 @@ This allows a backend to do things like (for example) define associations on a
 model class required by the backend, as happens in the {Backend::KeyValue} and
 {Backend::Table} backends.
 
-The +setup+ block is also used to extend the +i18n+ scope/dataset with
-backend-specific query method support.
+The +setup+ block is also used to extend the query scope/dataset (+i18n+ by
+default) with backend-specific query method support.
 
 Since setup blocks are evaluated on the model class, it is possible that
 backends can conflict (for example, overwriting previously defined methods).
@@ -141,7 +141,7 @@ with other backends.
       end
       include FallthroughAccessors.new(*attributes) if options[:fallthrough_accessors]
 
-      @backend_class.configure!(options) if @backend_class.respond_to?(:configure!)
+      @backend_class.configure(options) if @backend_class.respond_to?(:configure)
 
       include_backend_modules(@backend_class, options)
 

data/lib/mobility/backend.rb

@@ -18,7 +18,7 @@ On top of this, a backend will normally:
 
 - implement a +read+ instance method to read from the backend
 - implement a +write+ instance method to write to the backend
-- implement a +configure!+ class method to apply any normalization to the
+- implement a +configure+ class method to apply any normalization to the
   options hash
 - call the +setup+ method yielding attributes and options to configure the
   model class
@@ -35,7 +35,7 @@ On top of this, a backend will normally:
       # ...
     end
 
-    def self.configure!(options)
+    def self.configure(options)
       # ...
     end
 

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

@@ -86,11 +86,9 @@ value of the translated attribute if passed to it.
       # they change from Rails version to version.
       def self.method_suffixes
         @method_suffixes ||=
-          begin
-            Class.new do
-              include ::ActiveModel::Dirty
-            end.attribute_method_matchers.map { |m| m.suffix }
-          end.select { |m| m =~ /\A_/ }
+          Class.new do
+            include ::ActiveModel::Dirty
+          end.attribute_method_matchers.map(&:suffix).select { |m| m =~ /\A_/ }
       end
     end
   end

data/lib/mobility/backend/active_record.rb

@@ -8,6 +8,21 @@ module Mobility
       autoload :Serialized,   'mobility/backend/active_record/serialized'
       autoload :QueryMethods, 'mobility/backend/active_record/query_methods'
       autoload :Table,        'mobility/backend/active_record/table'
+
+      def setup_query_methods(query_methods)
+        setup do |attributes, options|
+          extend(Module.new do
+            define_method ::Mobility.query_method do
+              super().extending(query_methods.new(attributes, options))
+            end
+          end)
+        end
+      end
+
+      def self.included(backend_class)
+        backend_class.include(Backend)
+        backend_class.extend(self)
+      end
     end
   end
 end

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

@@ -29,10 +29,10 @@ or locales.)
   #=> "foo"
 =end
     class ActiveRecord::Column
-      include Backend
-      include Backend::Column
+      include ActiveRecord
+      include Column
 
-      autoload :QueryMethods, 'mobility/backend/active_record/column/query_methods'
+      require 'mobility/backend/active_record/column/query_methods'
 
       # @!group Backend Accessors
       # @!macro backend_reader
@@ -47,19 +47,12 @@ or locales.)
       end
 
       # @!group Backend Configuration
-      def self.configure!(options)
+      def self.configure(options)
         options[:locale_accessors] = false
       end
       # @!endgroup
 
-      setup do |attributes, options|
-        mod = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().extending(QueryMethods.new(attributes, options))
-          end
-        end
-        extend mod
-      end
+      setup_query_methods(QueryMethods)
     end
   end
 end

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

@@ -32,7 +32,7 @@ module Mobility
             super(opts_converter.call(opts), *rest)
           end
         end
-        relation.model.mobility_where_chain.prepend(mod)
+        relation.mobility_where_chain.include(mod)
       end
     end
   end

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

@@ -6,7 +6,7 @@ Internal class used by ActiveRecord backends that store values as a hash.
 
 =end
     class ActiveRecord::HashValued
-      include Backend
+      include ActiveRecord
 
       # @!group Backend Accessors
       #

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

@@ -10,7 +10,7 @@ Implements the {Mobility::Backend::Hstore} backend for ActiveRecord models.
 
 =end
     class ActiveRecord::Hstore < ActiveRecord::HashValued
-      autoload :QueryMethods, 'mobility/backend/active_record/hstore/query_methods'
+      require 'mobility/backend/active_record/hstore/query_methods'
 
       # @!group Backend Accessors
       # @!macro backend_reader
@@ -23,14 +23,7 @@ Implements the {Mobility::Backend::Hstore} backend for ActiveRecord models.
       end
       # @!endgroup
 
-      setup do |attributes, options|
-        query_methods = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().extending(QueryMethods.new(attributes, options))
-          end
-        end
-        extend query_methods
-      end
+      setup_query_methods(QueryMethods)
     end
   end
 end

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

@@ -59,7 +59,7 @@ module Mobility
             end
           end
         end
-        relation.model.mobility_where_chain.prepend(mod)
+        relation.mobility_where_chain.include(mod)
       end
     end
   end

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

@@ -10,7 +10,7 @@ Implements the {Mobility::Backend::Jsonb} backend for ActiveRecord models.
 
 =end
     class ActiveRecord::Jsonb < ActiveRecord::HashValued
-      autoload :QueryMethods, 'mobility/backend/active_record/jsonb/query_methods'
+      require 'mobility/backend/active_record/jsonb/query_methods'
 
       # @!group Backend Accessors
       #
@@ -30,14 +30,7 @@ Implements the {Mobility::Backend::Jsonb} backend for ActiveRecord models.
       # @return [String,Integer,Boolean] Updated value
       # @!method write(locale, value, **options)
 
-      setup do |attributes, options|
-        query_methods = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().extending(QueryMethods.new(attributes, options))
-          end
-        end
-        extend query_methods
-      end
+      setup_query_methods(QueryMethods)
     end
   end
 end

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

@@ -60,7 +60,7 @@ module Mobility
             end
           end
         end
-        relation.model.mobility_where_chain.prepend(mod)
+        relation.mobility_where_chain.include(mod)
       end
     end
   end

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

@@ -21,10 +21,10 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
 
 =end
     class ActiveRecord::KeyValue
-      include Backend
-      include Backend::KeyValue
+      include ActiveRecord
+      include KeyValue
 
-      autoload :QueryMethods, 'mobility/backend/active_record/key_value/query_methods'
+      require 'mobility/backend/active_record/key_value/query_methods'
 
       # @return [Symbol] Name of the association
       attr_reader :association_name
@@ -53,7 +53,7 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
       # @option options [Symbol] association_name (:mobility_text_translations) Name of association method
       # @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)
+      def self.configure(options)
         super
         type = options[:type]
         options[:class_name] ||= Mobility::ActiveRecord.const_get("#{type.capitalize}Translation".freeze)
@@ -88,13 +88,6 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
         end
         after_destroy :mobility_destroy_key_value_translations
 
-        mod = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().extending(QueryMethods.new(attributes, options))
-          end
-        end
-        extend mod
-
         private
 
         # Clean up *all* leftover translations of this model, only once.
@@ -106,6 +99,8 @@ Implements the {Mobility::Backend::KeyValue} backend for ActiveRecord models.
         end unless private_instance_methods(false).include?(:mobility_destroy_key_value_translations)
       end
 
+      setup_query_methods(QueryMethods)
+
       # @!group Cache Methods
       # @return [KeyValue::TranslationsCache]
       def new_cache

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

@@ -31,7 +31,7 @@ module Mobility
             end
           end
         end
-        relation.model.mobility_where_chain.prepend(mod)
+        relation.mobility_where_chain.include(mod)
       end
 
       private

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

@@ -17,10 +17,11 @@ models. For details see backend-specific subclasses.
         end
 
         # @param [ActiveRecord::Relation] relation Relation being extended
+        # @note Only want to define this once, even if multiple QueryMethods
+        #   modules are included, so define it here in extended method
         def extended(relation)
-          model_class = relation.model
-          unless model_class.respond_to?(:mobility_where_chain)
-            model_class.define_singleton_method(:mobility_where_chain) do
+          unless relation.respond_to?(:mobility_where_chain)
+            relation.define_singleton_method(:mobility_where_chain) do
               @mobility_where_chain ||= Class.new(::ActiveRecord::QueryMethods::WhereChain)
             end
 

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

@@ -21,9 +21,9 @@ Implements {Mobility::Backend::Serialized} backend for ActiveRecord models.
 
 =end
     class ActiveRecord::Serialized
-      include Backend
+      include ActiveRecord
 
-      autoload :QueryMethods, 'mobility/backend/active_record/serialized/query_methods'
+      require 'mobility/backend/active_record/serialized/query_methods'
 
       # @!group Backend Accessors
       #
@@ -41,7 +41,7 @@ Implements {Mobility::Backend::Serialized} backend for ActiveRecord models.
       # @!group Backend Configuration
       # @option options [Symbol] format (:yaml) Serialization format
       # @raise [ArgumentError] if a format other than +:yaml+ or +:json+ is passed in
-      def self.configure!(options)
+      def self.configure(options)
         options[:format] ||= :yaml
         options[:format] = options[:format].downcase.to_sym
         raise ArgumentError, "Serialized backend only supports yaml or json formats." unless [:yaml, :json].include?(options[:format])
@@ -51,15 +51,10 @@ Implements {Mobility::Backend::Serialized} backend for ActiveRecord models.
       setup do |attributes, options|
         coder = { yaml: YAMLCoder, json: JSONCoder }[options[:format]]
         attributes.each { |attribute| serialize attribute, coder }
-
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().extending(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
       end
 
+      setup_query_methods(QueryMethods)
+
       # @!group Cache Methods
       # Returns column value as a hash
       # @return [Hash]

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

@@ -25,7 +25,7 @@ module Mobility
             opts_checker.call(opts) || super(opts, *rest)
           end
         end
-        relation.model.mobility_where_chain.prepend(mod)
+        relation.mobility_where_chain.include(mod)
       end
     end
   end

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

@@ -84,9 +84,9 @@ columns to that table.
   #  title: "bar">
 =end
     class ActiveRecord::Table
-      include Backend
+      include ActiveRecord
 
-      autoload :QueryMethods, 'mobility/backend/active_record/table/query_methods'
+      require 'mobility/backend/active_record/table/query_methods'
 
       # @return [Symbol] name of the association method
       attr_reader :association_name
@@ -117,7 +117,7 @@ columns to that table.
       # @option options [Symbol] foreign_key Name of foreign key
       # @option options [Symbol] subclass_name (:Translation) Name of subclass
       #   to append to model class to generate translation class
-      def self.configure!(options)
+      def self.configure(options)
         table_name = options[:model_class].table_name
         options[:table_name]  ||= "#{table_name.singularize}_translations".freeze
         options[:foreign_key] ||= table_name.downcase.singularize.camelize.foreign_key
@@ -131,7 +131,7 @@ columns to that table.
       end
       # @!endgroup
 
-      setup do |attributes, options|
+      setup do |_attributes, options|
         association_name = options[:association_name]
         subclass_name    = options[:subclass_name]
 
@@ -157,15 +157,10 @@ columns to that table.
           class_name:  name,
           foreign_key: options[:foreign_key],
           inverse_of:  association_name
-
-        query_methods = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().extending(QueryMethods.new(attributes, options))
-          end
-        end
-        extend query_methods
       end
 
+      setup_query_methods(QueryMethods)
+
       # @!group Cache Methods
       # @return [Table::TranslationsCache]
       def new_cache

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

@@ -34,7 +34,7 @@ module Mobility
             end
           end
         end
-        relation.model.mobility_where_chain.prepend(mod)
+        relation.mobility_where_chain.include(mod)
       end
 
       private

data/lib/mobility/backend/cache.rb

@@ -35,7 +35,11 @@ this).
     module Cache
       # @group Backend Accessors
       # @!macro backend_reader
-      def read(locale, **_)
+      # @param [Hash] options
+      # @param [Boolean] cache
+      #   *false* to disable cache.
+      def read(locale, **options)
+        return super if options.delete(:cache) == false
         if write_to_cache? || cache.has_key?(locale)
           cache[locale]
         else
@@ -44,7 +48,11 @@ this).
       end
 
       # @!macro backend_writer
-      def write(locale, value, **_)
+      # @param [Hash] options
+      # @param [Boolean] cache
+      #   *false* to disable cache.
+      def write(locale, value, **options)
+        return super if options.delete(:cache) == false
         cache[locale] = write_to_cache? ? value : super
       end
       # @!endgroup

data/lib/mobility/backend/key_value.rb

@@ -49,7 +49,7 @@ class.
         # @!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)
+        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

data/lib/mobility/backend/null.rb

@@ -17,7 +17,7 @@ Backend which does absolutely nothing. Mostly for testing purposes.
       # @!endgroup
 
       # @!group Backend Configuration
-      def self.configure!(*); end
+      def self.configure(*); end
       # @!endgroup
     end
   end

data/lib/mobility/backend/orm_delegator.rb

@@ -17,11 +17,11 @@ Adds {#for} method to backend to return ORM-specific backend.
       # @return [Class] Class of backend to use for model
       def for(model_class)
         if Loaded::ActiveRecord && model_class < ::ActiveRecord::Base
-          const_get(name.split("::").insert(-2, "ActiveRecord").join("::"))
+          const_get(name.split("::".freeze).insert(-2, "ActiveRecord".freeze).join("::".freeze))
         elsif Loaded::Sequel && model_class < ::Sequel::Model
-          const_get(name.split("::").insert(-2, "Sequel").join("::"))
+          const_get(name.split("::".freeze).insert(-2, "Sequel".freeze).join("::".freeze))
         else
-          raise ArgumentError, "#{name.split('::').last} backend can only be used by ActiveRecord or Sequel models"
+          raise ArgumentError, "#{name.split('::'.freeze).last} backend can only be used by ActiveRecord or Sequel models".freeze
         end
       end
 

data/lib/mobility/backend/sequel.rb

@@ -9,6 +9,21 @@ module Mobility
       autoload :Serialized,   'mobility/backend/sequel/serialized'
       autoload :Table,        'mobility/backend/sequel/table'
       autoload :QueryMethods, 'mobility/backend/sequel/query_methods'
+
+      def setup_query_methods(query_methods)
+        setup do |attributes, options|
+          extend(Module.new do
+            define_method ::Mobility.query_method do
+              super().with_extend(query_methods.new(attributes, options))
+            end
+          end)
+        end
+      end
+
+      def self.included(backend_class)
+        backend_class.include(Backend)
+        backend_class.extend(self)
+      end
     end
   end
 end

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

@@ -8,10 +8,10 @@ Implements the {Mobility::Backend::Column} backend for Sequel models.
   otherwise interfere with column methods.
 =end
     class Sequel::Column
-      include Backend
-      include Backend::Column
+      include Sequel
+      include Column
 
-      autoload :QueryMethods, 'mobility/backend/sequel/column/query_methods'
+      require 'mobility/backend/sequel/column/query_methods'
 
       # @!group Backend Accessors
       # @!macro backend_reader
@@ -28,19 +28,12 @@ Implements the {Mobility::Backend::Column} backend for Sequel models.
       end
 
       # @!group Backend Configuration
-      def self.configure!(options)
+      def self.configure(options)
         options[:locale_accessors] = false
       end
       # @!endgroup
 
-      setup do |attributes, options|
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().with_extend(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
-      end
+      setup_query_methods(QueryMethods)
     end
   end
 end

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

@@ -6,7 +6,7 @@ Internal class used by Sequel backends that store values as a hash.
 
 =end
     class Sequel::HashValued
-      include Backend
+      include Sequel
 
       # @!macro backend_reader
       def read(locale, **_)

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

@@ -10,7 +10,7 @@ Implements the {Mobility::Backend::Hstore} backend for Sequel models.
 
 =end
     class Sequel::Hstore < Sequel::HashValued
-      autoload :QueryMethods, 'mobility/backend/sequel/hstore/query_methods'
+      require 'mobility/backend/sequel/hstore/query_methods'
 
       # @!group Backend Accessors
       # @!macro backend_reader
@@ -23,14 +23,7 @@ Implements the {Mobility::Backend::Hstore} backend for Sequel models.
       end
       # @!endgroup
 
-      setup do |attributes, options|
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().with_extend(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
-      end
+      setup_query_methods(QueryMethods)
     end
   end
 end

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

@@ -10,7 +10,7 @@ Implements the {Mobility::Backend::Jsonb} backend for Sequel models.
 
 =end
     class Sequel::Jsonb < Sequel::HashValued
-      autoload :QueryMethods, 'mobility/backend/sequel/jsonb/query_methods'
+      require 'mobility/backend/sequel/jsonb/query_methods'
 
       # @!group Backend Accessors
       #
@@ -30,14 +30,7 @@ Implements the {Mobility::Backend::Jsonb} backend for Sequel models.
       # @return [String,Integer,Boolean] Updated value
       # @!method write(locale, value, **options)
 
-      setup do |attributes, options|
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().with_extend(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
-      end
+      setup_query_methods(QueryMethods)
     end
   end
 end

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

@@ -12,10 +12,10 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
 
 =end
     class Sequel::KeyValue
-      include Backend
-      include Backend::KeyValue
+      include Sequel
+      include KeyValue
 
-      autoload :QueryMethods, 'mobility/backend/sequel/key_value/query_methods'
+      require 'mobility/backend/sequel/key_value/query_methods'
 
       # @return [Symbol] name of the association
       attr_reader :association_name
@@ -50,7 +50,7 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
       # @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)
+      def self.configure(options)
         super
         raise CacheRequired, "Cache required for Sequel::KeyValue backend" if options[:cache] == false
         type = options[:type]
@@ -91,13 +91,6 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
         end
         include callback_methods
 
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().with_extend(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
-
         include Mobility::Sequel::ColumnChanges.new(attributes)
 
         private
@@ -117,6 +110,8 @@ Implements the {Mobility::Backend::KeyValue} backend for Sequel models.
         include mobility_key_value_callbacks_module
       end
 
+      setup_query_methods(QueryMethods)
+
       # @!group Cache Methods
       # @return [KeyValue::TranslationsCache]
       def new_cache

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

@@ -28,9 +28,9 @@ Sequel serialization plugin.
 
 =end
     class Sequel::Serialized
-      include Backend
+      include Sequel
 
-      autoload :QueryMethods, 'mobility/backend/sequel/serialized/query_methods'
+      require 'mobility/backend/sequel/serialized/query_methods'
 
       # @!group Backend Accessors
       #
@@ -48,7 +48,7 @@ Sequel serialization plugin.
       # @!group Backend Configuration
       # @option options [Symbol] format (:yaml) Serialization format
       # @raise [ArgumentError] if a format other than +:yaml+ or +:json+ is passed in
-      def self.configure!(options)
+      def self.configure(options)
         options[:format] ||= :yaml
         options[:format] = options[:format].downcase.to_sym
         raise ArgumentError, "Serialized backend only supports yaml or json formats." unless [:yaml, :json].include?(options[:format])
@@ -74,16 +74,11 @@ Sequel serialization plugin.
         end
         include method_overrides
 
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().with_extend(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
-
         include SerializationModificationDetectionFix
       end
 
+      setup_query_methods(QueryMethods)
+
       # Returns deserialized column value
       # @return [Hash]
       def translations

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

@@ -6,9 +6,9 @@ Implements the {Mobility::Backend::Table} backend for Sequel models.
 
 =end
     class Sequel::Table
-      include Backend
+      include Sequel
 
-      autoload :QueryMethods, 'mobility/backend/sequel/table/query_methods'
+      require 'mobility/backend/sequel/table/query_methods'
 
       # @return [Symbol] name of the association method
       attr_reader :association_name
@@ -41,7 +41,7 @@ Implements the {Mobility::Backend::Table} backend for Sequel models.
       # @option options [Symbol] foreign_key Name of foreign key
       # @option options [Symbol] subclass_name Name of subclass to append to model class to generate translation class
       # @raise [CacheRequired] if cache option is false
-      def self.configure!(options)
+      def self.configure(options)
         raise CacheRequired, "Cache required for Sequel::Table backend" if options[:cache] == false
         table_name = options[:model_class].table_name
         options[:table_name]  ||= :"#{table_name.to_s.singularize}_translations"
@@ -95,16 +95,11 @@ Implements the {Mobility::Backend::Table} backend for Sequel models.
         end
         include callback_methods
 
-        extension = Module.new do
-          define_method :i18n do
-            @mobility_scope ||= super().with_extend(QueryMethods.new(attributes, options))
-          end
-        end
-        extend extension
-
         include Mobility::Sequel::ColumnChanges.new(attributes)
       end
 
+      setup_query_methods(QueryMethods)
+
       # @!group Cache Methods
       # @return [Table::TranslationsCache]
       def new_cache

data/lib/mobility/configuration.rb

@@ -9,6 +9,10 @@ Stores shared Mobility configuration referenced by all backends.
     # @return [Symbol]
     attr_accessor :accessor_method
 
+    # Name of query scope/dataset method (defaults to +i18n+)
+    # @return [Symbol]
+    attr_accessor :query_method
+
     # Default fallbacks instance
     # @return [I18n::Locale::Fallbacks]
     def default_fallbacks(fallbacks = {})
@@ -34,6 +38,7 @@ Stores shared Mobility configuration referenced by all backends.
 
     def initialize
       @accessor_method = :translates
+      @query_method = :i18n
       @default_fallbacks = lambda { |fallbacks| I18n::Locale::Fallbacks.new(fallbacks) }
       @default_accessor_locales = lambda { I18n.available_locales }
     end

data/lib/mobility/fallthrough_accessors.rb

@@ -38,7 +38,8 @@ model class is generated.
     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
+      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

data/lib/mobility/sequel.rb

@@ -18,7 +18,7 @@ Module loading Sequel-specific classes for Mobility models.
 
     module ClassMethods
       # @return [Sequel::Dataset] dataset extended with Mobility query methods.
-      def i18n
+      define_method ::Mobility.query_method do
         dataset
       end
     end

data/lib/mobility/version.rb

@@ -1,3 +1,3 @@
 module Mobility
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -31,6 +31,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +63,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.3
   type: :development
@@ -64,6 +73,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.3
 - !ruby/object:Gem::Dependency
@@ -94,20 +106,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +143,7 @@ files:
 - lib/generators/rails/mobility/templates/column_translations.rb
 - lib/generators/rails/mobility/templates/create_string_translations.rb
 - lib/generators/rails/mobility/templates/create_text_translations.rb
+- lib/generators/rails/mobility/templates/initializer.rb
 - lib/generators/rails/mobility/templates/table_migration.rb
 - lib/generators/rails/mobility/templates/table_translations.rb
 - lib/generators/rails/mobility/translations_generator.rb
@@ -210,7 +209,6 @@ files:
 - lib/mobility/core_ext/object.rb
 - lib/mobility/core_ext/string.rb
 - lib/mobility/fallthrough_accessors.rb
-- lib/mobility/instance_methods.rb
 - lib/mobility/locale_accessors.rb
 - lib/mobility/orm.rb
 - lib/mobility/rails.rb

data/lib/mobility/instance_methods.rb

@@ -1,15 +0,0 @@
-module Mobility
-=begin
-
-Instance methods attached to all model classes when model includes or extends
-{Mobility}.
-
-=end
-  module InstanceMethods
-    # Fetch backend for an attribute
-    # @param [String] attribute Attribute
-    def mobility_backend_for(attribute)
-      send(Backend.method_name(attribute))
-    end
-  end
-end