effective_resources 2.2.11 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd09d6add5f00d00573d998139d60d3fb29d7ef34af02f0e6a0edc3493480d80
-  data.tar.gz: 24a8993ebecfdc5204f34e370bca4c4a970a65a5ebb9ac7f5d412a00403c786b
+  metadata.gz: 0acfffc4958a2a571f0776a9f4e159c88ac9763df2309ed9b18e1a34c9b67fd1
+  data.tar.gz: f38964444f684fbf6d4a57291b24f8fcaac909f64ee88ef5120a6a1cc4109d5f
 SHA512:
-  metadata.gz: 6fa8aa630baa7d68b8c66e22fa9a3700179ebf593e267640216b4138789518064c1097bd0449231a2abb11153f0de93dbd2e7bf69fc9df770064fe6934ce0896
-  data.tar.gz: cd135c29a2f6cbea33eafe561e062e9b6659522403c781099aa23e9f17e0b860590eb0fea2f54d995ab42e63cb01abe92ac1304305bcfa7b8c7342e2d00b528b
+  metadata.gz: 66181b2e24aefa2ea7117a1feb0fb044c5b70a745276b9f0b39d28a9849cb1a0c772e5370742f3ed82e6f5d8886da9635398236076dd6fd8a3997aee52a49ea1
+  data.tar.gz: cd024fafd913cf073b390e07e4f85298315e55efd1bc8a7fc813bb17472acee7a1a7c33942c4951448c98bff7e3e43bdc57be8e6006656025585329b4d40619d

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

@@ -6,7 +6,7 @@ module Effective
         Rails.logger.info 'Processed by Effective::CrudController#index'
 
         EffectiveResources.authorize!(self, :index, resource_klass)
-        @page_title ||= resource_plural_name.titleize
+        @page_title ||= resource_human_plural_name
 
         self.resources ||= resource_scope.all if resource_scope.respond_to?(:all)
         @datatable = resource_datatable()
@@ -42,12 +42,12 @@ module Effective
 
           if (message = flash[:success].to_s).present?
             flash.delete(:success)
-            flash.now[:success] = "#{message.chomp('.')}. Adding another #{resource_name.titleize} based on previous."
+            flash.now[:success] = "#{message.chomp('.')}. Adding another #{resource_human_name} based on previous."
           end
         end
 
         EffectiveResources.authorize!(self, :new, resource)
-        @page_title ||= "New #{resource_name.titleize}"
+        @page_title ||= "New #{resource_human_name}"
 
         run_callbacks(:resource_render)
 
@@ -74,7 +74,7 @@ module Effective
         resource.assign_attributes(send(resource_params_method_name))
 
         EffectiveResources.authorize!(self, action, resource)
-        @page_title ||= "New #{resource_name.titleize}"
+        @page_title ||= "New #{resource_human_name}"
 
         if save_resource(resource, action)
           respond_with_success(resource, action)
@@ -211,7 +211,7 @@ module Effective
         self.resources ||= resource_scope.all
 
         EffectiveResources.authorize!(self, action, resource_klass)
-        @page_title ||= "#{action.to_s.titleize} #{resource_plural_name.titleize}"
+        @page_title ||= "#{action.to_s.titleize} #{resource_human_name}"
 
         if request.get?
           @datatable = resource_datatable()
@@ -238,7 +238,7 @@ module Effective
           end.length
         end
 
-        render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_plural_name}" }
+        render json: { status: 200, message: "Successfully #{action_verb(action)} #{successes} / #{resources.length} selected #{resource_human_plural_name.downcase}" }
       end
     end
 

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

@@ -21,7 +21,17 @@ module Effective
       # This is used for the buttons/submits/ons
       # It doesn't really work with the resource_scope correctly but the routes are important here
       def effective_resource
-        @_effective_resource ||= Effective::Resource.new(controller_path)
+        @_effective_resource ||= begin
+          controller = new()
+          klass = (controller.resource_scope_relation.call().try(:klass) rescue false) if controller.respond_to?(:resource_scope_relation)
+
+          if klass.present?
+            namespace = controller_path.split('/')[0...-1].join('/').presence
+            Effective::Resource.new(klass, namespace: namespace)
+          else
+            Effective::Resource.new(controller_path)
+          end
+        end
       end
     end
 
@@ -84,6 +94,10 @@ module Effective
       effective_resource.relation
     end
 
+    def resource_klass # Thing
+      effective_resource.klass
+    end
+
     def resource_name # 'thing'
       effective_resource.name
     end
@@ -92,16 +106,16 @@ module Effective
       (effective_resource.name + '_id').to_sym
     end
 
-    def resource_klass # Thing
-      effective_resource.klass
+    def resource_plural_name # 'things'
+      effective_resource.plural_name
     end
 
-    def resource_human_name
+    def resource_human_name # I18n
       effective_resource.human_name
     end
 
-    def resource_plural_name # 'things'
-      effective_resource.plural_name
+    def resource_human_plural_name # I18n
+      effective_resource.human_plural_name
     end
 
     def resource_datatable_attributes

data/app/helpers/effective_resources_helper.rb

@@ -301,4 +301,23 @@ module EffectiveResourcesHelper
     path || '/'
   end
 
