avo 0.5.0.beta8 → 0.5.0.beta13

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,8 +102,8 @@ module Avo
       end
 
       def visible?
-        if visible.present? and visible.respond_to? :call
-          visible.call
+        if visible.present? && visible.respond_to?(:call)
+          visible.call resource: resource
         else
           visible
         end
@@ -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

data/lib/avo/fields/belongs_to_field.rb

@@ -3,13 +3,13 @@ module Avo
     class BelongsToField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'belongs-to-field',
-          placeholder: I18n.t('avo.choose_an_option')
+          partial_name: "belongs-to-field",
+          placeholder: I18n.t("avo.choose_an_option")
         }
 
         super(name, **args, &block)
 
-        @meta[:searchable] = args[:searchable] == true ? true : false
+        @meta[:searchable] = args[:searchable] == true
         @meta[:relation_method] = name.to_s.parameterize.underscore
       end
 
@@ -28,7 +28,7 @@ module Avo
 
       def foreign_key
         if @model.present?
-          if @model.class == Class
+          if @model.instance_of?(Class)
             @model.reflections[@meta[:relation_method]].foreign_key
           else
             @model.class.reflections[@meta[:relation_method]].foreign_key
@@ -51,15 +51,16 @@ module Avo
       end
 
       private
-        def target_resource
-          if @model._reflections[id.to_s].klass.present?
-            App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-          elsif @model._reflections[id.to_s].options[:class_name].present?
-            App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
-          else
-            App.get_resource_by_name id.to_s
-          end
+
+      def target_resource
+        if @model._reflections[id.to_s].klass.present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
+        elsif @model._reflections[id.to_s].options[:class_name].present?
+          App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
+        else
+          App.get_resource_by_name id.to_s
         end
+      end
     end
   end
 end

data/lib/avo/fields/boolean_field.rb

@@ -6,8 +6,8 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'boolean-field',
-          computable: true,
+          partial_name: "boolean-field",
+          computable: true
         }
 
         super(name, **args, &block)
@@ -25,11 +25,11 @@ module Avo
       end
 
       def truthy_values
-        ['true', '1', @true_value]
+        ["true", "1", @true_value]
       end
 
       def falsy_values
-        ['false', '0', @false_value]
+        ["false", "0", @false_value]
       end
     end
   end

data/lib/avo/fields/boolean_group_field.rb

@@ -5,8 +5,8 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'boolean-group-field',
-          computable: true,
+          partial_name: "boolean-group-field",
+          computable: true
         }
 
         super(name, **args, &block)
@@ -15,7 +15,7 @@ module Avo
       end
 
       def to_permitted_param
-        ["#{id}": [] ]
+        ["#{id}": []]
       end
 
       def fill_field(model, key, value)

data/lib/avo/fields/code_field.rb

@@ -10,16 +10,16 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'code-field',
+          partial_name: "code-field"
         }
 
         hide_on :index
 
         super(name, **args, &block)
 
-        @language = args[:language].present? ? args[:language].to_s : 'javascript'
-        @theme = args[:theme].present? ? args[:theme].to_s : 'material-darker'
-        @height = args[:height].present? ? args[:height].to_s : 'auto'
+        @language = args[:language].present? ? args[:language].to_s : "javascript"
+        @theme = args[:theme].present? ? args[:theme].to_s : "material-darker"
+        @height = args[:height].present? ? args[:height].to_s : "auto"
         @tab_size = args[:tab_size].present? ? args[:tab_size] : 2
         @indent_with_tabs = args[:indent_with_tabs].present? ? args[:indent_with_tabs] : false
         @line_wrapping = args[:line_wrapping].present? ? args[:line_wrapping] : true

data/lib/avo/fields/country_field.rb

@@ -6,8 +6,8 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'country-field',
-          placeholder: I18n.t('avo.choose_a_country'),
+          partial_name: "country-field",
+          placeholder: I18n.t("avo.choose_a_country")
         }
 
         super(name, **args, &block)

data/lib/avo/fields/currency_field.rb

@@ -3,8 +3,8 @@ module Avo
     class CurrencyField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'currency-field',
-          computable: true,
+          partial_name: "currency-field",
+          computable: true
         }
 
         super(name, **args, &block)
