releaf-core 3.0.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bd0667aa1fffd4e7fd143dfa33983a318bbc7bbf522224b064410991f67deb1
-  data.tar.gz: 128e91a616263be4a7414ebb5717cb4caac549df9292d4ade4f004d879b978df
+  metadata.gz: d97b42910cad359be7da883a5c2c5d47e8a047df8d141d35aeae39d087e401b2
+  data.tar.gz: 8f9a5c69781136512448cb5bf42bd45d1edeefaed550c509f1c0dae5fedae7fa
 SHA512:
-  metadata.gz: 79c6f2444daddebf14c95b3a33ab9b89b26c5ad00217625d417b7ed21d25c962713db813364c66877ac9d629881c53d9e516c866c0f12000a5a347e3849466f5
-  data.tar.gz: 1742fd4de64251ea131a64806819fe3821f95fe787c1127708756dfeb759a41302ad4068b73a146223e7c87245c956ffecc18753c6a598ffab1993ae46681697
+  metadata.gz: 743464b89a99b1046320f0d87559a8154f93c469c4267a420b29e5e8b8f9ea6e3c92422d89f45a10e0de38782365824babefcae2fd3fe8c4804dc76fe431880d
+  data.tar.gz: b09d84e130f9263b21d3ed93e51d6f77c4801e2d5a37bd6f710772606ae3271b4579f4183e4eefea68b9a85d09a2386ba4d25e373eb14894465f56a97a62fa40

data/app/assets/javascripts/releaf/include/field.type_richtext.js

@@ -13,9 +13,8 @@ window.ckeditor_configuration = {
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             ['Subscript', 'Superscript'],
             ['NumberedList', 'BulletedList'],
-            ['Link', 'Unlink', 'Anchor', 'Image', 'MediaEmbed' ],
+            ['Link', 'Unlink', 'Anchor', 'Image'],
             ['Source', 'Maximize', 'ShowBlocks']],
-        extraPlugins: 'mediaembed'
     }
 
 };
@@ -85,22 +84,7 @@ jQuery(function()
             textarea.attr( 'id', 'richtext_' + String((new Date()).getTime()).replace(/\D/gi,'') );
         }
 
-        if (textarea.data('attachment-upload-url') || textarea.data('attachment-browse-url'))
-        {
-            if (textarea.data('attachment-browse-url'))
-            {
-                config.filebrowserBrowseUrl = textarea.data('attachment-browse-url');
-            }
-
-            if (textarea.data('attachment-upload-url'))
-            {
-                config.filebrowserUploadUrl = textarea.data('attachment-upload-url');
-            }
-        }
-        else
-        {
-            remove_toolbar_item(config.toolbar, 'Image');
-        }
+        remove_toolbar_item(config.toolbar, 'Image');
 
         if (textarea.data('external-stylesheet'))
         {

data/app/assets/javascripts/releaf/include/remote_validator.js

@@ -161,7 +161,7 @@ var RemoteValidator = function( form )
                 return;
             }
 
-            var wrap = (field_box.is('.i18n')) ? target.closest('.localization') : field_box;
+            var wrap = field_box;
 
             var error_box = wrap.find('.error-box');
 
@@ -177,11 +177,6 @@ var RemoteValidator = function( form )
             error_node.text( error.message );
 
             field_box.addClass('has-error');
-
-            if (field_box.is('.i18n'))
-            {
-                wrap.addClass('has-error');
-            }
         }
         else if (target.is('form'))
         {
@@ -255,9 +250,8 @@ var RemoteValidator = function( form )
         // if error fields still exist, focus to first visible
 
         // locate first input inside visible error fields,
-        // but for i18n fields exclude inputs inside .localization without .has-error
 
-        var focus_target = form.find('.field.has-error').filter(':visible').find(input_selector).not('.localization:not(.has-error) *').first();
+        var focus_target = form.find('.field.has-error').filter(':visible').find(input_selector).first();
 
         focus_target.trigger('focusprepare');
 
@@ -291,10 +285,6 @@ var RemoteValidator = function( form )
 
                 if (!except_validation_id || error_node.attr('data-validation-id') !== except_validation_id)
                 {
-                    if (field.is('.i18n'))
-                    {
-                        error_box.closest('.localization').removeClass('has-error');
-                    }
                     error_box.remove();
                 }
             });

data/app/assets/stylesheets/releaf/environment/mixins/blocks.scss

@@ -42,7 +42,7 @@
 
 @mixin pop-up-menu
 {
-    // used for floating pop-up menus (toolboxes, localization menus etc)
+    // used for floating pop-up menus (toolboxes, etc)
     @include block-list;
     display: none;
     position: absolute;

data/app/assets/stylesheets/releaf/layout/fields.scss

@@ -60,8 +60,7 @@ input.text
     min-height: steps(7);
     margin-left: steps(2);
 
-    &.has-error:not(.i18n),
-    &.i18n.has-error .localization.has-error
+    &.has-error:not(.i18n)
     {
         select,
         textarea,

data/app/assets/stylesheets/releaf/layout.scss

@@ -20,7 +20,6 @@
 @import 'releaf/layout/buttons';
 @import 'releaf/layout/forms';
 @import 'releaf/layout/fields';
-@import 'releaf/layout/localization';
 
 @import 'releaf/layout/notifications';
 @import 'releaf/layout/tables';

data/app/builders/releaf/builders/form_builder/fields.rb

@@ -2,7 +2,6 @@ module Releaf::Builders::FormBuilder::Fields
   include Releaf::Builders::FormBuilder::TextFields
   include Releaf::Builders::FormBuilder::AssociatedSetField
   include Releaf::Builders::FormBuilder::DateFields
-  include Releaf::Builders::FormBuilder::I18nFields
   include Releaf::Builders::FormBuilder::RichtextFields
   include Releaf::Builders::FormBuilder::NumberFields
   include Releaf::Builders::FormBuilder::FileFields

data/app/builders/releaf/builders/form_builder/richtext_fields.rb

@@ -16,9 +16,7 @@ module Releaf::Builders::FormBuilder::RichtextFields
       rows: 5,
       cols: 50,
       class: "richtext",
-      data: {
-        "attachment-upload-url" => (controller.respond_to?(:releaf_richtext_attachment_upload_url) ? controller.releaf_richtext_attachment_upload_url : '')
-      },
+      data: {},
     }
   end
 

data/app/builders/releaf/builders/utilities/resolve_attribute_field_method_name.rb

@@ -17,7 +17,7 @@ module Releaf::Builders::Utilities
     }
 
     def call
-      "releaf_#{field_type}_#{"i18n_" if localized_attribute?}field"
+      "releaf_#{field_type}_field"
     end
 
     def field_type
@@ -29,12 +29,7 @@ module Releaf::Builders::Utilities
     end
 
     def columns_class
-      localized_attribute? ? object.class::Translation : object.class
-    end
-
-    def localized_attribute?
-      @localized_attribute ||= (object.class.respond_to?(:translates?) && object.class.translates? &&
-                                object.class.translated_attribute_names.include?(attribute_name.to_sym))
+      object.class
     end
 
     def column_field_type_resolvers

data/app/controllers/releaf/action_controller.rb

@@ -11,7 +11,6 @@ class Releaf::ActionController < ActionController::Base
   include Releaf::ActionController::Ajax
   include Releaf::ActionController::Urls
   include Releaf::ActionController::Breadcrumbs
-  include Releaf::ActionController::RichtextAttachments
   include Releaf::ActionController::Views
   include Releaf::ActionController::Layout
   include Releaf::ActionController::Exceptions

data/app/helpers/releaf/button_helper.rb

@@ -37,7 +37,7 @@ module Releaf
 
       html = "".html_safe
       html << fa_icon(icon) if icon.present?
-      html << text if text.present?
+      html << text.to_s if text.present?
 
       if html.length < 1
         raise ArgumentError, "Either text or icon is required for buttons"

data/app/lib/releaf/default_searchable_fields.rb

@@ -7,24 +7,13 @@ module Releaf
     end
 
     def find
-      search_columns = possible_field_names & string_columns
-      search_columns << { translations: searchable_translated_string_columns } if has_searchable_translated_string_columns?
-      search_columns
+      possible_field_names & string_columns
     end
 
     def string_columns
       klass.columns.select { |column| column.type == :string }.map(&:name)
     end
 
-    def searchable_translated_string_columns
-      @searchable_translated_string_columns ||= self.class.new(klass::Translation).find
-    end
-
-    def has_searchable_translated_string_columns?
-      return false unless klass.translates?
-      searchable_translated_string_columns.present?
-    end
-
     def possible_field_names
       %w[
         email

data/app/lib/releaf/resource_base.rb

@@ -9,20 +9,12 @@ class Releaf::ResourceBase
     %w{id created_at updated_at}
   end
 
-  def localized_attributes?
-    resource_class.translates?
-  end
-
-  def localized_attributes
-    @localized_attributes ||= localized_attributes? ? resource_class.translated_attribute_names.map(&:to_s) : []
-  end
-
   def base_attributes
     resource_class.column_names
   end
 
   def values(include_associations: true)
-    list = base_attributes + localized_attributes - excluded_attributes
+    list = base_attributes - excluded_attributes
     list += associations_attributes if include_associations
     list
   end

data/app/lib/releaf/resource_params.rb

@@ -23,18 +23,6 @@ class Releaf::ResourceParams < Releaf::ResourceBase
     end
   end
 
-  def localized_attributes
-    super.inject([]) do |list, column|
-      list + localized_attribute_params(column)
-    end
-  end
-
-  def localized_attribute_params(column)
-    resource_class.globalize_locales.collect do|locale|
-      "#{column}_#{locale}"
-    end
-  end
-
   def associations_attributes
     associations.collect do |association|
       {"#{association.name}_attributes" => association_attributes(association)}

data/app/lib/releaf/resource_table_fields.rb

@@ -5,6 +5,6 @@ class Releaf::ResourceTableFields < Releaf::ResourceFields
   end
 
   def table_excluded_attributes
-    (base_attributes + localized_attributes).select{|c| c.match(/.*(_uid|_html)$/) }
+    base_attributes.select{|c| c.match(/.*(_uid|_html)$/) }
   end
 end

data/app/lib/releaf/search.rb

@@ -94,11 +94,6 @@ module Releaf
         join_condition = join_condition.and(where_scope) if where_scope.present?
       end
 
-      if other_class.ancestors.include?(Globalize::ActiveRecord::Translation)
-        # only search in current locale
-        join_condition = join_condition.and(table2[:locale].eq(I18n.locale.to_s))
-      end
-
       self.relation = relation.joins(arel_join(table1, table2, join_condition))
       table2
     end
@@ -106,8 +101,6 @@ module Releaf
     def extract_where_condition_from_scope(reflection, table_alias)
       tmp_relation = build_tmp_relation(reflection, table_alias)
 
-      return nil if tmp_relation.where_values_hash.blank?
-
       tmp_relation.arel.ast.cores.first.wheres
     end
 
@@ -115,7 +108,7 @@ module Releaf
       # Need to create tmp relation since setting table alias for actual klass
       # is a bad idea.
       klass = Class.new(reflection.klass) do
-        self.arel_table.table_alias = table_alias
+        self.arel_table.name = table_alias
       end
 
       klass.instance_exec(&reflection.scope)

data/lib/generators/dummy/templates/config/routes.rb

@@ -4,41 +4,4 @@ Dummy::Application.routes.draw do
     releaf_resources :books, :authors, :chapters, :publishers
     releaf_resources :banners, only: [:index, :show]
   end
-
-  # SINGLE NODE CLASS CASE:
-
-  # node_routes_for(HomePage) do
-    # get 'show', as: "home_page"
-  # end
-
-
-  # MULTIPLE NODE CLASSES CASE:
-
-  # automatic hostname constraints for all defined nodes/sites:
-  node_routing( Releaf::Content.routing ) do
-
-    node_routes_for(HomePage) do
-      get 'show', as: "home_page"
-    end
-
-    node_routes_for(TextPage) do
-      get 'show'
-    end
-
-  end
-
-  # manual hostname constraint blocks for nodes specific to a single site:
-  constraints Releaf::Content.routing['Node'][:constraints] do
-
-    # contacts page route will be only on main site
-    node_routes_for(ContactsController, node_class: 'Node') do
-      get 'show', as: "contacts_page"
-    end
-
-  end
-
-  root to: 'application#redirect_to_locale_root'
-
-  match "*not_found_path", to: "application#render_404", via: [:get, :post], format: false
-
 end

data/lib/generators/dummy/templates/initializers/releaf.rb

@@ -3,39 +3,14 @@ Releaf.application.configure do
 
   ### setup menu items and therefore available controllers
   config.menu = [
-    "admin/nodes",
     {name: "inventory", items: %w[admin/books admin/authors admin/publishers admin/banners]},
     {name: "permissions", items: %w[releaf/permissions/users releaf/permissions/roles]},
     "releaf/settings",
-    "releaf/i18n_database/translations"
    ]
 
   config.additional_controllers = %w[admin/chapters]
-  config.components = [Releaf::Core, Releaf::I18nDatabase, Releaf::Permissions, Releaf::Content]
+  config.components = [Releaf::Core, Releaf::Permissions]
   config.available_locales = ["en", "lv"]
   # conf.layout_builder_class_name = "CustomLayoutBuilder"
   # conf.permissions.devise_for 'releaf/admin'
-
-  config.content.resources = { 'Node' => { controller: 'Admin::NodesController' } }
-
-  # MULTIPLE NODES CASE:
-  # config.content.resources = {
-    # 'Node' => {
-      # controller: 'Releaf::Content::NodesController',
-      # routing: {
-        # site: "main_site",
-        # constraints: { host: /^(www\.)?releaf\.local$/ }
-      # }
-    # },
-    # 'OtherSite::OtherNode' => {
-      # controller: 'Admin::OtherSite::OtherNodesController',
-      # routing: {
-        # site: "other_site",
-        # constraints: { host: /^(www\.)?other\.releaf\.local$/ }
-      # }
-    # }
-  # }
-
-  # DEFAULT SINGLE NODE CASE:
-  # config.content.resources = { 'Node' => { controller: 'Releaf::Content::NodesController' } }
 end

data/lib/generators/dummy/templates/migrations/create_books.rb

@@ -5,6 +5,7 @@ class CreateBooks < ActiveRecord::Migration[5.0]
       t.integer   :year
       t.integer   :author_id
       t.string    :genre
+      t.string    :description
       t.text      :summary_html
       t.boolean   :active
       t.datetime  :published_at
@@ -16,8 +17,6 @@ class CreateBooks < ActiveRecord::Migration[5.0]
     end
 
     add_index :books, :author_id
-
-    Book.create_translation_table! description: :string
   end
 
   def down

data/lib/generators/dummy/templates/models/book.rb

@@ -6,9 +6,6 @@ class Book < ActiveRecord::Base
 
   validates_presence_of :title
 
-  translates :description
-  globalize_accessors
-
   # chapters may not be destroy
   accepts_nested_attributes_for :chapters
   accepts_nested_attributes_for :book_sequels, allow_destroy: true

data/lib/generators/releaf/templates/initializers/releaf.rb

@@ -3,15 +3,13 @@ Releaf.application.configure do
 
   ### setup menu items and therefore available controllers
   config.menu = [
-    "releaf/content/nodes",
     {name: "permissions", items: %w[releaf/permissions/users releaf/permissions/roles]},
-    "releaf/i18n_database/translations"
   ]
 
   # controllers that must be accessible by user, but are not visible in menu
   # should be added to this list
   # config.additional_controllers = %w[admin/chapters]
-  config.components = [Releaf::Core, Releaf::I18nDatabase, Releaf::Permissions, Releaf::Content]
+  config.components = [Releaf::Core, Releaf::Permissions]
 
   config.available_locales = ["en"]
   # config.layout_builder_class_name = 'CustomLayoutBuilder'

data/lib/generators/releaf/templates/seeds/seeds.rb

@@ -5,8 +5,6 @@
   Releaf::Permissions::User,
   Releaf::Permissions::Role,
   Releaf::Permissions::Permission,
-  Releaf::I18nDatabase::I18nEntry,
-  Releaf::I18nDatabase::I18nEntryTranslation
 ].each do |descendant|
   descendant.unscoped.delete_all
 end
@@ -37,14 +35,6 @@ Releaf::Permissions::User.create!(
 
 
 
-# }}}
-# Translations {{{
-
-puts "Importing translations"
-import_file_path = File.join(Gem.loaded_specs["releaf-i18n_database"].full_gem_path, "misc", "translations.xlsx")
-translations = Releaf::I18nDatabase::ParseSpreadsheetTranslations.call(file_path: import_file_path, extension: "xlsx")
-translations.each{|translation| translation.save! }
-
 # }}}
 
 # vim: set fdm=marker:

data/lib/releaf/humanize_missing_translations.rb

@@ -0,0 +1,13 @@
+module Releaf::HumanizeMissingTranslations
+  def call(exception, locale, key, options)
+    if key.present? && exception.is_a?(I18n::MissingTranslation)
+      key.to_s.split('.').last.humanize
+    else
+      super
+    end
+  end
+
+  def self.initialize_component
+    I18n.exception_handler.extend(self)
+  end
+end

data/lib/releaf/route_mapper.rb

@@ -8,9 +8,6 @@ module Releaf::RouteMapper
         get :confirm_destroy if route_enabled?(:destroy, args.last)
         get :toolbox if route_enabled?(:toolbox, args.last)
       end
-      collection do
-        post :create_releaf_richtext_attachment if route_enabled?(:releaf_richtext_attachments, args.last)
-      end
     end
   end
 

data/lib/releaf-core.rb

@@ -9,7 +9,6 @@ require 'jquery-ui-rails'
 require 'vanilla-ujs'
 require 'acts_as_list'
 require 'dragonfly'
-require 'globalize'
 require 'virtus'
 require 'sassc-rails'
 
@@ -34,10 +33,10 @@ module Releaf
     require 'releaf/route_mapper'
     require 'releaf/exceptions'
     require 'releaf/core_ext/array/reorder'
-    require 'releaf/rails_ext/globalize-accessors'
+    require 'releaf/humanize_missing_translations'
 
     def self.components
-      [Releaf::SettingsUI, Releaf::Root]
+      [Releaf::SettingsUI, Releaf::Root, Releaf::HumanizeMissingTranslations]
     end
   end