+  def effective_translate(resource, attribute = nil)
+    return translate(resource) unless resource.respond_to?(:model_name)
+
+    if attribute.blank?
+      resource.model_name.human
+    elsif resource.respond_to?(:human_attribute_name)
+      resource.human_attribute_name(attribute)
+    else
+      resource.class.human_attribute_name(attribute)
+    end
+  end
+
+  def effective_translates(resource, attribute = nil)
+    effective_translate(resource, attribute).pluralize
+  end
+
+  alias_method :et, :effective_translate
+  alias_method :ets, :effective_translates
+
 end

data/app/models/effective/resource.rb

@@ -8,6 +8,7 @@ module Effective
     include Effective::Resources::Instance
     include Effective::Resources::Forms
     include Effective::Resources::Generator
+    include Effective::Resources::I18n
     include Effective::Resources::Klass
     include Effective::Resources::Model
     include Effective::Resources::Naming
@@ -31,7 +32,7 @@ module Effective
     end
 
     def to_s
-      name
+      human_name
     end
 
   end

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

@@ -7,11 +7,11 @@ module Effective
       # This is the attributes as defined by ActiveRecord table
       # { :name => [:string], ... }
       def attributes
-        (klass_attributes.presence || model_attributes.presence)
+        klass_attributes.presence || model_attributes.presence
       end
 
       def primary_key_attribute
-        {klass.primary_key.to_sym => [:integer]}
+        { klass.primary_key.to_sym => [:integer] }
       end
 
       # The attributes for each belongs_to

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

@@ -54,11 +54,11 @@ module Effective
           end
 
           if collection_get_actions.find { |a| a == :index }
-            buttons["All #{human_plural_name}".titleize] = { action: :index, default: true }
+            buttons["All #{human_plural_name}"] = { action: :index, default: true }
           end
 
           if collection_get_actions.find { |a| a == :new }
-            buttons["New #{human_name}".titleize] = { action: :new, default: true }
+            buttons["New #{human_name}"] = { action: :new, default: true }
           end
 
           (collection_get_actions - crud_actions).each do |action|
@@ -122,11 +122,11 @@ module Effective
       def resource_klass_actions
         {}.tap do |buttons|
           if collection_get_actions.find { |a| a == :index }
-            buttons["All #{human_plural_name}".titleize] = { action: :index, default: true }
+            buttons["All #{human_plural_name}"] = { action: :index, default: true }
           end
 
           if collection_get_actions.find { |a| a == :new }
-            buttons["New #{human_name}".titleize] = { action: :new, default: true }
+            buttons["New #{human_name}"] = { action: :new, default: true }
           end
 
           (collection_get_actions - crud_actions).each do |action|

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Effective
+  module Resources
+    module I18n
+
+      def human_name
+        if klass.respond_to?(:model_name)
+          klass.model_name.human
+        else
+          name.gsub('::', ' ').underscore.gsub('_', ' ')
+        end
+      end
+
+      def human_plural_name
+        if klass.respond_to?(:model_name)
+          klass.model_name.human.pluralize
+        else
+          name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
+        end
+      end
+
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Effective
         @model.read(&block)
 
         # If effective_developer is in live mode, this will cause it to refresh the class
-        ActiveSupport.run_load_hooks(:effective_resource, self)
+        # ActiveSupport.run_load_hooks(:effective_resource, self)
       end
 
       def model

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

@@ -63,13 +63,6 @@ module Effective
         @namespaces || []
       end
 
-      def human_name
-        name.gsub('::', ' ').underscore.gsub('_', ' ')
-      end
-
-      def human_plural_name
-        name.pluralize.gsub('::', ' ').underscore.gsub('_', ' ')
-      end
     end
   end
 end

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

@@ -8,18 +8,34 @@ module Effective
         Tenant.engine_path(tenant).sub("#{Rails.root}/", '') if tenant?
       end
 
+      # Model
       def model_file
         File.join(*[tenant_path, 'app/models', class_path, "#{name}.rb"].compact)
       end
 
+      # Controller
       def controller_file
         File.join(*[tenant_path, 'app/controllers', class_path, namespace, "#{plural_name}_controller.rb"].compact)
       end
 
+      def admin_effective_controller_file
+        File.join(*[tenant_path, 'app/controllers', namespace, "#{plural_name}_controller.rb"].compact)
+      end
+
+      # Datatable
       def datatable_file
         File.join(*[tenant_path, 'app/datatables', class_path, namespace, "#{plural_name}_datatable.rb"].compact)
       end
 
+      def effective_datatable_file
+        File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
+      end
+
+      def admin_effective_datatable_file
+        File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
+      end
+
+      # Views
       def view_file(action = :index, partial: false)
         File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
       end
@@ -28,8 +44,8 @@ module Effective
         File.join(*[class_path, namespace, plural_name, action].compact)
       end
 
-      def flat_view_file(action = :index, partial: false)
-        File.join(*[tenant_path, 'app/views', class_path, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
+      def admin_effective_view_file(action = :index, partial: false)
+        File.join(*[tenant_path, 'app/views', namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
       end
 
       def routes_file

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.11'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,6 +182,7 @@ files:
 - app/models/effective/resources/controller.rb
 - app/models/effective/resources/forms.rb
 - app/models/effective/resources/generator.rb
+- app/models/effective/resources/i18n.rb
 - app/models/effective/resources/init.rb
 - app/models/effective/resources/instance.rb
 - app/models/effective/resources/klass.rb