mobility 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0f95b761c21d4b4e8dbbbc3b46dea6a2b70039ca864dba15983689f207cf69
-  data.tar.gz: 1b2e5d61347a30f602dcaf56a7e467b24bf775bf0577a9494d84683921779705
+  metadata.gz: 1d9a9d5c551c18a0df94133a0adc5182d872afcab3e690a4580f480fab66cd09
+  data.tar.gz: b4a9efc3055adc3ee91d5fe47ba42a1b2f59bb00d820537d4ae2e3588e556753
 SHA512:
-  metadata.gz: da7f935a5624a5ba5aae4eed92ea45ee2eb04593ba7efd370d51cc10b8715ec933d4955a36ced854b68190de40598bff1fed3ab99befe1c7c46bce681e0b4e8c
-  data.tar.gz: 76ba495e0ae4d8e287b5581f97641f3e2e71e69fbd326c18c12031c76a4db5dc7a36b8f0733c14a1ee31b322fdd805cf4089eaad67fa55a517c9d7c1837a35aa
+  metadata.gz: e6c2658659e778be404e1c5f66b2d873a7d7a5a7f8a9f8b15773105949f6f29e7e8c9654e0e77a919b4bcc2472c31bdc29f82ec5cf0275db81e0a3575caf6f29
+  data.tar.gz: e20925dc8d6d4152f58b038101de146735a34919bfe7a91b3605ec08b7b1a5a76c177e227428d7a80219d7c414bf71804d6a01f7fead43857b3870214ce6b7b9

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.7
 
+### 0.7.4 (June 8, 2018)
+* Handle locales with multiple dashes in locale accessors, or raise
+  ArgumentError for invalid format
+  ([#253](https://github.com/shioyama/mobility/pull/253))
+
 ### 0.7.3 (June 7, 2018)
 * Fix uniqueness on Mobility model with no translated attributes ([#252](Fix
   uniqueness on Mobility model with no translated attributes))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility (0.7.2)
+    mobility (0.7.3)
       i18n (>= 0.6.10, < 1.1)
       request_store (~> 1.0)
 

data/README.md

@@ -51,7 +51,7 @@ Installation
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'mobility', '~> 0.7.3'
+gem 'mobility', '~> 0.7.4'
 ```
 
 Mobility is cryptographically signed. To be sure the gem you install hasn't

data/lib/mobility.rb

@@ -37,6 +37,8 @@ module Mobility
 
   # General error for version compatibility conflicts
   class VersionNotSupportedError < ArgumentError; end
+  CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
+  private_constant :CALL_COMPILABLE_REGEXP
 
   begin
     require "rails"
@@ -198,7 +200,7 @@ module Mobility
     #   Mobility.normalize_locale("pt-BR")
     #   #=> "pt_br"
     def normalize_locale(locale = Mobility.locale)
-      "#{locale.to_s.downcase.sub("-", "_")}"
+      "#{locale.to_s.downcase.tr("-", "_")}"
     end
     alias_method :normalized_locale, :normalize_locale
 
@@ -206,13 +208,18 @@ module Mobility
     # @param [String,Symbol] attribute
     # @param [String,Symbol] locale
     # @return [String] Normalized locale accessor name
+    # @raise [ArgumentError] if generated accessor has an invalid format
     # @example
     #   Mobility.normalize_locale_accessor(:foo, :ja)
     #   #=> "foo_ja"
     #   Mobility.normalize_locale_accessor(:bar, "pt-BR")
     #   #=> "bar_pt_br"
     def normalize_locale_accessor(attribute, locale = Mobility.locale)
-      "#{attribute}_#{normalize_locale(locale)}"
+      "#{attribute}_#{normalize_locale(locale)}".tap do |accessor|
+        unless CALL_COMPILABLE_REGEXP.match(accessor)
+          raise ArgumentError, "#{accessor.inspect} is not a valid accessor"
+        end
+      end
     end
 
     # Raises InvalidLocale exception if the locale passed in is present but not available.

data/lib/mobility/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mobility
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Chris Salzberg
@@ -30,7 +30,7 @@ cert_chain:
   eGDROPZoL5RXwiOnRbexxa7dcAxMrDfGB/hpiunIPWPsi4n5P7K/6OO/sGVMl9xv
   SZBPXjzrHdyOFLBYXB+PG7s3F/4=
   -----END CERTIFICATE-----
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store