releaf-core 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2423ba1b1c8fb2daddb907defc0b31d60dc04e0921003588106cd2f47e517f97
-  data.tar.gz: b6141c254dbce6a61f069049b5b43f135751f74bbdfe8464b27bb3b7c725c471
+  metadata.gz: cf0ce248be934f51e65b01bf42bf8fa3d46c82163f5dee629d42536e480c1dbf
+  data.tar.gz: 49b27b2b95128d445129d4c3d4fad7e1410ea750ef1c3235daecb0bb845ca95c
 SHA512:
-  metadata.gz: 14ec5b3914f8f94c4e743f90f230db77c09f34658e1b0353b64c670fa481d8c8e9fdb452e6585d8ad29764c41ee7a764b19854c7c2eccfea2d94e4a3591ad4fd
-  data.tar.gz: e676070bca61b17ddd1ebb31b362a6ec5de119328012b7ba09589b6095508be40d6b40edc4e6b5815aa387ed8f444b0390cf1d784386ebbc82cb2829a2345e48
+  metadata.gz: 886526531af17482e95918a74c28de9cc261d32543a6c0978556743a9bded4debbcebc1c1e420321b493dfb2124ac47e6aec03d9ec3fd9773ba3502774dbc3f7
+  data.tar.gz: e974d509669fe47308c49ddbbdb8c86d54a7c035af8dc1eb84e3dd16aa8261fe7a09d8484766d2c4c88d07f8f9bcbd15339da60cb7a13b92b829e4d43de97a04

data/app/builders/releaf/builders/table_builder.rb

@@ -174,7 +174,6 @@ class Releaf::Builders::TableBuilder
     I18n.l(value, format: format) unless value.nil?
   end
 
-
   def format_time_content(resource, column)
     value = column_value(resource, column)
     format = Releaf::Builders::Utilities::DateFields.date_or_time_default_format(:time)

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

@@ -7,10 +7,10 @@ module Releaf::ActionController::Exceptions
   end
 
   def page_not_found
-    respond_with(nil, responder: action_responder(:page_not_found))
+    render "releaf/error_pages/page_not_found", status: :not_found, formats: :html
   end
 
   def access_denied
-    respond_with(nil, responder: action_responder(:access_denied))
+    render "releaf/error_pages/forbidden", status: :forbidden, formats: :html
   end
 end

data/app/lib/releaf/responders.rb

@@ -11,8 +11,6 @@ module Releaf::Responders
       update: Releaf::Responders::AfterSaveResponder,
       confirm_destroy: Releaf::Responders::ConfirmDestroyResponder,
       destroy: Releaf::Responders::DestroyResponder,
-      access_denied: Releaf::Responders::AccessDeniedResponder,
-      page_not_found: Releaf::Responders::PageNotFoundResponder,
     }
   end
 

data/app/models/releaf/settings.rb

@@ -1,4 +1,32 @@
-class Releaf::Settings < RailsSettings::Base
+class Releaf::Settings < ActiveRecord::Base
+
+  self.table_name = table_name_prefix + "settings"
+
+  class SettingNotFound < RuntimeError; end
+
+  belongs_to :thing, polymorphic: true, optional: true
+
+  # get the value field, YAML decoded
+  def value
+    YAML.load(self[:value], permitted_classes: [DateTime, Time, Date]) if self[:value].present?
+  end
+
+  # set the value field, YAML encoded
+  def value=(new_value)
+    self[:value] = new_value.to_yaml
+  end
+
+  def rewrite_cache
+    Rails.cache.write(cache_key, value)
+  end
+
+  def expire_cache
+    Rails.cache.delete(cache_key)
+  end
+
+  def cache_key
+    self.class.cache_key(var, thing)
+  end
 
   scope :registered, -> { where(var: registered_keys, thing_type: nil, thing_id: nil).order(:var) }
 
@@ -36,4 +64,129 @@ class Releaf::Settings < RailsSettings::Base
   def self.supported_types
     [:boolean, :date, :time, :datetime, :integer, :float, :decimal, :email, :text, :textarea, :richtext]
   end
+
+  class << self
+    def cache_prefix(&block)
+      @cache_prefix = block
+    end
+
+    def cache_key(var_name, scope_object)
+      scope = ["rails_settings_cached"]
+      scope << @cache_prefix.call if @cache_prefix
+      scope << "#{scope_object.class.name}-#{scope_object.id}" if scope_object
+      scope << var_name.to_s
+      scope.join("/")
+    end
+
+    def [](key)
+      return super(key) unless rails_initialized?
+      val = Rails.cache.fetch(cache_key(key, @object)) do
+        super(key)
+      end
+      val
+    end
+
+    # set a setting value by [] notation
+    def []=(var_name, value)
+      super
+      Rails.cache.write(cache_key(var_name, @object), value)
+      value
+    end
+
+    # get or set a variable with the variable as the called method
+    # rubocop:disable Style/MethodMissing
+    def method_missing(method, *args)
+      method_name = method.to_s
+      super(method, *args)
+    rescue NoMethodError
+      # set a value for a variable
+      if method_name[-1] == "="
+        var_name = method_name.sub("=", "")
+        value = args.first
+        self[var_name] = value
+      else
+        # retrieve a value
+        self[method_name]
+      end
+    end
+
+    # destroy the specified settings record
+    def destroy(var_name)
+      var_name = var_name.to_s
+      obj = object(var_name)
+      raise SettingNotFound, "Setting variable \"#{var_name}\" not found" if obj.nil?
+
+      obj.destroy
+      true
+    end
+
+    # retrieve all settings as a hash (optionally starting with a given namespace)
+    def get_all(starting_with = nil)
+      vars = thing_scoped.select("var, value")
+      vars = vars.where("var LIKE '#{starting_with}%'") if starting_with
+      result = {}
+      vars.each { |record| result[record.var] = record.value }
+      result.reverse_merge!(default_settings(starting_with))
+      result.with_indifferent_access
+    end
+
+    def where(sql = nil)
+      vars = thing_scoped.where(sql) if sql
+      vars
+    end
+
+    # get a setting value by [] notation
+    def [](var_name)
+      val = object(var_name)
+      return val.value if val
+    end
+
+    # set a setting value by [] notation
+    def []=(var_name, value)
+      var_name = var_name.to_s
+
+      record = object(var_name) || thing_scoped.new(var: var_name)
+      record.value = value
+      record.save!
+
+      value
+    end
+
+    def merge!(var_name, hash_value)
+      raise ArgumentError unless hash_value.is_a?(Hash)
+
+      old_value = self[var_name] || {}
+      raise TypeError, "Existing value is not a hash, can't merge!" unless old_value.is_a?(Hash)
+
+      new_value = old_value.merge(hash_value)
+      self[var_name] = new_value if new_value != old_value
+
+      new_value
+    end
+
+    def object(var_name)
+      return nil unless table_exists?
+      thing_scoped.where(var: var_name.to_s).first
+    end
+
+    def thing_scoped
+      unscoped.where("thing_type is NULL and thing_id is NULL")
+    end
+
+    def source(filename)
+      Default.source(filename)
+    end
+
+    def rails_initialized?
+      Rails.application && Rails.application.initialized?
+    end
+
+    private
+
+    def default_settings(starting_with = nil)
+      return {} unless Default.enabled?
+      return Default.instance if starting_with.nil?
+      Default.instance.select { |key, _| key.to_s.start_with?(starting_with) }
+    end
+  end
 end

data/lib/generators/releaf/templates/config/app.yml

@@ -0,0 +1,3 @@
+---
+# Custom Releaf settings should be added here
+{}

data/lib/releaf/root/settings_manager.rb

@@ -1,8 +1,16 @@
 module Releaf::Root
   class SettingsManager
+    CAST_MAP = {
+      "false" => false,
+      "true" => true,
+    }
 
     def self.read(controller:, key:)
-      controller.send(:cookies)[key]
+      value = controller.send(:cookies)[key]
+
+      return CAST_MAP[value] if CAST_MAP.key? value
+
+      value
     end
 
     def self.write(controller:, key:, value:)

data/lib/releaf-core.rb

@@ -1,4 +1,3 @@
-require 'rails-settings-cached'
 require 'ckeditor_rails'
 require 'will_paginate'
 require 'font-awesome-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - CubeSystems
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,33 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: dragonfly
+  name: net-smtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rails-settings-cached
+  name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ckeditor_rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
@@ -801,12 +801,9 @@ files:
 - app/lib/releaf/resource_table_fields.rb
 - app/lib/releaf/resource_utilities.rb
 - app/lib/releaf/responders.rb
-- app/lib/releaf/responders/access_denied_responder.rb
 - app/lib/releaf/responders/after_save_responder.rb
 - 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/page_not_found_responder.rb
 - app/lib/releaf/search.rb
 - app/lib/releaf/settings/normalize_value.rb
 - app/lib/releaf/settings/register.rb
@@ -823,7 +820,7 @@ files:
 - app/views/releaf/action/show.ruby
 - 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/forbidden.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
@@ -883,6 +880,7 @@ files:
 - lib/generators/dummy/templates/views/layouts/application.html.haml
 - lib/generators/dummy/templates/views/text_pages/show.haml
 - lib/generators/releaf/install_generator.rb
+- lib/generators/releaf/templates/config/app.yml
 - lib/generators/releaf/templates/initializers/haml.rb
 - lib/generators/releaf/templates/initializers/releaf.rb
 - lib/generators/releaf/templates/migrations/create_releaf_nodes.rb
@@ -931,7 +929,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: core gem for releaf

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

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

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

@@ -1,9 +0,0 @@
-module Releaf::Responders::ErrorResponder
-  def template
-    self.class.name.split("::").last.gsub(/Responder$/, "").underscore
-  end
-
-  def to_html
-    render "releaf/error_pages/#{template}", status: status_code
-  end
-end

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

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