active_record-translated 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d359bbfb6e7b356977ec10452c42131aa680559399023ffcffd0980b625135ae
-  data.tar.gz: 947a046dcfedab49d567160b1cc9240e1c7a49b11fca0b3bc2bb06ccf78e000b
+  metadata.gz: fee7618494b14c5e229293ffcd43a7bb6d195ff8c2093cd8b4dc6609528436e2
+  data.tar.gz: '0586e332ac2995c5094ca4d1e8c16cbf61f9db72a72c607e0905bc7442115fd6'
 SHA512:
-  metadata.gz: a58f249814f5390e80e2a6e1637134515767c2f8c635374e183051d6c6f5ef580f758b1f78be9c51e40c771d93129df844542b01537ce20b69dd1caea243cbe1
-  data.tar.gz: 176e32b5c73a13ee06df807d10d96acecd4bc9df7ee5f329133833d9e9f80d0377bb5277af6a472d672a3bcb05b2305e8c43a20ddba1c846a6538135f07916d7
+  metadata.gz: '089abbfe8e6a705d4d0812579f43aeb667aa9690d14f4b70313dc16f085052bea9f930a468d7fc00250f4f5e37b32048b20ac5826422ac1871f15925b88e24b2'
+  data.tar.gz: cbdc85d8ed2c6c011325ad34d7e6bf76dfd9f9651a06fc1dbeab1f008c921c1aa486ef6fe0a809a3a19391aa40e4d9a7a35c4a42e925c0a9ab1549039c5f5c81

data/README.md

@@ -192,16 +192,13 @@ Your translated model will automatically scope query results by the current loca
 
 #### Find by primary key
 
-The first and most obvious way is to just query a translation by its primary key. If you already now the ID, just do a normal #find:
+This gem wont break the default #find method. So if you already now the ID, just fetch it with a normal #find:
 
 ```ruby
-I18n.locale = :en # Ignored by #find when fetching a record by its unique primary key.
+I18n.locale = :en # Ignored by #find when fetching a record by its primary key.
 
-post = Post.find(4) # English translation
-post_es = Post.find(5) # Spanish translation
-
-post.locale # => :en
-post_es.locale #=> :es
+post = Post.find(5) # Spanish translation
+post.locale #=> :es
 ```
 
 #### Find by record_id
@@ -212,7 +209,27 @@ You can also find a translated record by using a record_id as the argument. This
 I18n.locale = :es
 
 post = Post.find("0e048f11-0ad9-48f1-b493-36e1f01d7994") 
-post_es.locale #=> :es
+post.locale #=> :es
+```
+
+#### Fetching collection of records
+
+All query results are scoped by the current locale. Use `#unscoped_locale` to disable the locale scope.
+
+```ruby
+
+Post.create(title: "Foo bar", ..., locale: :es) # es
+Post.create(title: "Foo bar", ..., locale: :es) # es
+Post.create(title: "Foo bar", ..., locale: :pt) # pt
+
+I18n.locale = :es
+Post.count #=> :2
+
+I18n.locale = :pt
+Post.count #=> :1
+
+# Returns all posts
+Post.unscoped_locale.count #=> :3
 ```
 
 License

data/lib/active_record/translated/model.rb

@@ -11,9 +11,11 @@ module ActiveRecord
         before_save :set_record_id
         before_save :set_locale
 
-        has_many :translations, -> { global }, class_name: "Post", foreign_key: :record_id, primary_key: :record_id
-        default_scope { where(locale: ActiveRecord::Translated.locale) }
-        scope :global, -> { unscope(where: :locale) }
+        has_many :translations, lambda {
+                                  unscoped_locale
+                                }, class_name: "Post", foreign_key: :record_id, primary_key: :record_id
+        default_scope -> { where(locale: ActiveRecord::Translated.locale) }
+        scope :unscoped_locale, -> { unscope(where: :locale) }
 
         class << self
           def find(*args)
@@ -21,7 +23,7 @@ module ActiveRecord
 
             return find_translated(id) if ActiveRecord::Translated.record_id?(id)
 
-            super(*args)
+            unscoped_locale.find(*args)
           end
 
           def exists?(id)
@@ -34,7 +36,7 @@ module ActiveRecord
           private
 
           def find_translated(record_id, allow_nil: false)
-            result = find_by(record_id: record_id)
+            result = where(record_id: record_id).first
             return result if result
 
             raise ActiveRecord::RecordNotFound unless allow_nil
@@ -42,7 +44,7 @@ module ActiveRecord
 
           # rubocop:disable Rails/WhereExists
           def exists_translated?(record_id)
-            where(record_id: record_id, locale: ActiveRecord::Translated.locale).exists?
+            translated.where(record_id: record_id).exists?
           end
           # rubocop:enable Rails/WhereExists
         end

data/lib/active_record/translated/version.rb

@@ -3,6 +3,6 @@
 # :nocov:
 module ActiveRecord
   module Translated
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/active_record/translated.rb

@@ -22,9 +22,7 @@ module ActiveRecord
       end
 
       def record_id?(string)
-        return false unless string.is_a?(String)
-
-        string.match(/^[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}$\z/)
+        string.is_a?(String) && string.match(/^[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}$\z/) ? true : false
       end
 
       def locale

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-translated
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rasmus Kjellberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable