buddy_translatable 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137d4c2784bfe06dbd6969ccb23c08230752a379d1c16cae7c86f2bd3a26c77c
-  data.tar.gz: 41137ae24aa4c5ce86f6e418824e44fcd6d7754041d0c4129c02587153895bdc
+  metadata.gz: 61db17a047508f80e5a5d1e0c149efcea45ee59a1a2f06c6624a16691d49c6da
+  data.tar.gz: 89c815eba978977f31f2404105075534a2311452a36f46a3c910f5362c491a69
 SHA512:
-  metadata.gz: 9428062d7b98175ab808858b9598e85bfbd19686862c72f7f1fc23e4d87e3b0323ff7b7606066cbee56b6c0a01e9432e2effc61598d5733fc8d1630e8c26ba8a
-  data.tar.gz: 5de3c7ecc7ce1f3c0aebaa0579952584552d9a446b0a9e4c8d1a4b8e37927d3cb170181a66be3092504aac8bcb9fedc0074d924b5a0c4253346e398d02fe1090
+  metadata.gz: eccbb1ed3369e12bf95a982153a40a4b018ebf2974c60c5464a910b108399b3902b6e9bba309d398fce303a8850f5a0ab1f6a0aa5f04d54669d99042e5a6ec63
+  data.tar.gz: e0f7595d85aa395ee44884f908fb3badba42f2bd8c77bdfddc143e8b3b823cf23687f715446f551f18c50d00179aa985570129183061d599dee2fe2a627c5004

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.2 (02-02-2023)
+- Fix: fix postgres migration error "current transaction is aborted, commands ignored until end of transaction block"
+
 # 1.0.1 (18-06-2021)
 - Fix: fix error when running rails db:migrate
 

data/Dockerfile

@@ -1,6 +1,6 @@
 FROM ruby:2.5
 RUN apt-get update -qq
-RUN gem install bundler
+RUN gem install bundler -v 2.3.26
 WORKDIR /app
 COPY . /app
 RUN bundle install

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buddy_translatable (1.0.1)
+    buddy_translatable (1.0.2)
       activerecord
       activesupport
       i18n
@@ -21,6 +21,7 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
+    byebug (11.1.3)
     concurrent-ruby (1.1.9)
     diff-lcs (1.3)
     i18n (1.8.10)
@@ -70,6 +71,7 @@ PLATFORMS
 DEPENDENCIES
   buddy_translatable!
   bundler
+  byebug
   pg
   rake
   rspec

data/README.md

@@ -11,7 +11,10 @@ Allows you to store text data in multiple languages. Based on [translateable](ht
 ```ruby
 class Post < ActiveRecord::Base
   include BuddyTranslatable
-  translatable :title, default_key: :de
+  translatable :title
+  # translatable :title, default_key: :de, available_locales: [:de, :en]
+  # default_key: by default use `I18n.default_locale`
+  # available_locales: by default `I18n.available_locales`
 end
 
 post = Post.create(title: { de: 'Hallo', en: 'Hello' })

data/lib/buddy_translatable/core.rb

@@ -2,7 +2,7 @@
 
 module BuddyTranslatable
   module Core
-    def translatable(*attrs, default_key: :en, available_locales: nil)
+    def translatable(*attrs, default_key: I18n.default_locale, available_locales: nil)
       available_locales ||= I18n.available_locales
       attrs.each do |attr|
         define_translatable_methods(attr, default_key.to_sym)
@@ -10,24 +10,23 @@ module BuddyTranslatable
       end
     end
 
-    # rubocop:disable Style/RescueModifier
     def define_translatable_methods(attr, fallback_locale)
-      format = (try(:column_types) || try(:attribute_types))[attr.to_s].type rescue :text
-      define_translatable_setters(attr, format)
+      is_json = BuddyTranslatable.translatable_attr_json?(self, attr)
+      define_translatable_setters(attr, is_json)
       define_translatable_key_getters(attr, fallback_locale)
       define_translatable_getters(attr)
+      define_translatable_finders(attr, is_json)
     end
-    # rubocop:enable Style/RescueModifier
 
     # Sample:
     #   model.title_data = { de: 'de val', en: 'en val' } # ==> replace value data
     #   model.title = { de: 'de val', en: 'en val' } # replace value data
     #   model.title = 'custom value' # sets new value for current locale
-    def define_translatable_setters(attr, format)
+    def define_translatable_setters(attr, is_json)
       define_method("#{attr}_data=") do |arg|
         data = send("#{attr}_data")
         data = arg.is_a?(Hash) ? arg.symbolize_keys : data.merge(I18n.locale => arg)
-        self[attr] = %i[string text].include?(format) ? data.to_json : data
+        self[attr] = is_json ? data : data.to_json
       end
 
       define_method("#{attr}=") do |arg|
@@ -41,7 +40,7 @@ module BuddyTranslatable
     def define_translatable_key_getters(attr, fallback_locale)
       define_method("#{attr}_data_for") do |key|
         value = send("#{attr}_data")
-        value[key] ||
+        value[key].presence ||
           value[fallback_locale].presence ||
           value.values.find(&:present?)
       end
@@ -56,10 +55,7 @@ module BuddyTranslatable
     #   model.title # print value for current locale
     def define_translatable_getters(attr)
       define_method("#{attr}_data") do
-        res = self[attr] || {}
-        res = new_record? ? { I18n.locale => '' } : {} unless res.present?
-        res = JSON.parse(res) if res.is_a?(String)
-        res.symbolize_keys
+        BuddyTranslatable.parse_translatable_data(self[attr])
       end
 
       define_method(attr) do |**_args|
@@ -82,5 +78,27 @@ module BuddyTranslatable
         end
       end
     end
+
+    # Sample string value: {\"en\":\"key-1\"}
+    def define_translatable_finders(attr, is_json) # rubocop:disable Metrics/MethodLength Metrics/AbcSize
+      attr_query = sanitize_sql("#{table_name}.#{attr}")
+      scope :"where_#{attr}_with", (lambda do |value|
+        return where("#{attr_query} like ?", "%\":\"#{value}\"%") unless is_json
+
+        where("EXISTS (SELECT 1 FROM jsonb_each_text(#{attr_query}) j WHERE j.value = ?)", value)
+      end)
+
+      scope :"where_#{attr}_like", (lambda do |value|
+        return where("#{attr_query} like ?", "%#{value}%") unless is_json
+
+        where("EXISTS (SELECT 1 FROM jsonb_each_text(#{attr_query}) j WHERE j.value LIKE ?)", "%#{value}%")
+      end)
+
+      scope :"where_#{attr}_eq", (lambda do |value, locale = I18n.locale|
+        return where("#{attr_query} like ?", "%\"#{locale}\":\"#{value}\"%") unless is_json
+
+        where("#{attr}->>'#{locale}' = ?", value)
+      end)
+    end
   end
 end

data/lib/buddy_translatable/version.rb

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

data/lib/buddy_translatable.rb

@@ -6,4 +6,20 @@ module BuddyTranslatable
   def self.included(base)
     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)
+    return :text unless migrated
+
+    columns_data = model_class.try(:column_types) || model_class.try(:attribute_types)
+    format = (columns_data[attr.to_s].type rescue :text) # rubocop:disable Style/RescueModifier
+    %i[string text].exclude?(format)
+  end
 end

metadata

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