avo 0.5.0.beta9 → 0.5.0.beta10

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

data/lib/avo/fields/status_field.rb

@@ -3,7 +3,7 @@ module Avo
     class StatusField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'status-field',
+          partial_name: "status-field"
         }
 
         super(name, **args, &block)
@@ -13,10 +13,10 @@ module Avo
       end
 
       def status
-        status = 'success'
+        status = "success"
         if value.present?
-          status = 'failed' if @failed_when.include? value.to_sym
-          status = 'loading' if @loading_when.include? value.to_sym
+          status = "failed" if @failed_when.include? value.to_sym
+          status = "loading" if @loading_when.include? value.to_sym
         end
 
         status

data/lib/avo/fields/text_field.rb

@@ -3,8 +3,8 @@ module Avo
     class TextField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'text-field',
-          computable: true,
+          partial_name: "text-field",
+          computable: true
         }.merge(@defaults || {})
 
         super(name, **args, &block)

data/lib/avo/fields/textarea_field.rb

@@ -3,8 +3,8 @@ module Avo
     class TextareaField < TextField
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'textarea-field',
-          computable: true,
+          partial_name: "textarea-field",
+          computable: true
         }
 
         super(name, **args, &block)

data/lib/avo/fields/trix_field.rb

@@ -5,7 +5,7 @@ module Avo
 
       def initialize(name, **args, &block)
         @defaults = {
-          partial_name: 'trix-field',
+          partial_name: "trix-field"
         }
 
         super(name, **args, &block)

data/lib/avo/fields_collector.rb

@@ -11,16 +11,15 @@ module Avo
         field[:name].to_s == as.to_s
       end
 
-      if matched_field.present? and matched_field[:class].present?
+      if matched_field.present? && matched_field[:class].present?
         klass = matched_field[:class]
 
-        if block_given?
-          field = klass.new(field_name, **args || {}, &block)
+        if block
+          klass.new(field_name, **args || {}, &block)
         else
-          field = klass.new(field_name, **args || {})
+          klass.new(field_name, **args || {})
         end
 
-        field
       end
     end
 

data/lib/avo/filters/base_filter.rb

@@ -1,19 +1,19 @@
 module Avo
   module Filters
     class BaseFilter
-      class_attribute :name, default: 'Filter'
-      class_attribute :component, default: 'boolean-filter'
-      class_attribute :default, default: ''
-      class_attribute :template, default: 'avo/base/select_filter'
+      class_attribute :name, default: "Filter"
+      class_attribute :component, default: "boolean-filter"
+      class_attribute :default, default: ""
+      class_attribute :template, default: "avo/base/select_filter"
 
       def apply_query(request, query, value)
         value.symbolize_keys! if value.is_a? Hash
 
-        self.apply(request, query, value)
+        apply(request, query, value)
       end
 
       def id
-        self.class.name.underscore.gsub('/', '_')
+        self.class.name.underscore.tr("/", "_")
       end
     end
   end

data/lib/avo/filters/boolean_filter.rb

@@ -1,7 +1,7 @@
 module Avo
   module Filters
     class BooleanFilter < BaseFilter
-      self.template = 'avo/base/boolean_filter'
+      self.template = "avo/base/boolean_filter"
     end
   end
 end

data/lib/avo/filters/select_filter.rb

@@ -1,7 +1,7 @@
 module Avo
   module Filters
     class SelectFilter < BaseFilter
-      self.template = 'avo/base/select_filter'
+      self.template = "avo/base/select_filter"
     end
   end
 end

data/lib/avo/licensing/h_q.rb

@@ -3,8 +3,8 @@ module Avo
     class HQ
       attr_accessor :current_request
 
-      ENDPOINT = 'https://avohq.io/api/v1/licenses/check' unless const_defined?(:ENDPOINT)
-      CACHE_KEY = 'avo.hq.response' unless const_defined?(:CACHE_KEY)
+      ENDPOINT = "https://avohq.io/api/v1/licenses/check" unless const_defined?(:ENDPOINT)
+      CACHE_KEY = "avo.hq.response" unless const_defined?(:CACHE_KEY)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
 
       def initialize(current_request)
@@ -13,76 +13,77 @@ module Avo
       end
 
       def response
-        @hq_response or request
+        @hq_response || request
       end
 
       private
