mobility 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c83db6c82d88d2972c328ea414426416b57aee7
-  data.tar.gz: b058744cc114446d2d641046b3d14cbc843eef8f
+  metadata.gz: b4e6bd70e8b65c3c32cb116227a13af4d14c7771
+  data.tar.gz: 91d3c67192c763d729fd03e958760351d29d0330
 SHA512:
-  metadata.gz: 5d44c71b7381046f0fc63ea7cb7aed5506aa2860324dced1a6d58c07d3b1aa9fe9c10d337d17d42e4807a722a78faca46b2e386611b4e2a984176daaf90efdd3
-  data.tar.gz: 3e29ad8f1a11cb343291dbe0fa63633433e2463a40e70b85834898f808064b85fb129fba59db7588471743e4ee90c2bf276a8f50f90b8c9993cc2b1870d39107
+  metadata.gz: bdfd4ac8ea998c0d1d4d991dbfdabbb9b95fe33ab911ea47f68a8a89bb90216b7bf5c80167c62ede7f527cd85e017ba0ce8066e26d452f7c28dd116e76619f55
+  data.tar.gz: 25759fa739cacccf79210270bcaf6132b909253672d80818d7be7187a9009263c81a5afdb91d252f0a16b5ff6350441001213b2c3e7083bd8b81be62dfd992aa

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## 0.1
 
+### 0.1.10
+* Fix fallback options ([#12](https://github.com/shioyama/mobility/pull/12) and
+  ([09a163](https://github.com/shioyama/mobility/commit/09a1636bc743633fd13dc6c59ebf1e2366a0e2c4))
+* Include fallbacks module by default
+  ([#13](https://github.com/shioyama/mobility/pull/13/files))
+
+
+### 0.1.9
+
+(yanked)
+
+### 0.1.8
+
+(yanked)
+
 ### 0.1.7
 * Allow passing fallback locale or locales to getter method
   ([#9](https://github.com/shioyama/mobility/pull/9))

data/Gemfile.lock

@@ -1,50 +1,19 @@
 PATH
   remote: .
   specs:
-    mobility (0.1.6)
+    mobility (0.1.8)
       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)
@@ -63,16 +32,10 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    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.0.1)
-      mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -84,20 +47,6 @@ 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)
@@ -123,19 +72,14 @@ GEM
     slop (3.6.0)
     sqlite3 (1.3.13)
     thor (0.19.4)
-    thread_safe (0.3.6)
-    tzinfo (1.2.2)
-      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)

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.7'
+gem 'mobility', '~> 0.1.10'
 ```
 
 To translate attributes on a model, you must include (or extend) `Mobility`,

data/lib/mobility.rb

@@ -165,12 +165,16 @@ module Mobility
 
     # (see Mobility::Configuration#default_accessor_locales)
     # @!method default_accessor_locales
-    %w[accessor_method default_fallbacks default_backend default_accessor_locales].each do |method_name|
+    %w[accessor_method default_backend default_accessor_locales].each do |method_name|
       define_method method_name do
         config.public_send(method_name)
       end
     end
 
+    define_method :default_fallbacks do |*args|
+      config.public_send(:default_fallbacks, *args)
+    end
+
     # Configure Mobility
     # @yield [Mobility::Configuration] Mobility configuration
     def configure

data/lib/mobility/attributes.rb

@@ -166,13 +166,6 @@ 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
@@ -189,6 +182,14 @@ with other backends.
 
     private
 
+    # Include backend modules depending on value of options.
+    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)                        unless options[:fallbacks] == false
+      backend_class.include(FallthroughAccessors.new(attributes))      if options[:fallthrough_accessors]
+    end
+
     def define_backend(attribute)
       _backend_class, _options = backend_class, options
       define_method Backend.method_name(attribute) do

data/lib/mobility/backend.rb

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

data/lib/mobility/backend/fallbacks.rb

@@ -76,28 +76,39 @@ locale was +nil+.
   #=> "Mobilité"
 =end
     module Fallbacks
+      # @!macro [new] backend_constructor
+      #   @param model Model on which backend is defined
+      #   @param [String] attribute Backend attribute
+      #   @option backend_options [Hash] fallbacks Fallbacks hash
+      def initialize(model, attributes, **backend_options)
+        super
+        @fallbacks =
+          if (fallbacks = backend_options[:fallbacks]).is_a?(Hash)
+            Mobility.default_fallbacks(fallbacks)
+          elsif fallbacks == true
+            Mobility.default_fallbacks
+          end
+      end
+
       # @!group Backend Accessors
       # @!macro backend_reader
       # @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, **_)
+      def read(locale, fallback: nil, **options)
         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)
+        return super if fallback == false || (fallback.nil? && fallbacks.nil?)
+        (fallback ? [locale, *fallback] : fallbacks[locale]).detect do |fallback_locale|
+          value = super(fallback_locale, **options)
           break value if value.present?
         end
       end
 
       private
-
-      def fallbacks
-        @fallbacks ||= Mobility.default_fallbacks
-      end
+      attr_reader :fallbacks
     end
   end
 end

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

@@ -13,11 +13,15 @@ Implements the {Mobility::Backend::Table} backend for Sequel models.
       # @return [Symbol] name of the association method
       attr_reader :association_name
 
+      # @return [Symbol] class for translations
+      attr_reader :translation_class
+
       # @!macro backend_constructor
       # @option options [Symbol] association_name Name of association
       def initialize(model, attribute, **options)
         super
-        @association_name = options[:association_name]
+        @association_name  = options[:association_name]
+        @translation_class = options[:model_class].const_get(options[:subclass_name])
       end
 
       # @!group Backend Accessors
@@ -130,10 +134,6 @@ Implements the {Mobility::Backend::Table} backend for Sequel models.
         model.send(association_name)
       end
 
-      def translation_class
-        @translation_class ||= options[:model_class].const_get(options[:subclass_name])
-      end
-
       def model_cache
         model.send(:"__#{association_name}_cache")
       end

data/lib/mobility/configuration.rb

@@ -11,7 +11,10 @@ Stores shared Mobility configuration referenced by all backends.
 
     # Default fallbacks instance
     # @return [I18n::Locale::Fallbacks]
-    attr_accessor :default_fallbacks
+    def default_fallbacks(fallbacks = {})
+      @default_fallbacks.call(fallbacks)
+    end
+    attr_writer :default_fallbacks
 
     # Default backend to use (can be symbol or actual backend class)
     # @return [Symbol,Class]
@@ -31,7 +34,7 @@ Stores shared Mobility configuration referenced by all backends.
 
     def initialize
       @accessor_method = :translates
-      @default_fallbacks = I18n::Locale::Fallbacks.new
+      @default_fallbacks = lambda { |fallbacks| I18n::Locale::Fallbacks.new(fallbacks) }
       @default_accessor_locales = lambda { I18n.available_locales }
     end
   end

data/lib/mobility/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store