effective_resources 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c872b773ee626165d7d0dee9d363e9375fd7702c9f0330ce2492c380fcac45b
-  data.tar.gz: eadd2e25503395461ea1823d8b9e719eb80cb405373fcae2253c3467631c18ea
+  metadata.gz: 56a161aa8bd3ad423f84fbe6f5a10b3b029eec746f72c186683472b5992d7357
+  data.tar.gz: d7826fbdaaeeca49f15e0fac3f76ac949086c3760048ca8c7d98bf3d295fa6c9
 SHA512:
-  metadata.gz: 2a91bcaab5fe78374b9771ddfe9117bb0594202e1e91dfc9d39922dc153b0ea38d64a5643365488097efb9fd258d8915fbdea12e7b9b7098fec456f46f9bbe30
-  data.tar.gz: b49ff8dc969fbb45db46a4db1ed97b3f369a2734db20e2c5957b28fe0aa5928045ef73d8170e06a975170dca40d8c5a5d09d3e31600b00904783ce35dca6ea2a
+  metadata.gz: 3accf197802ebe5e8bd825aad59759db334efb1c80bbce300625d391a3ca4a9075be45cc87410b1b536d8c6b817f9df11feccec7e36e6b045fdc77cdc58dffe3
+  data.tar.gz: 798d95af974616b3cfddf193b35cbbce8df47f74d73171dfae4a1de4b4445cfec5a97765e8b3ffa275dc57c5d3064cc6a0c0672c6e760a855bab006c0ccaa48b

data/README.md

@@ -362,7 +362,7 @@ rails test
 
 ## License
 
-MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
+MIT License. Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
 ## Contributing
 

data/app/controllers/concerns/effective/crud_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Effective
   module CrudController
     extend ActiveSupport::Concern
@@ -12,6 +13,7 @@ module Effective
     included do
       define_actions_from_routes
       define_callbacks :resource_render, :resource_before_save, :resource_after_save, :resource_after_commit, :resource_error
+      layout -> { resource_layout }
     end
 
     module ClassMethods
@@ -111,6 +113,11 @@ module Effective
       datatable
     end
 
+    def resource_layout
+      namespace = controller_path.include?('admin/') ? 'admin' : 'application'
+      defined?(Tenant) ? "#{Tenant.current}/#{namespace}" : namespace
+    end
+
     def resource_params_method_name
       ['permitted_params', "#{resource_name}_params", "#{resource_plural_name}_params"].each do |name|
         return name if respond_to?(name, true)

data/app/models/effective/attribute.rb

@@ -27,6 +27,7 @@ module Effective
       @type ||= (
         case obj
         when :boolean     ; :boolean
+        when :config      ; :config
         when :currency    ; :currency
         when :date        ; :date
         when :datetime    ; :datetime
@@ -73,6 +74,9 @@ module Effective
       case type
       when :boolean
         [true, 'true', 't', '1'].include?(value)
+      when :config
+        raise('expected an ActiveSupport::OrderedOptions') unless value.kind_of?(ActiveSupport::OrderedOptions)
+        parse_ordered_options(value)
       when :date, :datetime
         if (digits = value.to_s.scan(/(\d+)/).flatten).present?
           date = if digits.first.length == 4  # 2017-01-10
@@ -169,5 +173,14 @@ module Effective
       name == other.name && type == other.type
     end
 
+    # This returns a nested ActiveSupport::OrderedOptions.new config
+    def parse_ordered_options(obj)
+      return obj unless obj.kind_of?(Hash)
+
+      ActiveSupport::OrderedOptions.new.tap do |config|
+        obj.each { |key, value| config[key] = parse_ordered_options(value) }
+      end
+    end
+
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.5'.freeze
+  VERSION = '1.7.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails