avo 0.5.0.beta6 → 0.5.0.beta11

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

@@ -2,23 +2,16 @@ module Avo
   module Fields
     module FieldExtensions
       module HasFieldName
-        @@field_name_attribute = ''
-
         # Set the field name
         def field_name(name)
-          @field_name_attribute = name
+          self.field_name_attribute = name
         end
 
         # Get the field name
-        def field_name_attribute
-          @field_name_attribute
-        end
-
-        # Get the field name from outside
         def get_field_name
           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

data/lib/avo/fields/file_field.rb

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

data/lib/avo/fields/files_field.rb

@@ -5,7 +5,7 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'files-field',
+          partial_name: "files-field"
         }.merge(@defaults || {})
 
         super(name, **args, &block)
@@ -16,7 +16,7 @@ module Avo
       end
 
       def to_permitted_param
-        { "#{id}": [] }
+        {"#{id}": []}
       end
 
       def fill_field(model, key, value)

data/lib/avo/fields/gravatar_field.rb

@@ -1,5 +1,5 @@
-require 'digest'
-require 'erb'
+require "digest"
+require "erb"
 
 module Avo
   module Fields
@@ -10,9 +10,9 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'gravatar-field',
-          name: 'Avatar',
-          id: args[:id].present? ? args[:id] : 'email',
+          partial_name: "gravatar-field",
+          name: "Avatar",
+          id: args[:id].present? ? args[:id] : "email"
         }
 
         super(name, **args, &block)
@@ -21,7 +21,7 @@ module Avo
 
         @rounded = args[:rounded].present? ? args[:rounded] : true
         @size = args[:size].present? ? args[:size].to_i : 40
-        @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ''
+        @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ""
         @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
       end
 
@@ -33,13 +33,13 @@ module Avo
 
       def to_image
         options = {
-          default: '',
-          size: 340,
+          default: "",
+          size: 340
         }
 
-        query = options.map { |key, value| "#{key}=#{value}" }.join('&')
+        query = options.map { |key, value| "#{key}=#{value}" }.join("&")
 
-        URI::HTTP.build(host: "www.gravatar.com", path: "/avatar/#{md5}", query: query).to_s
+        URI::HTTPS.build(host: "www.gravatar.com", path: "/avatar/#{md5}", query: query).to_s
       end
     end
   end

data/lib/avo/fields/has_and_belongs_to_many_field.rb

@@ -4,7 +4,7 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,
-          partial_name: 'has-many-field'
+          partial_name: "has-many-field"
         }
 
         super(name, **args, &block)

data/lib/avo/fields/has_many_field.rb

@@ -4,7 +4,7 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,
-          partial_name: 'has-many-field'
+          partial_name: "has-many-field"
         }
         @through = args[:through]
 

data/lib/avo/fields/has_one_field.rb

@@ -7,14 +7,14 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: true,
-          partial_name: 'has-one-field',
+          partial_name: "has-one-field"
         }
 
         super(name, **args, &block)
 
         hide_on :new, :edit
 
-        @placeholder = I18n.t 'avo.choose_an_option'
+        @placeholder = I18n.t "avo.choose_an_option"
 
         @relation_method = name.to_s.parameterize.underscore
         @display = args[:display].present? ? args[:display] : :show

data/lib/avo/fields/heading_field.rb

@@ -4,8 +4,8 @@ module Avo
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,
-          partial_name: 'heading-field',
-          id: 'heading_' + name.to_s.parameterize.underscore,
+          partial_name: "heading-field",
+          id: "heading_" + name.to_s.parameterize.underscore
         }
 
         super(name, **args, &block)

data/lib/avo/fields/hidden_field.rb

@@ -3,7 +3,7 @@ module Avo
     class HiddenField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'hidden-field',
+          partial_name: "hidden-field"
         }
 
         super(name, **args, &block)

data/lib/avo/fields/id_field.rb

@@ -2,11 +2,11 @@ module Avo
   module Fields
     class IdField < BaseField
       def initialize(name, **args, &block)
-        default_value = 'id'
+        default_value = "id"
 
         if name.nil?
           @name = name = default_value
-        elsif !name.is_a? String and !name.is_a? Symbol
+        elsif !name.is_a?(String) && !name.is_a?(Symbol)
           args_copy = name
           @name = name = default_value
           args = args_copy
@@ -16,7 +16,7 @@ module Avo
           id: name.to_sym,
           readonly: true,
           sortable: true,
-          partial_name: 'id-field'
+          partial_name: "id-field"
         }
 
         hide_on [:edit, :new]

data/lib/avo/fields/key_value_field.rb

@@ -1,36 +1,36 @@
-require 'json'
+require "json"
 
 module Avo
   module Fields
     class KeyValueField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'key-value-field',
+          partial_name: "key-value-field"
         }
 
         super(name, **args, &block)
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : 'Key'
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : 'Value'
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : 'Add row'
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : 'Delete row'
+        @key_label = args[:key_label].present? ? args[:key_label].to_s : "Key"
+        @value_label = args[:value_label].present? ? args[:value_label].to_s : "Value"
+        @action_text = args[:action_text].present? ? args[:action_text].to_s : "Add row"
+        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : "Delete row"
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)
-        if args[:disable_editing_keys].present? && args[:disable_editing_keys] == true
-          @disable_adding_rows = true
+        @disable_adding_rows = if args[:disable_editing_keys].present? && args[:disable_editing_keys] == true
+          true
         elsif args[:disable_adding_rows].present?
-          @disable_adding_rows = args[:disable_adding_rows]
+          args[:disable_adding_rows]
         else
-          @disable_adding_rows = false
+          false
         end
         @disable_deleting_rows = args[:disable_deleting_rows].present? ? args[:disable_deleting_rows] : false
       end
 
       def to_permitted_param
-        [:"#{id}", "#{id}": {} ]
+        [:"#{id}", "#{id}": {}]
       end
 
       def hydrate_field(fields, model, resource, view)
@@ -41,7 +41,7 @@ module Avo
           delete_text: @delete_text,
           disable_editing_keys: @disable_editing_keys,
           disable_adding_rows: @disable_adding_rows,
-          disable_deleting_rows: @disable_deleting_rows,
+          disable_deleting_rows: @disable_deleting_rows
         }
       end
     end

data/lib/avo/fields/markdown_field.rb

@@ -3,7 +3,7 @@ module Avo
     class MarkdownField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'markdown-field',
+          partial_name: "markdown-field"
         }
 
         super(name, **args, &block)
@@ -11,7 +11,7 @@ module Avo
         hide_on :index
 
         @always_show = args[:always_show].present? ? args[:always_show] : false
-        @height = args[:height].present? ? args[:height].to_s : 'auto'
+        @height = args[:height].present? ? args[:height].to_s : "auto"
       end
 
       def hydrate_field(fields, model, resource, view)

data/lib/avo/fields/number_field.rb

@@ -3,8 +3,8 @@ module Avo
     class NumberField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'number-field',
-          computable: true,
+          partial_name: "number-field",
+          computable: true
         }
 
         super(name, **args, &block)
@@ -12,7 +12,7 @@ module Avo
         @meta = {
           min: args[:min].present? ? args[:min].to_f : nil,
           max: args[:max].present? ? args[:max].to_f : nil,
-          step: args[:step].present? ? args[:step].to_f : nil,
+          step: args[:step].present? ? args[:step].to_f : nil
         }
       end
     end

data/lib/avo/fields/password_field.rb

@@ -3,7 +3,7 @@ module Avo
     class PasswordField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'password-field',
+          partial_name: "password-field"
         }
 
         show_on :forms

data/lib/avo/fields/select_field.rb

@@ -7,7 +7,7 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'select-field',
+          partial_name: "select-field"
         }
 
         super(name, **args, &block)
@@ -16,7 +16,7 @@ module Avo
         @options = ActiveSupport::HashWithIndifferentAccess.new @options
         @enum = args[:enum].present? ? args[:enum] : nil
         @display_value = args[:display_value].present? ? args[:display_value] : false
-        @placeholder = args[:placeholder].present? ? args[:placeholder].to_s : I18n.t('avo.choose_an_option')
+        @placeholder = args[:placeholder].present? ? args[:placeholder].to_s : I18n.t("avo.choose_an_option")
       end
 
       def options_for_select
@@ -26,24 +26,20 @@ module Avo
           else
             options.map { |label, value| [label, label] }.to_h
           end
+        elsif display_value
+          options.map { |label, value| [value, value] }.to_h
         else
-          if display_value
-            options.map { |label, value| [value, value] }.to_h
-          else
-            options
-          end
+          options
         end
       end
 
       def label
         if display_value
           value
+        elsif enum.present?
+          options[value]
         else
-          if enum.present?
-            options[value]
-          else
-            options.invert[value]
-          end
+          options.invert[value]
         end
       end
     end