buddy_translatable 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61db17a047508f80e5a5d1e0c149efcea45ee59a1a2f06c6624a16691d49c6da
-  data.tar.gz: 89c815eba978977f31f2404105075534a2311452a36f46a3c910f5362c491a69
+  metadata.gz: 471f370e4433b4fa1f6bed2cd889933a01a816de64b0954cf3cd71e0ef96a9c8
+  data.tar.gz: 4373f6df4f1b01ec917ac826c2bf6ab48ad52af66273c25ca9a653ff4902a15c
 SHA512:
-  metadata.gz: eccbb1ed3369e12bf95a982153a40a4b018ebf2974c60c5464a910b108399b3902b6e9bba309d398fce303a8850f5a0ab1f6a0aa5f04d54669d99042e5a6ec63
-  data.tar.gz: e0f7595d85aa395ee44884f908fb3badba42f2bd8c77bdfddc143e8b3b823cf23687f715446f551f18c50d00179aa985570129183061d599dee2fe2a627c5004
+  metadata.gz: 9a4a811c654de28648359b5c986a6528167e0297ef8a6337c76dce5c8ed42fd247a0895d999cb13f83a7530da20c48cc8d11939fcae5e94087f59e2dcc468bbd
+  data.tar.gz: 89891a8d35b481fbfb2e432977f65a246f13f51bfbf7c45255459dfc1d5fd6618293a61bbfb21e11c4ab0dcccb7956572eb84280144299bd9e8e9792920ec4b0

data/README.md

@@ -90,41 +90,24 @@ class AddTitleToPosts < ActiveRecord::Migration
 end
 ```
 
-### Queries
+### Filters
 
-For searching you can use the following concern (Only `jsonb` format attributes):
+- Filter for an item with exact value in any locale
 ```ruby
-module JsonbQuerable
-  extend ActiveSupport::Concern
-
-  included do
-    scope :where_jsonb_value, lambda { |attr, value|
-      attr_query = sanitize_sql("#{table_name}.#{attr}")
-      where("EXISTS (SELECT 1 FROM jsonb_each_text(#{attr_query}) j
-                              WHERE j.value = ?)", value)
-    }
-
-    scope :where_jsonb_value_like, lambda { |attr, value, case_sens = false|
-      attr_query = sanitize_sql("#{table_name}.#{attr}")
-      condition = case_sens ? 'j.value LIKE ?' : 'lower(j.value) LIKE lower(?)'
-      where("EXISTS (SELECT 1
-                     FROM jsonb_each_text(#{attr_query}) j
-                     WHERE #{condition})", "%#{value}%")
-    }
-  end
-end
-
-class Post < ActiveRecord::Base
-  #...
-  include JsonbQuerable
-  #...
-end
+# where_<attr_name>_with(value: String)
+Post.where_key_with('ebay')
+```
 
-Post.where_jsonb_value_like(:key, 'ebay')
+- Filter for items with any locale that contains the provided value
+```ruby
+# where_<attr_name>_like(value: String)
+Post.where_key_like('bay')
 ```
-Simple queries:
+
+- Filter for items where current locale has the exact provided value
 ```ruby
-Post.where("title->>'en' = ?", 'hello')
+# where_<attr_name>_eq(value: String, locale?: Symbol)
+Post.where_key_eq('ebay')
 ```
 
 ## Development

data/lib/buddy_translatable/core.rb

@@ -32,6 +32,11 @@ module BuddyTranslatable
       define_method("#{attr}=") do |arg|
         send("#{attr}_data=", arg)
       end
+
+      # fixes "input shows original value when form.text_field" which uses value_before_type_cast
+      define_method "#{attr}_came_from_user?" do
+        false
+      end
     end
 
     # Sample:
@@ -55,7 +60,10 @@ module BuddyTranslatable
     #   model.title # print value for current locale
     def define_translatable_getters(attr)
       define_method("#{attr}_data") do
-        BuddyTranslatable.parse_translatable_data(self[attr])
+        res = self[attr] || {}
+        res = new_record? ? { I18n.locale => '' } : {} unless res.present?
+        res = JSON.parse(res) if res.is_a?(String)
+        res.symbolize_keys
       end
 
       define_method(attr) do |**_args|

data/lib/buddy_translatable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BuddyTranslatable
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
 end

data/lib/buddy_translatable.rb

@@ -7,15 +7,8 @@ module BuddyTranslatable
     base.extend BuddyTranslatable::Core
   end
 
-  def self.parse_translatable_data(data)
-    res = data || {}
-    res = {} unless res.present?
-    res = JSON.parse(res) if res.is_a?(String)
-    res.symbolize_keys
-  end
-
   def self.translatable_attr_json?(model_class, attr)
-    migrated = ActiveRecord::Base.connection.tables.include?(model_class.table_name)
+    migrated = ActiveRecord::Base.connection.tables.include?(model_class.table_name) rescue nil
     return :text unless migrated
 
     columns_data = model_class.try(:column_types) || model_class.try(:attribute_types)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buddy_translatable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Owen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler