mobility_uniqueness 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710c0ea5d6e02ee1cda673303e2b30d61993321a3fc3655c84b4a231b9267c36
-  data.tar.gz: '029a9ebe04b453422eb6018d32421ae9ba390cc8ecad29f2e22eb7591f2568b0'
+  metadata.gz: 9de231d19a846a5f9894f62d1a66308022d943ff1ec9a4f43b636a3ad8313a14
+  data.tar.gz: edf9256ed4c4f2e621b7b363ce7adbda7918a4cc94c48de5939065abdacdc2e5
 SHA512:
-  metadata.gz: 1f53e82506ceada51bd9db3bad9ee12d45621d2ee045103b8bc9d82a7a7a9de497367f165a4eab3cfda81cf453fa071cb86ac2d9385bf2885ff28e07fad6180b
-  data.tar.gz: 0a382359b1bb564e4462f88fbd576ef51c6317bf9e7bc6c28f6221f872060c104c2c10b7d44c06c1d05ae4a1210c7bc2cdd8917f6fcfaaae170fd51f481d56c5
+  metadata.gz: cd0b4ce43780debe0ccb801c2b28a10ca1612e3e77fd48de0a76cb5f19e66a809f22f2844f5a609e0e4277123a7f0be6144910972ddb566d62601ed793f5ff60
+  data.tar.gz: 8493568a0641f00ae39d3e0b97a5f306d1f11bf3a5df1d54d2fb350e8f8fd89cb8584f62c95e46b7619f730befbc38b51b27dac1f02e89afde116a0943f2b801

data/README.md

@@ -1,9 +1,9 @@
 # Mobility Uniqueness
 
-Mobility Uniqueness is a Ruby gem that extends the [Mobility](https://github.com/shioyama/mobility) gem by enabling uniqueness validation on translated attributes across multiple locales. With this gem, you can validate the uniqueness of translations on attributes in ActiveRecord models, ensuring consistency and preventing duplicate entries in different languages. It's designed to work seamlessly with **Mobility's default :key_value backend**, integrating directly into your model validations.
+Mobility Uniqueness is a Ruby gem that extends the [Mobility](https://github.com/shioyama/mobility) gem by enabling uniqueness validation on translated string attributes across multiple locales. With this gem, you can validate the uniqueness of translations on attributes in ActiveRecord models, ensuring consistency and preventing duplicate entries in different languages. It's designed to work seamlessly with **Mobility's default :key_value backend**, integrating directly into your model validations.
 
 ## Methods
-* `validates_uniqueness_of_translated(*args, message: 'custom message')` - Validates that the specified attributes are unique across all locales
+* `validates_uniqueness_of_translated(*args, message: 'custom message')` - Validates that the specified string attributes are unique across all locales
 
 Default error message is _'violates uniqueness constraint'_ if the error message is not specified.
 
@@ -21,39 +21,22 @@ bundle add mobility_uniqueness
 class Book < ApplicationRecord
   extend Mobility
 
-  translates :name, type: :string
-  translates :description, type: :text
+  translates :title, type: :string
 
-  validates_uniqueness_of_translated :name, :description
+  validates_uniqueness_of_translated :title
 end
 ```
 
 ### Custom Error Messages
 
-You can customize the error message for all:
+You can customize the error message:
 ```rb
 class Book < ApplicationRecord
   extend Mobility
 
-  translates :name, type: :string
-  translates :description, type: :text
+  translates :title, type: :string
 
-  validates_uniqueness_of_translated :name, :description, message: 'custom message'
-end
-```
-
-### Attribute-Specific Error Messages
-
-Specify different error messages per attribute for more granular feedback:
-```rb
-class Book < ApplicationRecord
-  extend Mobility
-
-  translates :name, type: :string
-  translates :description, type: :text
-
-  validates_uniqueness_of_translated :name, message: 'name is not unique'
-  validates_uniqueness_of_translated :description, message: 'description should be unique'
+  validates_uniqueness_of_translated :title, message: 'custom message'
 end
 ```
 

data/lib/mobility_uniqueness/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MobilityUniqueness
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/mobility_uniqueness.rb

@@ -5,26 +5,33 @@ module MobilityUniqueness
     def validates_uniqueness_of_translated(*args)
       return unless defined?(Mobility)
 
-      opitons = args.extract_options!
+      options = args.extract_options!
+      message = options[:message] || 'violates uniqueness constraint'
 
       before_validation do
-        message = opitons[:message] || 'violates uniqueness constraint'
-
         query_classes = args.group_by { |attr| mobility_query_class(attr) }
         query_classes.each do |query_class, attributes|
-          values = Mobility.available_locales.map do |locale|
-            attributes.map { |attr| send(:"#{attr}_#{locale}") }
-          end.flatten
-
-          count_by_group = query_class.where(locale: Mobility.available_locales)
-                                      .where(translatable_type: self.class.to_s)
-                                      .where(key: attributes, value: values)
-                                      .where.not(translatable_id: id)
-                                      .group(:key, :locale, :value)
-                                      .count
-
-          count_by_group.each do |(key, locale, _value), count|
-            errors.add(:"#{key}_#{locale}", message) unless count.zero?
+          next unless query_class
+
+          Mobility.available_locales.each do |locale|
+            # Retrieve values for the current locale and attribute
+            values = attributes.map { |attr| send(:"#{attr}_#{locale}") }.compact
+
+            next if values.empty?
+
+            # Checking for conflicts in the database
+            conflicts = query_class
+                        .where(locale: locale) # Only compare values in the same locale
+                        .where(translatable_type: self.class.to_s)
+                        .where(key: attributes, value: values)
+                        .where.not(translatable_id: id)
+                        .group(:key, :locale, :value)
+                        .count
+
+            # If there are conflicts, add a validation error for the key
+            conflicts.each do |(key, locale, _value), count|
+              errors.add(:"#{key}_#{locale}", message) unless count.zero?
+            end
           end
         end
       end
@@ -32,18 +39,16 @@ module MobilityUniqueness
   end
 
   def mobility_query_class(attr)
-    attr_type = self.class.attribute_types[attr&.to_s].type
-
+    # Dynamically retrieve the appropriate query class based on attribute type
+    attr_type = self.class.attribute_types[attr.to_s]&.type
     translations = {
-      string: Mobility::Backends::ActiveRecord::KeyValue::StringTranslation,
-      text: Mobility::Backends::ActiveRecord::KeyValue::TextTranslation
+      string: Mobility::Backends::ActiveRecord::KeyValue::StringTranslation
     }
 
-    translations[attr_type]
+    translations[attr_type] || raise(ArgumentError, "Unsupported attribute type for #{attr}")
   end
 end
 
-# Automatically include the in all ActiveRecord models
 ActiveSupport.on_load(:active_record) do
   include MobilityUniqueness
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility_uniqueness
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - egemen öztürk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-17 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord