mobility 1.0.0.rc1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8658079d8c9fad02763385921421140d2410cde1d505c286627de5a8c1819612
-  data.tar.gz: 9bb012a9f564971e0c24fd3015e20e17384d7cbd77f2f0a5f1f1505e5262277a
+  metadata.gz: 4e614b2354ec6cfbc7d4b3d946beabc5214904c21432cceb0b78530ca389184e
+  data.tar.gz: fa9e5cf7097b92a203e38e07617254e42d3bc11f58254b4b13b359639b70902a
 SHA512:
-  metadata.gz: 0a4a8a38a27d6f727091062010087466c85bfe48ce369395adb5501bd9875cfba21a56bce6a13b92b5cf83746883934f4161835f1336adedd9539bbf1138c51b
-  data.tar.gz: ca65fdaf7af558d235fdb5ba45347b9ca2319d9e6d69ddf7611afa2a50a477a30998316ce8661ca640ced1d09cd05f6ff282b1edfebd79abf4830c142bdf95df
+  metadata.gz: ef1653434cb1e303f0496c9fecd810ea2d2772009dca94358949e293157e6f2a58341867ad6c117a5dc91469002acdd80b969d442126a7df95ea49f667360cc8
+  data.tar.gz: dceae9f7039d21bcd5d68a0a2f54515b39c0b8ab871c7386fe0834a88f973e91af5c27f48a85cdfe0d6479a8291a976abfee2208e16a116c4d75b03db54a8f87

checksums.yaml.gz.sig

