avo 0.5.0.beta9 → 0.5.0.beta10

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", "#{name.underscore}.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", "#{name.underscore}_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)

data/lib/avo/engine.rb

@@ -1,8 +1,8 @@
 # requires all dependencies
-Gem.loaded_specs['avo'].dependencies.each do |d|
+Gem.loaded_specs["avo"].dependencies.each do |d|
   require d.name
 end
-require 'view_component/engine'
+require "view_component/engine"
 
 module Avo
   class Engine < ::Rails::Engine
@@ -13,42 +13,42 @@ module Avo
       ::Avo::App.boot
     end
 
-    initializer 'avo.autoload', before: :set_autoload_paths do |app|
-      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'avo', 'filters'))
-      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'avo', 'actions'))
-      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'avo', 'resources'))
+    initializer "avo.autoload", before: :set_autoload_paths do |app|
+      Rails.autoloaders.main.push_dir(Rails.root.join("app", "avo", "filters"))
+      Rails.autoloaders.main.push_dir(Rails.root.join("app", "avo", "actions"))
+      Rails.autoloaders.main.push_dir(Rails.root.join("app", "avo", "resources"))
     end
 
-    initializer 'avo.init_fields' do |app|
+    initializer "avo.init_fields" do |app|
       # Init the fields
       ::Avo::App.init_fields
     end
 
-    initializer 'avo.reload_avo_files' do |app|
-      if Avo::IN_DEVELOPMENT && ENV['RELOAD_AVO_FILES']
+    initializer "avo.reload_avo_files" do |app|
+      if Avo::IN_DEVELOPMENT && ENV["RELOAD_AVO_FILES"]
         avo_root_path = Avo::Engine.root.to_s
         # Register reloader
         app.reloaders << app.config.file_watcher.new([], {
-          Avo::Engine.root.join('lib', 'avo').to_s => ['rb'],
+          Avo::Engine.root.join("lib", "avo").to_s => ["rb"]
         }) {}
 
         # What to do on file change
         config.to_prepare do
-          Dir.glob(avo_root_path + '/lib/avo/**/*.rb'.to_s).each { |c| load c }
+          Dir.glob(avo_root_path + "/lib/avo/**/*.rb".to_s).each { |c| load c }
           Avo::App.boot
         end
       end
     end
 
-    initializer 'webpacker.proxy' do |app|
+    initializer "webpacker.proxy" do |app|
       app.config.debug_exception_response_format = :api
       # app.config.logger = ::Logger.new(STDOUT)
 
       insert_middleware = begin
-                            Avo.webpacker.config.dev_server.present?
-                          rescue
-                            nil
-                          end
+        Avo.webpacker.config.dev_server.present?
+      rescue
+        nil
+      end
 
       if insert_middleware
         app.middleware.insert_before(
@@ -61,8 +61,8 @@ module Avo
 
     config.app_middleware.use(
       Rack::Static,
-      urls: ['/avo-packs'],
-      root: Avo::Engine.root.join('public')
+      urls: ["/avo-packs"],
+      root: Avo::Engine.root.join("public")
     )
 
     config.generators do |g|

data/lib/avo/fields/badge_field.rb

@@ -3,14 +3,14 @@ module Avo
     class BadgeField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'badge-field',
+          partial_name: "badge-field"
         }
 
         super(name, **args, &block)
 
         hide_on [:edit, :new]
 
-        default_options = { info: :info, success: :success, danger: :danger, warning: :warning }
+        default_options = {info: :info, success: :success, danger: :danger, warning: :warning}
         @meta[:options] = args[:options].present? ? default_options.merge(args[:options]) : default_options
       end
     end

data/lib/avo/fields/base_field.rb

@@ -44,14 +44,14 @@ module Avo
 
         args = @defaults.merge(args).symbolize_keys
 
-        null_values = [nil, '', *args[:null_values]]
+        null_values = [nil, "", *args[:null_values]]
         # The field properties as a hash {property: default_value}
         @field_properties = {
           id: id,
           name: id.to_s.humanize(keep_id_suffix: true),
           translation_key: nil,
           block: block,
-          partial_name: 'field',
+          partial_name: "field",
           required: false,
           readonly: false,
           updatable: true,
@@ -67,7 +67,7 @@ module Avo
           default: nil,
           visible: true,
           meta: {},
-          panel_name: nil,
+          panel_name: nil
         }
 
         # Set the values in the following order
@@ -76,7 +76,7 @@ module Avo
         # - field option
         @field_properties.each do |name, default_value|
           final_value = args[name.to_sym]
-          self.send("#{name}=", name != 'null_values' && (final_value.nil? || !defined?(final_value)) ? default_value : final_value)
+          send("#{name}=", name != "null_values" && (final_value.nil? || !defined?(final_value)) ? default_value : final_value)
         end
 
         # Set the visibility
@@ -102,7 +102,7 @@ module Avo
       end
 
       def visible?
-        if visible.present? and visible.respond_to? :call
+        if visible.present? && visible.respond_to?(:call)
           visible.call
         else
           visible
@@ -111,18 +111,18 @@ module Avo
 
       def value
         # Get model value
-        final_value = @model.send(id) if model_or_class(@model) == 'model' and @model.respond_to? id
+        final_value = @model.send(id) if (model_or_class(@model) == "model") && @model.respond_to?(id)
 
-        if @view === :new or @action.present?
-          if default.present? and default.respond_to? :call
-            final_value = default.call
+        if (@view === :new) || @action.present?
+          final_value = if default.present? && default.respond_to?(:call)
+            default.call
           else
-            final_value = default
+            default
           end
         end
 
         # Run callback block if present
-        if computable and block.present?
+        if computable && block.present?
           final_value = block.call @model, @resource, @view, self
         end
 
@@ -141,18 +141,16 @@ module Avo
       end
 
       def partial_path_for(view)
-        return @custom_partials[view] if @custom_partials.present? and @custom_partials[view].present?
+        return @custom_partials[view] if @custom_partials.present? && @custom_partials[view].present?
 
         "avo/fields/#{view}/#{partial_name}"
       end
 
       # Try to see if the field has a different database ID than it's name
       def database_id(model)
-        begin
-          foreign_key
-        rescue => exception
-          id
-        end
+        foreign_key
+      rescue
+        id
       end
 
       def has_own_panel?
@@ -168,7 +166,7 @@ module Avo
       end
 
       def component_name(view = :index)
-        "Avo::#{view.to_s.classify}::Fields::#{partial_name.gsub('-field', '').underscore.camelize}FieldComponent"
+        "Avo::#{view.to_s.classify}::Fields::#{partial_name.gsub("-field", "").underscore.camelize}FieldComponent"
       end
 
       def model_errors
@@ -178,17 +176,18 @@ module Avo
       end
 
       def type
-        self.class.name.demodulize.to_s.underscore.gsub('_field', '')
+        self.class.name.demodulize.to_s.underscore.gsub("_field", "")
       end
 
       private
-        def model_or_class(model)
-          if model.class == String
-            'class'
-          else
-            'model'
-          end
+
+      def model_or_class(model)
+        if model.instance_of?(String)
+          "class"
+        else
+          "model"
         end
+      end
     end
   end
 end