glib-web 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a318fa9377a19b89642be242b820ee9e2670f0bff29e6a346806b76f8906b16f
-  data.tar.gz: 8797bfd1ab030db735284adcf8c9ddf86441dbd0b189273ca8e7cd0f4d8cdd57
+  metadata.gz: b13a0d5398903f6b1e6795d7a34dce9c064dd05a7df740d47cd15690fdd906eb
+  data.tar.gz: 4195513ba393a6d4f0fff811f01355b2aef1793caf3c3fb7d609d3df3d31cfc2
 SHA512:
-  metadata.gz: dfe9421dcc2b4897220d5a7cea9ef1e258bbfbd9a4667b5a5c40e0a39876f7cc666b40b4b0f0efe4d3efb8020d888542d1757d625cf83b3cabcb53a6a27787e6
-  data.tar.gz: 3f6abcd4c53f2abd78b7a96c539c59dec16559147502b28ba3d4fb80f2bdea756a3e51f887082429043d8322bba4d75bb318fcaef27a1ffac121708aa4012d6e
+  metadata.gz: 7162957076123f6f803f6c854f1099bf1e44f1ff27c7900d24ef3eb3ab259491459c3071a343683d800cab007d744d7ddfe0fba31e47c4b09fd8e32abcbb0e1e
+  data.tar.gz: 816b64172b98f4e1907894b93265adad533d319b0561fe2f73439d0c47c7e9da52a67d0bf6eb7a94a5d54ca50755e88ae2a6f143e6bc08324b2e486f5c981d1e

data/app/helpers/glib/dynamic_texts_helper.rb

@@ -1,12 +1,13 @@
 module Glib
   module DynamicTextsHelper
-    def dt(key, default_value = '', scope = 'itinerarybuilder')
+    def dt(key, default_value = '', options: { scope: 'itinerarybuilder', lang: 'en' })
       new_key = key
+
       if key.starts_with?('.')
         new_key = "#{controller_name}.#{action_name}#{key}"
       end
 
-      Glib::Text.get_content(scope, new_key, default_value)
+      Glib::Text.get_content(new_key, default_value, options: options)
     end
   end
 end

data/app/models/glib/text.rb

@@ -1,20 +1,21 @@
 module Glib
   class Text < Glib::DynamicTextRecord
     validates :scope, presence: true
-    validates :key, presence: true, uniqueness: { scope: :scope }
+    validates :lang, presence: true
+    validates :key, presence: true, uniqueness: { scope: [:scope, :lang] }
     validates :content, presence: true
 
     after_save :update_to_redis
 
-    def self.get_content(scope, key, default_value)
-      scope_key = "#{scope}.#{key}"
+    def self.get_content(key, default_value, options:)
+      scope_key = "#{options[:scope]}.#{options[:lang]}.#{key}"
 
       unless content = $dt_redis.get(scope_key)
-        if text = find_by(scope: scope, key: key)
+        if text = find_by(scope: options[:scope], lang: options[:lang], key: key)
           update_content(scope_key, text.content)
           content = text.content
         else
-          create(scope: scope, key: key, content: default_value)
+          create(scope: options[:scope], lang: options[:lang], key: key, content: default_value)
           update_content(scope_key, default_value)
           content = default_value
         end
@@ -29,7 +30,7 @@ module Glib
       end
 
       def update_to_redis
-        Glib::Text.update_content("#{scope}.#{key}", content)
+        Glib::Text.update_content("#{scope}.#{lang}.#{key}", content)
       end
   end
 end

data/lib/generators/glib/install_generator.rb

@@ -10,6 +10,7 @@ module Glib
       def copy_initializer
         template '20191017062519_create_texts.rb', 'db/dynamic_text_migrate/20191017062519_create_texts.rb'
         template '20191024063257_add_scope_to_texts.rb', 'db/dynamic_text_migrate/20191024063257_add_scope_to_texts.rb'
+        template '20191112095018_add_lang_to_texts.rb', 'db/dynamic_text_migrate/20191112095018_add_lang_to_texts.rb'
         template 'dynamic_text.rb', 'config/initializers/dynamic_text.rb'
         template 'database.yml', 'config/database.yml'
       end

data/lib/generators/templates/20191112095018_add_lang_to_texts.rb

@@ -0,0 +1,7 @@
+class AddLangToTexts < ActiveRecord::Migration[6.0]
+  def change
+    add_column :texts, :lang, :string
+    remove_index :texts, [:scope, :key]
+    add_index :texts, [:scope, :lang, :key], unique: true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - ''
@@ -117,6 +117,7 @@ files:
 - lib/generators/glib/install_generator.rb
 - lib/generators/templates/20191017062519_create_texts.rb
 - lib/generators/templates/20191024063257_add_scope_to_texts.rb
+- lib/generators/templates/20191112095018_add_lang_to_texts.rb
 - lib/generators/templates/database.yml
 - lib/generators/templates/dynamic_text.rb
 - lib/glib-web.rb