-        def request
-          return cached_response if has_cached_response
-
-          begin
-            perform_and_cache_request
-          rescue HTTParty::Error => exception
-            cache_and_return_error 'HTTP client error.', exception.message
-          rescue Net::OpenTimeout => exception
-            cache_and_return_error 'Request timeout.', exception.message
-          rescue SocketError => exception
-            cache_and_return_error 'Connection error.', exception.message
-          end
+
+      def request
+        return cached_response if has_cached_response
+
+        begin
+          perform_and_cache_request
+        rescue HTTParty::Error => exception
+          cache_and_return_error "HTTP client error.", exception.message
+        rescue Net::OpenTimeout => exception
+          cache_and_return_error "Request timeout.", exception.message
+        rescue SocketError => exception
+          cache_and_return_error "Connection error.", exception.message
         end
+      end
 
-        def perform_and_cache_request
-          hq_response = perform_request
+      def perform_and_cache_request
+        hq_response = perform_request
 
-          return cache_and_return_error 'Avo HQ Internal server error.', hq_response.body if hq_response.code == 500
+        return cache_and_return_error "Avo HQ Internal server error.", hq_response.body if hq_response.code == 500
 
-          cache_response 1.hour.to_i, hq_response.parsed_response if hq_response.code == 200
-        end
+        cache_response 1.hour.to_i, hq_response.parsed_response if hq_response.code == 200
+      end
 
-        def cache_response(time, response)
-          response.merge!(
-            expiry: time,
-            **payload,
-          ).stringify_keys!
+      def cache_response(time, response)
+        response.merge!(
+          expiry: time,
+          **payload
+        ).stringify_keys!
 
-          @cache_store.write(CACHE_KEY, response, expires_in: time)
+        @cache_store.write(CACHE_KEY, response, expires_in: time)
 
-          @hq_response = response
+        @hq_response = response
 
-          response
-        end
+        response
+      end
 
-        def perform_request
-          puts 'Performing request to avohq.io API to check license availability.'.inspect if Rails.env.development?
+      def perform_request
+        puts "Performing request to avohq.io API to check license availability.".inspect if Rails.env.development?
 
-          HTTParty.post ENDPOINT, body: payload.to_json, headers: { 'Content-type': 'application/json' }, timeout: REQUEST_TIMEOUT
-        end
+        HTTParty.post ENDPOINT, body: payload.to_json, headers: {'Content-type': "application/json"}, timeout: REQUEST_TIMEOUT
+      end
 
-        def payload
-          {
-            license: Avo.configuration.license,
-            license_key: Avo.configuration.license_key,
-            avo_version: Avo::VERSION,
-            rails_version: Rails::VERSION::STRING,
-            ruby_version: RUBY_VERSION,
-            environment: Rails.env,
-            ip: current_request.ip,
-            host: current_request.host,
-            port: current_request.port,
-          }
-        end
+      def payload
+        {
+          license: Avo.configuration.license,
+          license_key: Avo.configuration.license_key,
+          avo_version: Avo::VERSION,
+          rails_version: Rails::VERSION::STRING,
+          ruby_version: RUBY_VERSION,
+          environment: Rails.env,
+          ip: current_request.ip,
+          host: current_request.host,
+          port: current_request.port
+        }
+      end
 
-        def cache_and_return_error(error, exception_message = '')
-          cache_response 5.minutes.to_i, { error: error, exception_message: exception_message }.stringify_keys
-        end
+      def cache_and_return_error(error, exception_message = "")
+        cache_response 5.minutes.to_i, {error: error, exception_message: exception_message}.stringify_keys
+      end
 
-        def has_cached_response
-          @cache_store.exist? CACHE_KEY
-        end
+      def has_cached_response
+        @cache_store.exist? CACHE_KEY
+      end
 
-        def cached_response
-          @cache_store.read CACHE_KEY
-        end
+      def cached_response
+        @cache_store.read CACHE_KEY
+      end
     end
   end
 end

data/lib/avo/licensing/license.rb

@@ -7,8 +7,8 @@ module Avo
 
       def initialize(response)
         @response = response
-        @id = response['id']
-        @valid = response['valid']
+        @id = response["id"]
+        @valid = response["valid"]
       end
 
       def valid?
@@ -20,15 +20,15 @@ module Avo
       end
 
       def pro?
-        id == 'pro'
+        id == "pro"
       end
 
       def error
-        @response['error']
+        @response["error"]
       end
 
       def properties
-        @response.slice('valid', 'id', 'error').symbolize_keys
+        @response.slice("valid", "id", "error").symbolize_keys
       end
 
       def abilities