avo 0.5.0.beta8 → 0.5.0.beta13

data/lib/avo.rb

@@ -1,20 +1,20 @@
-require 'zeitwerk'
-require_relative 'avo/version'
-require_relative 'avo/engine' if defined?(Rails)
+require "zeitwerk"
+require_relative "avo/version"
+require_relative "avo/engine" if defined?(Rails)
 
 loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module Avo
-  ROOT_PATH = Pathname.new(File.join(__dir__, '..'))
-  IN_DEVELOPMENT = ENV['AVO_IN_DEVELOPMENT'] == '1'
+  ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
+  IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
 
   class << self
     def webpacker
       @webpacker ||= ::Webpacker::Instance.new(
         root_path: ROOT_PATH,
-        config_path: ROOT_PATH.join('config/webpacker.yml')
+        config_path: ROOT_PATH.join("config/webpacker.yml")
       )
     end
   end

data/lib/avo/app.rb

@@ -15,10 +15,10 @@ module Avo
 
         I18n.locale = Avo.configuration.language_code
 
-        if Rails.cache.class == ActiveSupport::Cache::NullStore
-          self.app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
+        if Rails.cache.instance_of?(ActiveSupport::Cache::NullStore)
+          app[:cache_store] ||= ActiveSupport::Cache::MemoryStore.new
         else
-          self.app[:cache_store] = Rails.cache
+          app[:cache_store] = Rails.cache
         end
       end
 
@@ -35,7 +35,7 @@ module Avo
       end
 
       def cache_store
-        self.app[:cache_store]
+        app[:cache_store]
       end
 
       # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
@@ -47,23 +47,23 @@ module Avo
       # Avo::Fields::DateTimeField -> date_time
       def init_fields
         Avo::Fields::BaseField.descendants.each do |class_name|
-          next if class_name.to_s == 'BaseField'
+          next if class_name.to_s == "BaseField"
 
-          if class_name.to_s.end_with? 'Field'
+          if class_name.to_s.end_with? "Field"
             load_field class_name.get_field_name, class_name
           end
         end
       end
 
       def load_field(method_name, klass)
-        self.fields.push(
+        fields.push(
           name: method_name,
-          class: klass,
+          class: klass
         )
       end
 
       def init_resources
-        self.app[:resources] = BaseResource.descendants
+        app[:resources] = BaseResource.descendants
           .select do |resource|
             resource != BaseResource
           end
@@ -75,14 +75,14 @@ module Avo
       end
 
       def get_resources
-        self.app[:resources]
+        app[:resources]
       end
 
       # Returns the Avo resource by camelized name
       #
       # get_resource_by_name('User') => UserResource
       def get_resource(resource)
-        self.app[:resources].find do |available_resource|
+        app[:resources].find do |available_resource|
           "#{resource}Resource".safe_constantize == available_resource.class
         end
       end
@@ -91,7 +91,7 @@ module Avo
       #
       # get_resource_by_name('user') => UserResource
       def get_resource_by_name(name)
-        self.get_resource name.singularize.camelize
+        get_resource name.singularize.camelize
       end
 
       # Returns the Avo resource by singular snake_cased name
@@ -110,7 +110,7 @@ module Avo
       # get_resource_by_controller_name('users') => UserResource
       def get_resource_by_controller_name(name)
         get_resources.find do |resource|
-          resource.model_class.to_s.pluralize.underscore.gsub('/', '_') == name.to_s
+          resource.model_class.to_s.pluralize.underscore.tr("/", "_") == name.to_s
         end
       end
 
@@ -124,7 +124,7 @@ module Avo
       def get_available_resources(user = nil)
         App.get_resources
           .select do |resource|
-            Services::AuthorizationService.authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys['index'], raise_exception: false
+            Services::AuthorizationService.authorize user, resource.model, Avo.configuration.authorization_methods.stringify_keys["index"], raise_exception: false
           end
           .sort_by { |r| r.name }
       end
@@ -139,17 +139,17 @@ module Avo
         # We should eager load all the classes so we find all descendants
         Rails.application.eager_load!
 
-        Proc.new do
+        proc do
           BaseResource.descendants
             .select do |resource|
               resource != :BaseResource
             end
             .map do |resource|
               if resource.is_a? Class
-                if resource.model_class.present?
-                  route_key = resource.model_class.model_name.route_key
+                route_key = if resource.model_class.present?
+                  resource.model_class.model_name.route_key
                 else
-                  route_key = resource.to_s.underscore.gsub('_resource', '').downcase.pluralize.to_sym
+                  resource.to_s.underscore.gsub("_resource", "").downcase.pluralize.to_sym
                 end
 
                 resources route_key

data/lib/avo/base_action.rb

@@ -25,13 +25,13 @@ module Avo
       self.class.resource = resource if resource.present?
       self.class.user = user if user.present?
 
-      self.class.message ||= I18n.t('avo.are_you_sure_you_want_to_run_this_option')
-      self.class.confirm_button_label ||= I18n.t('avo.run')
-      self.class.cancel_button_label ||= I18n.t('avo.cancel')
+      self.class.message ||= I18n.t("avo.are_you_sure_you_want_to_run_this_option")
+      self.class.confirm_button_label ||= I18n.t("avo.run")
+      self.class.cancel_button_label ||= I18n.t("avo.cancel")
 
       @response ||= {}
       @response[:message_type] ||= :notice
-      @response[:message] ||= I18n.t('avo.action_ran_successfully')
+      @response[:message] ||= I18n.t("avo.action_ran_successfully")
     end
 
     def context
@@ -50,7 +50,7 @@ module Avo
       get_field_definitions.map do |field|
         field.hydrate(action: self, model: @model)
       end
-      .select do |field|
+        .select do |field|
         field.visible?
       end
     end
@@ -59,7 +59,7 @@ module Avo
       get_fields.map do |field|
         [field.id, field.value]
       end
-      .to_h
+        .to_h
     end
 
     def handle_action(models:, fields:)
@@ -75,50 +75,50 @@ module Avo
         processed_fields = {}
       end
 
-      result = self.handle models: models, fields: processed_fields
+      handle models: models, fields: processed_fields
 
       self
     end
 
     def param_id
-      self.class.to_s.demodulize.underscore.gsub '/', '_'
+      self.class.to_s.demodulize.underscore.tr "/", "_"
     end
 
     def succeed(text)
-      self.response[:message_type] = :notice
-      self.response[:message] = text
+      response[:message_type] = :notice
+      response[:message] = text
 
       self
     end
 
     def fail(text)
-      self.response[:message_type] = :alert
-      self.response[:message] = text
+      response[:message_type] = :alert
+      response[:message] = text
 
       self
     end
 
     def redirect_to(path = nil, &block)
-      self.response[:type] = :redirect
-      if block.present?
-        self.response[:path] = block
+      response[:type] = :redirect
+      response[:path] = if block.present?
+        block
       else
-        self.response[:path] = path
+        path
       end
 
       self
     end
 
     def reload
-      self.response[:type] = :reload
+      response[:type] = :reload
 
       self
     end
 
     def download(path, filename)
-      self.response[:type] = :download
-      self.response[:path] = path
-      self.response[:filename] = filename
+      response[:type] = :download
+      response[:path] = path
+      response[:filename] = filename
 
       self
     end

data/lib/avo/base_resource.rb

@@ -67,16 +67,16 @@ module Avo
 
     def get_fields(panel: nil, reflection: nil)
       fields = get_field_definitions.select do |field|
-        field.send("show_on_#{@view.to_s}")
+        field.send("show_on_#{@view}")
       end
-      .select do |field|
-        field.visible?
-      end
-      .select do |field|
+        .select do |field|
+                 field.visible?
+               end
+        .select do |field|
         unless field.respond_to?(:foreign_key) &&
-          reflection.present? &&
-          reflection.respond_to?(:foreign_key) &&
-          reflection.foreign_key == field.foreign_key
+            reflection.present? &&
+            reflection.respond_to?(:foreign_key) &&
+            reflection.foreign_key == field.foreign_key
           true
         end
       end
@@ -87,11 +87,9 @@ module Avo
         end
       end
 
-      fields = fields.map do |field|
+      fields.map do |field|
         field.hydrate(model: @model, view: @view, resource: self)
       end
-
-      fields
     end
 
     def get_grid_fields
@@ -117,24 +115,22 @@ module Avo
 
       case @view
       when :show
-        I18n.t('avo.resource_details', item: self.name.downcase, title: model_title).upcase_first
+        I18n.t("avo.resource_details", item: name.downcase, title: model_title).upcase_first
       when :edit
-        I18n.t('avo.update_item', item: self.name.downcase, title: model_title).upcase_first
+        I18n.t("avo.update_item", item: name.downcase, title: model_title).upcase_first
       when :new
-        I18n.t('avo.create_new_item', item: self.name.downcase).upcase_first
+        I18n.t("avo.create_new_item", item: name.downcase).upcase_first
       end
     end
 
     def panels
-      panels = [
+      [
         {
           name: default_panel_name,
           type: :fields,
-          in_panel: true,
+          in_panel: true
         }
       ]
-
-      panels
     end
 
     def model_class
@@ -142,7 +138,7 @@ module Avo
 
       return @model.class if @model.present?
 
-      self.class.name.demodulize.chomp('Resource').safe_constantize
+      self.class.name.demodulize.chomp("Resource").safe_constantize
     end
 
     def model_title
@@ -156,7 +152,7 @@ module Avo
 
       return I18n.t(@translation_key, count: 1).capitalize if @translation_key
 
-      self.class.name.demodulize.chomp('Resource').titlecase
+      self.class.name.demodulize.chomp("Resource").titlecase
     end
 
     def singular_name
@@ -191,7 +187,7 @@ module Avo
       self.class.context
     end
 
-    def query_search(query: '', via_resource_name: , via_resource_id:, user:)
+    def query_search(via_resource_name:, via_resource_id:, user:, query: "")
       # model_class = self.model
 
       db_query = AuthorizationService.apply_policy(user, model_class)
@@ -199,18 +195,18 @@ module Avo
       if via_resource_name.present?
         related_model = App.get_resource_by_name(via_resource_name).model
 
-        db_query = related_model.find(via_resource_id).public_send(self.plural_name.downcase)
+        db_query = related_model.find(via_resource_id).public_send(plural_name.downcase)
       end
 
       new_query = []
 
-      [self.search].flatten.each_with_index do |search_by, index|
-        new_query.push 'or' if index != 0
+      [search].flatten.each_with_index do |search_by, index|
+        new_query.push "or" if index != 0
 
         new_query.push "text(#{search_by}) ILIKE '%#{query}%'"
       end
 
-      db_query.where(new_query.join(' '))
+      db_query.where(new_query.join(" "))
     end
 
     def attached_file_fields
@@ -221,7 +217,7 @@ module Avo
 
     def fill_model(model, params)
       # Map the received params to their actual fields
-      fields_by_database_id = self.get_field_definitions.map { |field| [field.database_id(model).to_s, field] }.to_h
+      fields_by_database_id = get_field_definitions.map { |field| [field.database_id(model).to_s, field] }.to_h
 
       params.each do |key, value|
         field = fields_by_database_id[key]
@@ -239,16 +235,16 @@ module Avo
     end
 
     def file_hash
-      content_to_be_hashed = ''
+      content_to_be_hashed = ""
 
       # resource file hash
-      resource_path = Rails.root.join('app', 'avo', 'resources', "#{name.underscore}.rb").to_s
+      resource_path = Rails.root.join("app", "avo", "resources", "#{self.class.name.underscore}_resource.rb").to_s
       if File.file? resource_path
         content_to_be_hashed += File.read(resource_path)
       end
 
       # policy file hash
-      policy_path = Rails.root.join('app', 'policies', "#{name.underscore}_policy.rb").to_s
+      policy_path = Rails.root.join("app", "policies", "#{self.class.name.underscore.gsub("_resource", "")}_policy.rb").to_s
       if File.file? policy_path
         content_to_be_hashed += File.read(policy_path)
       end
@@ -258,9 +254,9 @@ module Avo
 
     def cache_hash(parent_model)
       if parent_model.present?
-        [self.model, self.file_hash, parent_model]
+        [model, file_hash, parent_model]
       else
-        [self.model, self.file_hash]
+        [model, file_hash]
       end
     end
 
@@ -270,24 +266,24 @@ module Avo
       default_values = get_fields.select do |field|
         !field.computed
       end
-      .map do |field|
-        id = field.id
-        value = field.value
+        .map do |field|
+                         id = field.id
+                         value = field.value
 
-        if field.respond_to? :foreign_key
-          id = field.foreign_key.to_sym
+                         if field.respond_to? :foreign_key
+                           id = field.foreign_key.to_sym
 
-          reflection = @model._reflections[@params[:via_relation]]
+                           reflection = @model._reflections[@params[:via_relation]]
 
-          if reflection.present? && reflection.foreign_key.present?
-            value = @params[:via_resource_id]
-          end
-        end
+                           if reflection.present? && reflection.foreign_key.present?
+                             value = @params[:via_resource_id]
+                           end
+                         end
 
-        [id, value]
-      end
-      .to_h
-      .select do |id, value|
+                         [id, value]
+                       end
+        .to_h
+        .select do |id, value|
         value.present?
       end
 

data/lib/avo/configuration.rb

@@ -21,27 +21,27 @@ module Avo
     attr_accessor :context
 
     def initialize
-      @root_path = '/avo'
-      @app_name = Rails.application.class.to_s.split('::').first.underscore.humanize(keep_id_suffix: true)
-      @timezone = 'UTC'
+      @root_path = "/avo"
+      @app_name = Rails.application.class.to_s.split("::").first.underscore.humanize(keep_id_suffix: true)
+      @timezone = "UTC"
       @per_page = 24
       @per_page_steps = [12, 24, 48, 72]
       @via_per_page = 8
-      @locale = 'en-US'
-      @currency = 'USD'
+      @locale = "en-US"
+      @currency = "USD"
       @default_view_type = :table
-      @license = 'community'
+      @license = "community"
       @license_key = nil
       @current_user = proc {}
       @authenticate = proc {}
       @authorization_methods = {
-        index: 'index?',
-        show: 'show?',
-        edit: 'edit?',
-        new: 'new?',
-        update: 'update?',
-        create: 'create?',
-        destroy: 'destroy?',
+        index: "index?",
+        show: "show?",
+        edit: "edit?",
+        new: "new?",
+        update: "update?",
+        create: "create?",
+        destroy: "destroy?"
       }
       @id_links_to_resource = false
       @full_width_container = false
@@ -55,11 +55,9 @@ module Avo
     end
 
     def language_code
-      begin
-        locale_tag.language.code
-      rescue => exception
-        'en'
-      end
+      locale_tag.language.code
+    rescue
+      "en"
     end
 
     def current_user_method(&block)