@@ -16,7 +16,7 @@ module Avo
       def hydrate_field(fields, model, resource, view)
         {
           currency: @currency,
-          locale: @locale,
+          locale: @locale
         }
       end
     end

data/lib/avo/fields/date_field.rb

@@ -9,15 +9,15 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'date-field',
+          partial_name: "date-field"
         }
 
         super(name, **args, &block)
 
         @first_day_of_week = args[:first_day_of_week].present? ? args[:first_day_of_week].to_i : 0
-        @picker_format = args[:picker_format].present? ? args[:picker_format] : 'Y-m-d'
+        @picker_format = args[:picker_format].present? ? args[:picker_format] : "Y-m-d"
         @format = args[:format].present? ? args[:format] : :long
-        @placeholder = args[:placeholder].present? ? args[:placeholder] : ''
+        @placeholder = args[:placeholder].present? ? args[:placeholder] : ""
         @relative = args[:relative].present? ? args[:relative] : false
       end
 

data/lib/avo/fields/date_time_field.rb

@@ -8,8 +8,8 @@ module Avo
       def initialize(name, **args, &block)
         super(name, **args, &block)
 
-        @partial_name = 'date-time-field'
-        @picker_format = args[:picker_format].present? ? args[:picker_format] : 'Y-m-d H:i:S'
+        @partial_name = "date-time-field"
+        @picker_format = args[:picker_format].present? ? args[:picker_format] : "Y-m-d H:i:S"
         @time_24hr = args[:time_24hr].present? ? args[:time_24hr] : false
         @timezone = args[:timezone].present? ? args[:timezone] : Rails.application.config.time_zone
       end

data/lib/avo/fields/external_image_field.rb

@@ -7,8 +7,8 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'external-image-field',
-          computable: true,
+          partial_name: "external-image-field",
+          computable: true
         }.merge(@defaults || {})
 
         super(name, **args, &block)

data/lib/avo/fields/field_extensions/has_field_name.rb

@@ -9,9 +9,9 @@ module Avo
 
         # Get the field name
         def get_field_name
-          return self.field_name_attribute if self.field_name_attribute.present?
+          return field_name_attribute if field_name_attribute.present?
 
-          self.to_s.demodulize.underscore.gsub '_field', ''
+          to_s.demodulize.underscore.gsub "_field", ""
         end
       end
     end

data/lib/avo/fields/field_extensions/visible_in_different_views.rb

@@ -45,48 +45,49 @@ module Avo
         end
 
         private
-          def show_on_view(view)
-            self.send("show_on_#{view.to_s}=", true)
-          end
 
-          def hide_on_view(view)
-            self.send("show_on_#{view.to_s}=", false)
-          end
+        def show_on_view(view)
+          send("show_on_#{view}=", true)
+        end
 
-          def only_on_view(view)
-            hide_on_all
-            show_on_view view
-          end
+        def hide_on_view(view)
+          send("show_on_#{view}=", false)
+        end
 
-          def except_on_view(view)
-            show_on_all
-            hide_on_view view
-          end
+        def only_on_view(view)
+          hide_on_all
+          show_on_view view
+        end
 
-          def show_on_all
-            @show_on_index = true
-            @show_on_show = true
-            @show_on_edit = true
-            @show_on_new = true
-          end
+        def except_on_view(view)
+          show_on_all
+          hide_on_view view
+        end
 
-          def hide_on_all
-            @show_on_index = false
-            @show_on_show = false
-            @show_on_edit = false
-            @show_on_new = false
-          end
+        def show_on_all
+          @show_on_index = true
+          @show_on_show = true
+          @show_on_edit = true
+          @show_on_new = true
+        end
 
-          def normalize_views(*views_and_groups)
-            forms = views_and_groups.flatten! & [:forms]
+        def hide_on_all
+          @show_on_index = false
+          @show_on_show = false
+          @show_on_edit = false
+          @show_on_new = false
+        end
 
-            if forms.present?
-              views_and_groups = views_and_groups - forms
-              views_and_groups = views_and_groups + [:new, :edit]
-            end
+        def normalize_views(*views_and_groups)
+          forms = views_and_groups.flatten! & [:forms]
 
-            views_and_groups.flatten.uniq
+          if forms.present?
+            views_and_groups -= forms
+            views_and_groups += [:new, :edit]
           end
+
+          views_and_groups.flatten.uniq
+        end
       end
     end
   end