effective_resources 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfeb432c164a66cacd2997275b2a19c1cd27bc35aceb3176d4f8ab30b51fac39
-  data.tar.gz: a90b68b3736546c7b6999e4d9b795d57a53fa508f4e94d34610a12ca7ca418a2
+  metadata.gz: ba1ab3c1064882ff12132711f5b5e52baffd2448ca53097739f6fc5da17ded8e
+  data.tar.gz: 0444d91c34c0e2bccae26dbd042d80d491d829e19f6f0dccf720ad975eb0ee14
 SHA512:
-  metadata.gz: 8302e898ba4b18d7791a15585e3f9b7c099402f2079958a1af3ec113f05b3fdffc9e56cf58ff8740f21a1c663a0163e571f755d030bc57a45ecf4a05160705b5
-  data.tar.gz: 2982d3550eb4bf9f2288082dd2e85ce4c60eafc7c9076056f698b8e7b5d0f362c8efd115be9447fbff754dac33d6c61fc80805e98bdbf28ef0c1c44dfae29c06
+  metadata.gz: 1bed68ed75113db85e5a10372dd148847464855f7bee2d4699366efdb3df2046a1e8ca001c9c6fadee838b6f67b5f900ca7429a9888b286c66db1db17d2e7996
+  data.tar.gz: 0caf48a95cb7600b104fe0ca679c9780552fc99f61e1f8ce005b5e24f241a93cd340c6222ee3ce43a6ab85e93380511d1b5184c25795a5138423fb35b2cbd78c

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/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/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/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,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