effective_resources 1.7.8 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a4d2d6652da6f85e884ceb383ff012fda17863ad4b84c7cfaf5fec76a8632af
-  data.tar.gz: 155b5a31cc14908ea944978d940d550227bcb823e14bbc42e6f34108ece06c35
+  metadata.gz: 33448d396358208a6585b8beeff84f22b659bfc3676acbf9ed087d647acc56d3
+  data.tar.gz: 56b33689f40c4988cb600175623f5b3a3a4dde6192630d86188080244f5333ee
 SHA512:
-  metadata.gz: 4227d0379585019dafae032ac3300cc98ceed87f81bfcb45a35ab9b10c5e15f18dd7e6420b1973bef3e1567dd8ac71d78049b6ec6711153899568ed0d3398fc3
-  data.tar.gz: 700279f4126eefafe9b14d06b4dea16b9cf49c1f2b21fd472a17a80e3e2863d2f5d6318f481d3f862653d95f753960f5a0fbc79802301e3879422cec89866df8
+  metadata.gz: d8e3d0a86b310e31d991deb85b090c62167ba713e986d8a6c8ba30b3c3fa5583014d406af6e7d21cdbcc1f34fe5c8e8ec541d29e25835b724ebaa87e13b4cae1
+  data.tar.gz: 5908aa0138e84275ad07dcb500ccce0601a9ba7864ee98711eab0712a0075ea4fd0ad9adc33842fd423d3f6bc71d7f4d53319c3fbced1ec2ff90f28d8e27b527

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

@@ -36,8 +36,8 @@ module Effective
       raise 'expected an ActiveRecord resource' unless resource.respond_to?(:errors)
 
       messages = resource.errors.map do |error|
-        attribute = error.respond_to?(:attribute) ? error.attribute : error.first
-        message = error.respond_to?(:message) ? error.message : error.last
+        attribute = error.respond_to?(:attribute) ? error.attribute : error
+        message = error.respond_to?(:message) ? error.message : resource.errors[attribute].to_sentence
 
         if message[0] == message[0].upcase # If the error begins with a capital letter
           message

data/app/helpers/effective_resources_helper.rb

@@ -196,6 +196,7 @@ module EffectiveResourcesHelper
 
     render(resource, atts)  # Will raise the regular error
   end
+  alias_method :render_resource, :render_resource_partial
 
   # Tableize attributes
   # This is used by effective_orders, effective_logging, effective_trash and effective_mergery

data/app/models/concerns/acts_as_slugged.rb

@@ -42,6 +42,11 @@ module ActsAsSlugged
 
       where(slug: args.first).or(where(id: args.first)).first || raise(::ActiveRecord::RecordNotFound.new("Couldn't find #{name} with 'slug'=#{args.first}"))
     end
+
+    def find_by_slug_or_id(*args)
+      where(slug: args.first).or(where(id: args.first)).first
+    end
+
   end
 
   # Instance Methods

data/app/models/concerns/effective_devise_user.rb

@@ -66,6 +66,7 @@ module EffectiveDeviseUser
 
   module ClassMethods
     def permitted_sign_up_params # Should contain all fields as per views/users/_sign_up_fields
+      raise('please define a self.permitted_sign_up_params')
       [:email, :password, :password_confirmation, :first_name, :last_name, :name, :login]
     end
 
@@ -152,8 +153,6 @@ module EffectiveDeviseUser
   def send_devise_notification(notification, *args)
     raise('expected args Hash') unless args.respond_to?(:last) && args.last.kind_of?(Hash)
 
-
-
     if defined?(Tenant)
       tenant = Tenant.current || raise('expected a current tenant')
       args.last[:tenant] ||= tenant

data/app/models/concerns/has_many_rich_texts.rb

@@ -0,0 +1,54 @@
+# HasManyRichTexts
+#
+# Mark your model with 'has_many_rich_texts'
+# Then it will automatically create a region when using a method named rich_text_*
+# object.rich_text_body = "<p>Stuff</p>"
+# object.rich_text_body => ActionText::RichText<name="body" body="<p>Stuff</p>">
+
+module HasManyRichTexts
+  extend ActiveSupport::Concern
+
+  module Base
+    def has_many_rich_texts(options = nil)
+      include ::HasManyRichTexts
+    end
+  end
+
+  included do
+    has_many :rich_texts, class_name: 'ActionText::RichText', as: :record, inverse_of: :record, dependent: :destroy
+    accepts_nested_attributes_for :rich_texts, allow_destroy: true
+  end
+
+  module ClassMethods
+  end
+
+  # Find or build
+  def rich_text(name)
+    name = name.to_s
+    rich_texts.find { |rt| rt.name == name } || rich_texts.build(name: name)
+  end
+
+  def assign_rich_text_body(name, body)
+    rich_text(name).assign_attributes(body: body)
+  end
+
+  # Prevents an ActiveModel::UnknownAttributeError
+  # https://github.com/rails/rails/blob/main/activemodel/lib/active_model/attribute_assignment.rb#L48
+  def respond_to?(*args)
+    args.first.to_s.start_with?('rich_text_') ? true : super
+  end
+
+  def method_missing(method, *args, &block)
+    method = method.to_s
+    super unless method.start_with?('rich_text_')
+
+    name = method.chomp('=').sub('rich_text_', '')
+
+    if method.end_with?('=')
+      send(:assign_rich_text_body, name, *args)
+    else
+      send(:rich_text, name, *args)
+    end
+  end
+
+end

data/app/models/effective/resource.rb

@@ -7,6 +7,7 @@ module Effective
     include Effective::Resources::Init
     include Effective::Resources::Instance
     include Effective::Resources::Forms
+    include Effective::Resources::Generator
     include Effective::Resources::Klass
     include Effective::Resources::Model
     include Effective::Resources::Naming

data/app/models/effective/resources/generator.rb

@@ -0,0 +1,31 @@
+module Effective
+  module Resources
+    module Generator
+
+      def module_name
+        return nil unless class_name.split('::').length > 1
+        class_name.split('::').first
+      end
+
+      # Acpa
+      def module_namespace
+        return nil unless namespaces.present?
+        Array(namespaces + [nil]).map { |name| name.to_s.classify } * '::'
+      end
+
+      # Admin::Courses
+      def module_namespaced
+        (Array(namespaces).map { |name| name.to_s.classify } + [plural_name.classify.pluralize]) * '::'
+      end
+
+      def namespaced_class_name # 'Admin::Effective::Post'
+        (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
+      end
+
+      def namespaced_module_name # 'Admin::EffectivePosts'
+        Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
+      end
+
+    end
+  end
+end

data/app/models/effective/resources/init.rb

@@ -72,8 +72,7 @@ module Effective
       def _klass_by_name(input)
         input = input.to_s
         input = input[1..-1] if input.start_with?('/')
-
-        names = input.split('/')
+        names = input.split(%r{\/|::})
 
         # Classify based on namespace
         # acpa/admin/shirts

data/app/models/effective/resources/naming.rb

@@ -50,14 +50,6 @@ module Effective
         class_name.split('::')[0...-1].map { |name| name.underscore } * '/'
       end
 
-      def namespaced_class_name # 'Admin::Effective::Post'
-        (Array(namespaces).map { |name| name.to_s.classify } + [class_name]) * '::'
-      end
-
-      def namespaced_module_name # 'Admin::EffectivePosts'
-        Array(namespaces).map { |name| name.to_s.classify }.join('::') + '::' + class_name.gsub('::', '')
-      end
-
       def namespace # 'admin/things'
         (namespaces.join('/') if namespaces.present?)
       end
@@ -74,6 +66,15 @@ module Effective
         name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
       end
 
+      def tenant
+        return nil unless defined?(Tenant)
+        return nil unless klass.present?
+        return nil unless class_name.include?('::')
+
+        name = class_name.split('::').first.downcase.to_sym
+        name if Rails.application.config.tenants[name].present?
+      end
+
     end
   end
 end

data/app/models/effective/resources/paths.rb

@@ -1,25 +1,52 @@
+# frozen_string_literal: true
+
 module Effective
   module Resources
     module Paths
 
+      def tenant_path
+        return unless tenant.present?
+        Tenant.engine_path(tenant).sub("#{Rails.root}/", '')
+      end
+
       def model_file
-        File.join('app/models', class_path.to_s, "#{name}.rb")
+        File.join(*[tenant_path, 'app/models', class_path, "#{name}.rb"].compact)
       end
 
       def controller_file
-        File.join('app/controllers', namespace.to_s, "#{plural_name}_controller.rb")
+        File.join(*[tenant_path, 'app/controllers', class_path, namespace, "#{plural_name}_controller.rb"].compact)
       end
 
       def datatable_file
-        File.join('app/datatables', namespace.to_s, "#{plural_name}_datatable.rb")
+        File.join(*[tenant_path, 'app/datatables', class_path, namespace, "#{plural_name}_datatable.rb"].compact)
       end
 
       def view_file(action = :index, partial: false)
-        File.join('app/views', namespace.to_s, (namespace.present? ? '' : class_path), plural_name, "#{'_' if partial}#{action}.html.haml")
+        File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
+      end
+
+      def view_file_path(action = :index)
+        File.join(*[class_path, namespace, plural_name, action].compact)
       end
 
       def flat_view_file(action = :index, partial: false)
-        File.join('app/views', plural_name, "#{'_' if partial}#{action}.html.haml")
+        File.join(*[tenant_path, 'app/views', class_path, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
+      end
+
+      def routes_file
+        File.join(*[tenant_path, 'config/routes.rb'].compact)
+      end
+
+      def abilities_file
+        File.join(*[tenant_path, 'app/models/', class_path, 'ability.rb'].compact)
+      end
+
+      def menu_file
+        File.join(*[tenant_path, 'app/views/layouts', class_path, '_navbar.html.haml'].compact)
+      end
+
+      def admin_menu_file
+        File.join(*[tenant_path, 'app/views/layouts', class_path, '_navbar_admin.html.haml'].compact)
       end
 
       # Used by render_resource_partial and render_resource_form to guess the view path

data/lib/effective_resources.rb

@@ -31,4 +31,19 @@ module EffectiveResources
     (['Save', 'Continue', 'Add New'] & Array(config.default_submits)).inject({}) { |h, v| h[v] = true; h }
   end
 
+  # Utilities
+
+  def self.truthy?(value)
+    if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails <5
+      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+    else
+      ::ActiveRecord::Type::Boolean.new.cast(value)
+    end
+  end
+
+  def self.deliver_method
+    config = Rails.application.config
+    (config.respond_to?(:active_job) && config.active_job.queue_adapter) ? :deliver_later : :deliver_now
+  end
+
 end

data/lib/effective_resources/engine.rb

@@ -27,6 +27,7 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsSlugged::Base)
         ActiveRecord::Base.extend(ActsAsStatused::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
+        ActiveRecord::Base.extend(HasManyRichTexts::Base)
 
         ActiveRecord::Base.extend(EffectiveDeviseUser::Base)
         ActiveRecord::Base.extend(EffectiveResource::Base)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.7.8'.freeze
+  VERSION = '1.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.8.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,7 @@ files:
 - app/models/concerns/acts_as_wizard.rb
 - app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
+- app/models/concerns/has_many_rich_texts.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb
 - app/models/effective/attribute.rb
@@ -155,6 +156,7 @@ files:
 - app/models/effective/resources/attributes.rb
 - app/models/effective/resources/controller.rb
 - app/models/effective/resources/forms.rb
+- app/models/effective/resources/generator.rb
 - app/models/effective/resources/init.rb
 - app/models/effective/resources/instance.rb
 - app/models/effective/resources/klass.rb