releaf-core 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24550823b36995857b4010fe0adfab5d436046b9fb8b865dff703aae8fa5d18e
-  data.tar.gz: '0340851de16d3076de35a0993c4578c789ddee11ca51fca80b06105d83d50ca9'
+  metadata.gz: 2423ba1b1c8fb2daddb907defc0b31d60dc04e0921003588106cd2f47e517f97
+  data.tar.gz: b6141c254dbce6a61f069049b5b43f135751f74bbdfe8464b27bb3b7c725c471
 SHA512:
-  metadata.gz: 60637a9594b76ebba5401ea3a6717373c55b8786eea8eae274617c6247d114dd83837697ae3e14aa3baaab7463b2c52b8307ac9f512deec395508982ae37cbfc
-  data.tar.gz: bcec5f12fce19dde4f7229040811a1b44b4aa00182351d8a88a989b4b407b23ce594895c13ed73a96895461b9ad24cbdeb3ade8e4ed35277f4fb594724c0ec2c
+  metadata.gz: 14ec5b3914f8f94c4e743f90f230db77c09f34658e1b0353b64c670fa481d8c8e9fdb452e6585d8ad29764c41ee7a764b19854c7c2eccfea2d94e4a3591ad4fd
+  data.tar.gz: e676070bca61b17ddd1ebb31b362a6ec5de119328012b7ba09589b6095508be40d6b40edc4e6b5815aa387ed8f444b0390cf1d784386ebbc82cb2829a2345e48

data/app/builders/releaf/builders/base.rb

@@ -59,7 +59,7 @@ module Releaf::Builders::Base
 
   def t(key, options = {})
     options[:scope] = default_translation_scope unless options.key? :scope
-    I18n.t(key, options)
+    I18n.t(key, **options)
   end
 
   def translate_locale(locale)

data/app/helpers/releaf/application_helper.rb

@@ -19,7 +19,7 @@ module Releaf
     def translate(key, options = {})
       # prevent I18n from raising errors when translation is missing
       options.merge!(raise: false) unless options.key?(:raise)
-      super(key, options)
+      super(key, **options)
     end
     alias :t :translate
 
@@ -30,7 +30,7 @@ module Releaf
 
       container.each do|element|
         text, value = i18n_option_text_and_value(element).map { |item| item.to_s }
-        text = I18n.t("#{prefix}-#{text}", i18n_options.merge(default: text))
+        text = I18n.t("#{prefix}-#{text}", **i18n_options.merge(default: text))
         translated_container << [text, value]
       end
 

data/app/lib/releaf/action_controller/features.rb

@@ -4,7 +4,7 @@ module Releaf::ActionController::Features
   included do
     before_action :verify_feature_availability!
     helper_method :feature_available?
-    rescue_from Releaf::FeatureDisabled, with: :feature_disabled
+    rescue_from Releaf::FeatureDisabled, with: :access_denied
   end
 
   def verify_feature_availability!
@@ -33,11 +33,6 @@ module Releaf::ActionController::Features
     }
   end
 
-  def feature_disabled(exception)
-    @feature = exception.message
-    respond_with(nil, responder: action_responder(:feature_disabled))
-  end
-
   def feature_available?(feature)
     return false if feature.blank?
     return false if feature == :create_another && !feature_available?(:create)

data/app/lib/releaf/build_errors_hash.rb

@@ -8,30 +8,30 @@ module Releaf
       errors.inject({}) do |h, item|
         field_name = item.delete(:field_name)
         h[field_name] ||= []
-        h[field_name] << item
+        # filter out nested item duplicate errors due to #nested_attribute_errors functionality
+        # that returns all errors on each objects
+        h[field_name] << item if h[field_name].none?{|error| error == item}
         h
       end
     end
 
     def errors
-      resource.errors.map do |attribute, message|
-        format_error(attribute, message)
-      end.flatten
+      resource.errors.map{|error| format_error(error) }.flatten
     end
 
-    def attribute_error(attribute, message)
+    def attribute_error(error)
       {
-        field_name: field_name(attribute),
-        error_code: message.error_code,
-        message: message.to_s,
+        field_name: field_name(error.attribute),
+        error_code: error.type,
+        message: error.message.to_s,
       }
     end
 
-    def format_error(attribute, message)
-      if resource_attribute?(attribute)
-        attribute_error(attribute, message)
+    def format_error(error)
+      if resource_attribute?(error.attribute)
+        attribute_error(error)
       else
-        nested_attribute_errors(attribute)
+        nested_attribute_errors(error.attribute)
       end
     end
 

data/app/lib/releaf/responders.rb

@@ -12,7 +12,6 @@ module Releaf::Responders
       confirm_destroy: Releaf::Responders::ConfirmDestroyResponder,
       destroy: Releaf::Responders::DestroyResponder,
       access_denied: Releaf::Responders::AccessDeniedResponder,
-      feature_disabled: Releaf::Responders::FeatureDisabledResponder,
       page_not_found: Releaf::Responders::PageNotFoundResponder,
     }
   end

data/app/views/releaf/error_pages/access_denied.html.haml

@@ -1 +1 @@
-= render 'releaf/error_pages/error', message: t('You are not authorized to access %{controller}', controller: controller_name, default: 'You are not authorized to access %{controller}', scope: controller_scope_name)
+= render 'releaf/error_pages/error', message: t('You are not authorized to view this page', scope: controller_scope_name)

data/lib/releaf-core.rb

@@ -11,7 +11,6 @@ require 'acts_as_list'
 require 'dragonfly'
 require 'globalize'
 require 'virtus'
-require 'globalize-accessors'
 
 module Releaf
   module Core
@@ -30,7 +29,7 @@ module Releaf
     require 'releaf/route_mapper'
     require 'releaf/exceptions'
     require 'releaf/core_ext/array/reorder'
-    require 'releaf/rails_ext/validation_error_codes'
+    require 'releaf/rails_ext/globalize-accessors'
 
     def self.components
       [Releaf::SettingsUI, Releaf::Root]

data/lib/releaf/rails_ext/globalize-accessors.rb

@@ -0,0 +1,64 @@
+require 'globalize'
+
+module Globalize::Accessors
+  def globalize_accessors(options = {})
+    options.reverse_merge!(:locales => I18n.available_locales, :attributes => translated_attribute_names)
+    class_attribute :globalize_locales, :globalize_attribute_names, :instance_writer => false
+
+    self.globalize_locales = options[:locales]
+    self.globalize_attribute_names = []
+
+    each_attribute_and_locale(options) do |attr_name, locale|
+      define_accessors(attr_name, locale)
+    end
+
+    include InstanceMethods
+  end
+
+  def localized_attr_name_for(attr_name, locale)
+    "#{attr_name}_#{locale.to_s.underscore}"
+  end
+
+  private
+
+  def define_accessors(attr_name, locale)
+    define_getter(attr_name, locale)
+    define_setter(attr_name, locale)
+  end
+
+  def define_getter(attr_name, locale)
+    define_method localized_attr_name_for(attr_name, locale) do
+      globalize.stash.contains?(locale, attr_name) ? globalize.send(:fetch_stash, locale, attr_name) : globalize.send(:fetch_attribute, locale, attr_name)
+    end
+  end
+
+  def define_setter(attr_name, locale)
+    localized_attr_name = localized_attr_name_for(attr_name, locale)
+
+    define_method :"#{localized_attr_name}=" do |value|
+      attribute_will_change!(localized_attr_name) if value != send(localized_attr_name)
+      write_attribute(attr_name, value, :locale => locale)
+      translation_for(locale)[attr_name] = value
+    end
+    if respond_to?(:accessible_attributes) && accessible_attributes.include?(attr_name)
+      attr_accessible :"#{localized_attr_name}"
+    end
+    self.globalize_attribute_names << localized_attr_name.to_sym
+  end
+
+  def each_attribute_and_locale(options)
+    options[:attributes].each do |attr_name|
+      options[:locales].each do |locale|
+        yield attr_name, locale
+      end
+    end
+  end
+
+  module InstanceMethods
+    def localized_attr_name_for(attr_name, locale)
+      self.class.localized_attr_name_for(attr_name, locale)
+    end
+  end
+end
+
+ActiveRecord::Base.extend Globalize::Accessors

data/lib/releaf/rails_ext/validation_error_codes.rb

@@ -1,36 +0,0 @@
-module ActiveModel
-  class ErrorMessage < String
-    attr_accessor :error_code, :data
-
-    def initialize(message, error_code = nil, data = nil)
-      super message
-      @error_code = error_code
-      @data = data
-    end
-  end
-
-  class Errors
-    def add(attribute, message = nil, options = {})
-      # build error code from message symbol
-      error_code = normalize_error_code(attribute, message, options)
-      message = normalize_message(attribute, message, options)
-      if exception = options[:strict]
-        exception = ActiveModel::StrictValidationFailed if exception == true
-        raise exception, full_message(attribute, message)
-      end
-
-      # use customized String subclass with "error_code" attribute
-      self[attribute] << ErrorMessage.new(message, error_code, options[:data])
-    end
-
-    def normalize_error_code(_attribute, message, options)
-      if !options[:error_code].blank?
-        options[:error_code]
-      elsif message.class == Symbol
-        message
-      else
-        :invalid
-      end
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - CubeSystems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -268,28 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: globalize-accessors
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
@@ -820,7 +806,6 @@ files:
 - app/lib/releaf/responders/confirm_destroy_responder.rb
 - app/lib/releaf/responders/destroy_responder.rb
 - app/lib/releaf/responders/error_responder.rb
-- app/lib/releaf/responders/feature_disabled_responder.rb
 - app/lib/releaf/responders/page_not_found_responder.rb
 - app/lib/releaf/search.rb
 - app/lib/releaf/settings/normalize_value.rb
@@ -839,7 +824,6 @@ files:
 - app/views/releaf/action/toolbox.ruby
 - app/views/releaf/error_pages/_error.html.haml
 - app/views/releaf/error_pages/access_denied.html.haml
-- app/views/releaf/error_pages/feature_disabled.html.haml
 - app/views/releaf/error_pages/page_not_found.html.haml
 - lib/generators/dummy/install_generator.rb
 - lib/generators/dummy/templates/assets/config/manifest.js
@@ -918,6 +902,7 @@ files:
 - lib/releaf/engine.rb
 - lib/releaf/exceptions.rb
 - lib/releaf/instance_cache.rb
+- lib/releaf/rails_ext/globalize-accessors.rb
 - lib/releaf/rails_ext/validation_error_codes.rb
 - lib/releaf/root.rb
 - lib/releaf/root/configuration.rb
@@ -946,7 +931,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: core gem for releaf

data/app/lib/releaf/responders/feature_disabled_responder.rb

@@ -1,9 +0,0 @@
-module Releaf::Responders
-  class FeatureDisabledResponder < ActionController::Responder
-    include Releaf::Responders::ErrorResponder
-
-    def status_code
-      403
-    end
-  end
-end

data/app/views/releaf/error_pages/feature_disabled.html.haml

@@ -1 +0,0 @@
-= render 'releaf/error_pages/error', message: t('%{feature} feature disabled for %{controller}', feature: @feature, controller: controller_name,  scope: controller_scope_name, default: '%{feature} feature disabled for %{controller}')