@@ -1,3 +1,2 @@
-8��>
-i!�]>T*Ho�m꿻��󒁹h�^B���"@�y ��1�$�{�{�Uq�K��Cu1+7
)�&y��/z���b�-�ޮ�]vR��^�.'$~��btam��b�}F@\?
-�Օ�
F?#�D�-��*�^�M�ɼ�̨��{�~��la�eY�f7 }o�<������Mye,H^��o@�^~ۦE�V0���aD��u���
+z�UE-F��h9d8����CF�`3���F���rXp4�S;)���ߴ>]�B��o����Wn Y��"�!\�snE��NھH�zp��!C4ɦ�2�Ջ�s��n����=g�CV��i��b6��E�S��F���t+*��r|�-gd[��pغaCq���]�iZy��L�<u%�smШT��*~sk�}:�S T���Լ��i)�y,�V�Vc���‡O;��.򏸼g��؁��֮tvc�w�"V��]
+m~k��?��,�{����G@�������]m�Ň?F&���VN�� �PdSޒ�dG�ah����y�*\���|p�ɒ�+��W�P���:�;�G��䎄)jv�3�]5yER��<<|��l��A

data/CHANGELOG.md

@@ -1,22 +1,67 @@
 # Mobility Changelog
 
+### Unreleased
+- Remove `Mobility::Plugins::Attributes#each`
+  ([#475](https://github.com/shioyama/mobility/pull/475))
+- Add public method `Mobility::Plugins::ActiveRecord::Query.build_query`
+  ([#471](https://github.com/shioyama/mobility/pull/471))
+- Allow setting locale per node in query block
+  ([#479](https://github.com/shioyama/mobility/pull/479))
+- Add `Mobility.validate_locale!`
+  ([#479](https://github.com/shioyama/mobility/pull/479))
+- Call after_destroy in setup block to delete associated translations
+  ([#487](https://github.com/shioyama/mobility/pull/487))
+- Add key, value and belongs_to options to key-value backend
+  ([#488](https://github.com/shioyama/mobility/pull/488)) thanks
+  [sedubois](https://github.com/sedubois)!
+
 ## 1.0
 
-1.0 is a rewrite of many internals of the gem. Please see the [wiki page on v1.0](https://github.com/shioyama/mobility/wiki/Introduction-to-Mobility-v1.0) for more details on how to upgrade.
+1.0 is a rewrite of many internals of the gem. Please see the [wiki page on
+v1.0](https://github.com/shioyama/mobility/wiki/Introduction-to-Mobility-v1.0)
+for more details on how to upgrade.
+
+### 1.0.4
+- Correctly override default backend options, fixes
+  [#492](https://github.com/shioyama/mobility/issues/492)
+  ([#495](https://github.com/shioyama/mobility/pull/495))
+
+### 1.0.3
+- Fix `Mobility.default_backend`
+  ([#497](https://github.com/shioyama/mobility/pull/497))
+
+### 1.0.2
+
+### 1.0.1
+
+- Make `Mobility::Plugins::ActiveRecord::Query::VirtualRow` and
+  `Mobility::Plugins::ActiveRecord::Query::QueryExtension`
+  ([#471](https://github.com/shioyama/mobility/pull/471)) public
+- Fix typo in initializer template
+  ([#474](https://github.com/shioyama/mobility/pull/474))
+
+### 1.0.0
+
+- Fix setting a locale from Rails config
+	([#468](https://github.com/shioyama/mobility/pull/468)) thanks
+	[sergey-alekseev](https://github.com/sergey-alekseev)!
+- Fixes validations with validates_uniqueness_of
+  ([#470](https://github.com/shioyama/mobility/pull/470)) thanks
+  [artplan1](https://github.com/artplan1)!
 
-## 1.0.0.rc1 (pre-release)
+### 1.0.0.rc1 (pre-release)
 
 - Remove `Mobility::ActiveRecord`, `Mobility::Sequel` and `Mobility::Arel`, and
   general cleanup ([#464](https://github.com/shioyama/mobility/pull/464))
 
-## 1.0.0.beta2 (pre-release)
+### 1.0.0.beta2 (pre-release)
 
 - Refactor attributes & backend plugins and make `mobility_attributes` public
   ([#462](https://github.com/shioyama/mobility/pull/462))
 - Make attribute_methods plugin depend on attributes
   ([#461](https://github.com/shioyama/mobility/pull/461))
 
-## 1.0.0.beta1 (pre-release)
+### 1.0.0.beta1 (pre-release)
 
 - Remove `Mobility::Backend#apply_plugin`
   ([#454](https://github.com/shioyama/mobility/pull/454))
@@ -27,7 +72,7 @@
 - Fix Ruby 2.7 deprecation warnings
   ([#460](https://github.com/shioyama/mobility/pull/460))
 
-## 1.0.0.alpha (pre-release)
+### 1.0.0.alpha (pre-release)
 
 - Default fallbacks plugin to `true` when enabled
   ([#447](https://github.com/shioyama/mobility/pull/447))

data/Gemfile

@@ -8,20 +8,11 @@ orm, orm_version = ENV['ORM'], ENV['ORM_VERSION']
 group :development, :test do
   case orm
   when 'active_record'
-    orm_version ||= '6.0'
+    orm_version ||= '6.1'
     case orm_version
-    when '4.2'
-      gem 'activerecord', '>= 4.2.6', '< 5.0'
-    when '5.0'
-      gem 'activerecord', '>= 5.0', '< 5.1'
-    when '5.1'
-      gem 'activerecord', '>= 5.1', '< 5.2'
-    when '5.2'
-      gem 'activerecord', '>= 5.2.0', '< 5.3'
-      gem 'railties', '>= 5.2.0.rc2', '< 5.3'
-    when '6.0'
-      gem 'activerecord', '>= 6.0.0', '< 6.1'
-    when '6.1'
+    when '4.2', '5.0', '5.1', '5.2', '6.0', '6.1'
+      gem 'activerecord', "~> #{orm_version}.0"
+    when '6.2'
       git 'https://github.com/rails/rails.git' do
         gem 'activerecord'
         gem 'activesupport'
@@ -32,10 +23,8 @@ group :development, :test do
   when 'sequel'
     orm_version ||= '5'
     case orm_version
-    when '4'
-      gem 'sequel', '>= 4.46.0', '< 5.0'
     when '5'
-      gem 'sequel', '>= 5.0.0', '< 6.0.0'
+      gem 'sequel', "~> #{orm_version}.0"
     else
       raise ArgumentError, 'Invalid Sequel version'
     end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (1.0.0.beta2)
+    mobility (1.0.1)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
 
@@ -48,7 +48,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -83,16 +83,16 @@ GEM
     shellany (0.0.1)
     thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.8)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     yard (0.9.25)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 6.0.0, < 6.1)
+  activerecord (~> 6.0.0)
   benchmark-ips
   database_cleaner (~> 1.5, >= 1.5.3)
   guard-rspec

data/README.md

@@ -12,11 +12,9 @@ Mobility
 [docs]: http://www.rubydoc.info/gems/mobility
 [wiki]: https://github.com/shioyama/mobility/wiki
 
-**This is the readme for the [`master`](https://github.com/shioyama/mobility)
-branch, which corresponds to v1.0.0.rc1, a pre-release version of Mobility.
-If you are using an earlier version (0.8.x or earlier), you probably want the
-readme on the [0-8-stable
-branch](https://github.com/shioyama/mobility/tree/0-8-stable).**
+**This is the readme for version 1.0 of Mobility. If you are using an earlier
+version (0.8.x or earlier), you probably want the readme on the [0-8
+branch](https://github.com/shioyama/mobility/tree/0-8).**
 
 Mobility is a gem for storing and retrieving translations as attributes on a
 class. These translations could be the content of blog posts, captions on
@@ -58,12 +56,9 @@ To use the latest pre-version of Mobility 1.0, add this line to your
 application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 1.0.0.rc1'
+gem 'mobility', '~> 1.0.4'
 ```
 
-For the latest stable version of Mobility, see the readme on the
-[0-8-stable](https://github.com/shioyama/mobility/tree/0-8-stable) branch.
-
 ### ActiveRecord (Rails)
 
 Requirements:
@@ -92,8 +87,8 @@ which looks something like this:
 
 ```ruby
 Mobility.configure do
-  # PLUGINS
 
+  # PLUGINS
   plugins do
     backend :key_value
 
@@ -107,15 +102,15 @@ Mobility.configure do
 end
 ```
 
-Each method call inside the block passed to `config.plugins` declares a plugin,
-along with an optional default. To use a different default backend, you can
+Each method call inside the block passed to `plugins` declares a plugin, along
+with an optional default. To use a different default backend, you can
 change the default passed to the `backend` plugin, like this:
 
 ```diff
- Mobility.configure do |config|
-   # PLUGINS
+ Mobility.configure do
 
-   config.plugins do
+   # PLUGINS
+   plugins do
 -    backend :key_value
 +    backend :table
 ```
@@ -126,10 +121,10 @@ You can also set defaults for backend-specific options. Below, we set the
 default `type` option for the KeyValue backend to `:string`.
 
 ```diff
- Mobility.configure do |config|
-   # PLUGINS
+ Mobility.configure do
 
-   config.plugins do
+   # PLUGINS
+   plugins do
 -    backend :key_value
 +    backend :key_value, type: :string
    end
@@ -150,7 +145,7 @@ Requirements:
 When configuring Mobility, ensure that you include the `sequel` plugin:
 
 ```diff
- config.plugins do
+ plugins do
    backend :key_value
 
 -    active_record
@@ -297,7 +292,7 @@ accessors" in Mobility, and can be enabled by including the `locale_accessors`
 plugin, with a default set of accessors:
 
 ```diff
- config.plugins do
+ plugins do
    # ...
 +  locale_accessors [:en, :ja]
 ```
@@ -345,7 +340,7 @@ defined for a given locale.)
 Ensure the plugin is enabled:
 
 ```diff
- config.plugins do
+ plugins do
    # ...
 +  fallthrough_accessors
 ```
@@ -470,7 +465,7 @@ Mobility offers basic support for translation fallbacks. First, enable the
 `fallbacks` plugin:
 
 ```diff
- config.plugins do
+ plugins do
    # ...
 +  fallbacks
 +  locale_accessors
@@ -579,7 +574,7 @@ fallbacks](https://github.com/svenfuchs/i18n/wiki/Fallbacks).
 Another option is to assign a default value, using the `default` plugin:
 
 ```diff
- config.plugins do
+ plugins do
    # ...
 +  default 'foo'
 ```
@@ -632,7 +627,7 @@ have enabled an ORM plugin (either `active_record` or `sequel`), since the
 dirty plugin will depend on one of these being enabled.
 
 ```diff
- config.plugins do
+ plugins do
    # ...
    active_record
 +  dirty
@@ -722,7 +717,7 @@ can be quickly retrieved again. The cache plugin is included in the default
 configuration created by the install generator:
 
 ```diff
- config.plugins do
+ plugins do
    # ...
 +  cache
 ```
@@ -752,7 +747,7 @@ this feature, include the `query` plugin, and ensure you also have an ORM
 plugin enabled (`active_record` or `sequel`):
 
 ```diff
- config.plugins do
+ plugins do
    # ...
    active_record
 +  query

data/lib/mobility.rb

@@ -107,7 +107,7 @@ module Mobility
     # Alias to default backend defined on *translations_class+.
     # @return [Symbol,Class]
     def default_backend
-      translations_class.defaults[:backend]
+      translations_class.defaults[:backend]&.first
     end
 
     # Configure Mobility
@@ -218,7 +218,7 @@ module Mobility
     #   methods (in LocaleAccessors) than is really necessary.
     def available_locales
       if defined?(Rails) && Rails.application
-        Rails.application.config.i18n.available_locales || I18n.available_locales
+        Rails.application.config.i18n.available_locales&.map(&:to_sym) || I18n.available_locales
       else
         I18n.available_locales
       end

data/lib/mobility/plugin.rb

@@ -121,8 +121,8 @@ Also includes a +configure+ class method to apply plugins to a pluggable
     # Does this class include all plugins this plugin depends (directly) on?
     # @param [Class] klass Pluggable class
     def dependencies_satisfied?(klass)
-      required_plugins = dependencies.keys.map { |name| Plugins.load_plugin(name) }
-      (required_plugins - klass.included_modules).none?
+      plugin_keys = klass.included_plugins.map { |plugin| Plugins.lookup_name(plugin) }
+      (dependencies.keys - plugin_keys).none?
     end
 
     # Specifies a dependency of this plugin.

data/lib/mobility/plugins/active_record/query.rb

@@ -67,9 +67,9 @@ enabled for any one attribute on the model.
           end
         end
 
-        # Internal class to create a "clean room" for manipulating translated
-        # attribute nodes in an instance-eval'ed block. Inspired by Sequel's
-        # (much more sophisticated) virtual rows.
+        # Creates a "clean room" for manipulating translated attribute nodes in
+        # an instance-eval'ed block. Inspired by Sequel's (much more
+        # sophisticated) virtual rows.
         class VirtualRow < BasicObject
           attr_reader :__backends
 
@@ -108,7 +108,7 @@ enabled for any one attribute on the model.
             end
           end
         end
-        private_constant :QueryMethod, :VirtualRow
+        private_constant :QueryMethod
 
         module QueryExtension
           def where!(opts, *rest)
@@ -273,7 +273,7 @@ enabled for any one attribute on the model.
           end
         end
 
-        private_constant :QueryExtension, :FindByMethods
+        private_constant :FindByMethods
       end
 
       class MissingBackend < Mobility::Error; end

data/lib/mobility/plugins/active_record/uniqueness_validation.rb

@@ -10,6 +10,10 @@ module Mobility
           klass.class_eval do
             unless const_defined?(:UniquenessValidator, false)
               self.const_set(:UniquenessValidator, Class.new(UniquenessValidator))
+
+              def self.validates_uniqueness_of(*attr_names)
+                validates_with(UniquenessValidator, _merge_attributes(attr_names))
+              end
             end
           end
         end

data/lib/mobility/plugins/backend.rb

@@ -33,13 +33,6 @@ Defines:
       def initialize(*args, **original_options)
         super
 
-        # Validate that the default backend from config has valid keys
-        if (default = self.class.defaults[:backend])
-          name, backend_options = default
-          extra_keys = backend_options.keys - backend.valid_keys
-          raise InvalidOptionKey, "These are not valid #{name} backend keys: #{extra_keys.join(', ')}." unless extra_keys.empty?
-        end
-
         include InstanceMethods
       end
 
@@ -87,7 +80,7 @@ Defines:
 
         case options[:backend]
         when String, Symbol, Class
-          @backend, @backend_options = options[:backend], options
+          @backend, @backend_options = options[:backend], options.dup
         when Array
           @backend, @backend_options = options[:backend]
           @backend_options = @backend_options.merge(original_options)
@@ -105,6 +98,14 @@ Defines:
       def validate_options(options)
         return super unless backend
         super(options.slice(*(options.keys - backend.valid_keys)))
+
+        # Validate that the default backend from config has valid keys, or if
+        # it is overridden by an array input that the array has valid keys.
+        if options[:backend].is_a?(Array)
+          name, backend_options = options[:backend]
+          extra_keys = backend_options.keys - backend.valid_keys
+          raise InvalidOptionKey, "These are not valid #{name} backend keys: #{extra_keys.join(', ')}." unless extra_keys.empty?
+        end
       end
 
       # Override default argument-handling in DSL to store kwargs passed along

data/lib/mobility/version.rb

@@ -8,8 +8,8 @@ module Mobility
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 0
-    PRE = "rc1"
+    TINY = 4
+    PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

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

@@ -1,5 +1,4 @@
 class CreateStringTranslations < <%= activerecord_migration_class %>
-
   def change
     create_table :mobility_string_translations do |t|
       t.string :locale, null: false

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

@@ -1,5 +1,4 @@
 class CreateTextTranslations < <%= activerecord_migration_class %>
-
   def change
     create_table :mobility_text_translations do |t|
       t.string :locale, null: false

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

@@ -1,5 +1,4 @@
 Mobility.configure do
-
   # PLUGINS
   plugins do
     # Backend
@@ -104,5 +103,14 @@ Mobility.configure do
     #
     # Or define specific defaults by uncommenting line below
     # locale_accessors [:en, :ja]
+
+    # Attribute Methods
+    #
+    # Adds translated attributes to +attributes+ hash, and defines methods
+    # +translated_attributes+ and +untranslated_attributes+ which return hashes
+    # with translated and untranslated attributes, respectively. Be aware that
+    # this plugin can create conflicts with other gems.
+    #
+    # attribute_methods
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.4
 platform: ruby
 authors:
 - Chris Salzberg
@@ -34,7 +34,7 @@ cert_chain:
   gSQml7TqcC6dZRsZRwYqzD9kUwdAJoCqno2CBUKs2l0yQAjFT36lRrVJznb7uWwa
   xpPFnsrtyaZW6Dty8TSG3qzmeGpmpIotA8x1VA==
   -----END CERTIFICATE-----
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -247,7 +247,13 @@ metadata:
   homepage_uri: https://github.com/shioyama/mobility
   source_code_uri: https://github.com/shioyama/mobility
   changelog_uri: https://github.com/shioyama/mobility/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: |2
+
+  Warning: Mobility v1.0 includes backwards-incompatible changes (mostly around configuration).
+
+  If you are upgrading from an earlier version, please see:
+  - https://github.com/shioyama/mobility/releases/tag/v1.0.0
+  - https://github.com/shioyama/mobility/wiki/Introduction-to-Mobility-v1.0
 rdoc_options: []
 require_paths:
 - lib
@@ -258,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: