rocket_cms 0.27.4 → 0.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e87e8f21b413352ec6dab08ad9aa538a87b59a29b6f0ecaf2e254a71f6c8664b
-  data.tar.gz: 72256795815accfa41bf8acd813512c9d966b05a68411a2e31875b05e9a3bcfa
+  metadata.gz: 2e9dd9cc09cefc19411ab3acd4f132b604a0df4b0cdba7b75f24f6a067565fbc
+  data.tar.gz: 86c67eb7e480f165f10cd79ce8b357053d47f9d419e4171e8658fa1ff266753f
 SHA512:
-  metadata.gz: c78abbd3f94574a8732c99b2d2368b587bd8f29a7a1ebe366f3386e6940a892644a0e3c195276d6cb1ccf0d3b6e98ad5be8231b806e4d63f35f798a4e1e4f1aa
-  data.tar.gz: 510a93c15ef45b6efd83f746a7ed71dcb4560bee7a0d9c2ae097d9e9dd2e5c6eade76d7f9d27452ef8ad194001e9f702157c16989707b5e313d33b1f5ab2b7b3
+  metadata.gz: f78102a32539492bbcb0cc50b95e274adaf37cd8678f5a2483d3e8213659b155dec8e177259fd4650563489dc0fc79e910cb7f059949c051f7c4ba8ffb072217
+  data.tar.gz: 38b0c4ac253499dd99ca3532d47616c176458765661cf2606c11b8e828fd398470534980eb7206b918f0d974cce6fe97c26e76fa0db2535530f872163c645ccd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.27.4)
+    rocket_cms (0.27.5)
       addressable
       coffee-rails
       jquery-rails

data/README.md

@@ -128,28 +128,128 @@ RocketCMS.configure do |rc|
 end
 ```
 
-Add ```rails_admin_hstore_translate``` or ```hstore_translate``` gem if using PostgreSQL:
+Add ```rails_admin_translate```:
 
 ```ruby
-gem 'rails_admin_hstore_translate'
+gem 'rails_admin_translate'
 ```
 
-or
+And, for ActiveRecord a translation gem you wish to use (mongoid should work with built-in localization):
 
 ```ruby
-gem 'hstore_translate'
+gem 'json_translate'
 ```
 
 or
 
 ```ruby
-gem 'jsonb_translate' # requires postgresql 9.4
+gem 'globalize'
 ```
 
-Add ```rails_admin_mongoid_localize_field``` gem if using MongoDB:
+Create your models, or, if adding localization to existing app, migrate your locale data.
 
-```ruby
-gem 'rails_admin_mongoid_localize_field'
+Example for globalize (needs adjustment):
+
+```
+class AddTranslations < ActiveRecord::Migration
+  def change
+    reversible do |dir|
+      dir.up do
+        I18n.with_locale(:ru) do
+          Page.create_translation_table!({
+            name: :string,
+            content: :text,
+          }, {
+            migrate_data: true,
+            #remove_source_columns: true,
+          })
+
+          News.create_translation_table!({
+            name: :string,
+            excerpt: :string,
+            content: :text,
+          }, {
+            migrate_data: true,
+            #remove_source_columns: true,
+          })
+
+          Seos.create_translation_table!({
+            h1: :string,
+            title: :string,
+            keywords: :text,
+            description: :text,
+            og_title: :string,
+          }, {
+            migrate_data: true,
+            #remove_source_columns: true,
+          })
+        end
+      end
+
+      dir.down do
+        I18n.with_locale(:ru) do
+          [Page, News, Menu, Seo].drop_translation_table!(migrate_data: true)
+        end
+      end
+    end
+```
+
+Example for json_translate (needs adjustment):
+
+```
+class AddLocales < ActiveRecord::Migration[5.1]
+  def change
+    add_column :pages, :name_translations, :jsonb, default: {}
+    add_column :pages, :content_translations, :jsonb, default: {}
+
+    add_column :news, :name_translations, :jsonb, default: {}
+    add_column :news, :excerpt_translations, :jsonb, default: {}
+    add_column :news, :content_translations, :jsonb, default: {}
+
+    add_column :menus, :name_translations, :jsonb, default: {}
+    add_column :seos, :h1_translations, :jsonb, default: {}
+    add_column :seos, :title_translations, :jsonb, default: {}
+    add_column :seos, :keywords_translations, :jsonb, default: {}
+    add_column :seos, :description_translations, :jsonb, default: {}
+    add_column :seos, :og_title_translations, :jsonb, default: {}
+
+    reversible do |dir|
+      dir.up do
+        execute "UPDATE pages SET name_translations = json_build_object('ru', \"name\")"
+        execute "UPDATE pages SET content_translations = json_build_object('ru', \"content\")"
+        execute "UPDATE news SET name_translations = json_build_object('ru', \"name\")"
+        execute "UPDATE news SET content_translations = json_build_object('ru', \"content\")"
+        # etc
+      end
+      dir.down do
+        raise 'irreversible'
+      end
+    end
+  end
+end
+```
+### BACKUP YOUR DB
+
+then drop old fields, or you will have errors with required fields being null
+
+```
+class DropLocale < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :pages, :name
+    remove_column :pages, :content
+
+    remove_column :news, :name
+    remove_column :news, :excerpt
+    remove_column :news, :content
+
+    remove_column :menus, :name
+    remove_column :seos, :h1
+    remove_column :seos, :title
+    remove_column :seos, :keywords
+    remove_column :seos, :description
+    remove_column :seos, :og_title
+  end
+end
 ```
 
 ### Capistrano generator
@@ -159,7 +259,7 @@ gem 'rails_admin_mongoid_localize_field'
 
 designed to be used together with our ansible app setup script.
 
-### Alternative capistrano task (can be used with non-configured app)
+### Alternative capistrano task (can be used with non-configured app \ without db)
 
     bundle exec rocket_cms_capify Games games.ru
 

data/app/controllers/concerns/rs_localizeable.rb

@@ -7,17 +7,20 @@ module RsLocalizeable
       Settings.ns_fallback = "main"
     end
   end
+
   private
+
   def default_url_options(options={})
     {locale: params[:locale]}
   end
+
   def nav_get_menu_items(type)
     pages = ::Menu.find(type.to_s).pages.enabled
     if RocketCMS.mongoid?
       pages = pages.where(:"name.#{I18n.locale}".exists => true)
     elsif RocketCMS.active_record?
       if defined?(JsonbTranslate)
-        
+
         pages = pages.where(["(name_translations -> ?)::text != ''", I18n.locale])
       elsif defined?(HstoreTranslate)
         pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
@@ -25,11 +28,17 @@ module RsLocalizeable
     end
     pages.sorted.to_a
   end
+
   def nav_get_url(item)
     (params[:locale].blank? ? "" : "/#{params[:locale]}") + (item.redirect.blank? ? item.fullpath : item.redirect)
   end
+
   def find_seo_extra(path)
-    Page.enabled.where(fullpath: path.gsub(/(\/ru|\/en)/, "")).first
+    r = path.gsub(/(\/ru|\/en)/, "")
+    if r.blank?
+      r = "/"
+    end
+    Page.enabled.where(fullpath: r).first
   end
 end
 

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.27.4'
+  VERSION = '0.27.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.27.4
+  version: 0.27.5
 platform: ruby
 authors:
 - glebtv