avo 0.5.0.beta6 → 0.5.0.beta11

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

@@ -0,0 +1,30 @@
+module Avo
+  module FieldsCollector
+    def field(field_name, as:, **args, &block)
+      self.fields ||= []
+
+      self.fields << parse_field(field_name, as: as, **args, &block)
+    end
+
+    def parse_field(field_name, as:, **args, &block)
+      matched_field = Avo::App.fields.find do |field|
+        field[:name].to_s == as.to_s
+      end
+
+      if matched_field.present? && matched_field[:class].present?
+        klass = matched_field[:class]
+
+        if block
+          klass.new(field_name, **args || {}, &block)
+        else
+          klass.new(field_name, **args || {})
+        end
+
+      end
+    end
+
+    def heading(body, **args)
+      self.fields << Avo::Fields::HeadingField.new(body, **args)
+    end
+  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/grid_collector.rb

@@ -0,0 +1,39 @@
+module Avo
+  class GridCollector
+    include FieldsCollector
+
+    attr_accessor :cover_field
+    attr_accessor :title_field
+    attr_accessor :body_field
+
+    def initialize
+      @cover_field = nil
+      @title_field = nil
+      @body_field = nil
+    end
+
+    def cover(field_name, as:, **args, &block)
+      self.cover_field = parse_field(field_name, as: as, **args, &block)
+    end
+
+    def title(field_name, as:, **args, &block)
+      self.title_field = parse_field(field_name, as: as, **args, &block)
+    end
+
+    def body(field_name, as:, **args, &block)
+      self.body_field = parse_field(field_name, as: as, **args, &block)
+    end
+
+    def hydrate(model:, view:, resource:)
+      cover_field.hydrate(model: model, view: view, resource: resource) if cover_field.present?
+      title_field.hydrate(model: model, view: view, resource: resource) if title_field.present?
+      body_field.hydrate(model: model, view: view, resource: resource) if title_field.present?
+
+      self
+    end
+
+    def blank?
+      title_field.blank?
+    end
+  end
+end

data/lib/avo/has_context.rb

@@ -0,0 +1,7 @@
+module Avo
+  module HasContext
+    def context
+      App.context
+    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

data/lib/avo/licensing/license_manager.rb

@@ -6,12 +6,12 @@ module Avo
       end
 
       def license
-        return NullLicense.new if Rails.env.test? and ENV['RUN_WITH_NULL_LICENSE'] == '1'
+        return NullLicense.new if Rails.env.test? && (ENV["RUN_WITH_NULL_LICENSE"] == "1")
 
-        case @hq_response['id']
-        when 'community'
+        case @hq_response["id"]
+        when "community"
           CommunityLicense.new @hq_response
-        when 'pro'
+        when "pro"
           ProLicense.new @hq_response
         else
           NullLicense.new @hq_response

data/lib/avo/licensing/null_license.rb

@@ -3,8 +3,8 @@ module Avo
     class NullLicense < License
       def initialize(response = nil)
         response ||= {
-          id: 'community',
-          valid: true,
+          id: "community",
+          valid: true
         }
 
         super(response)

data/lib/avo/licensing/pro_license.rb

@@ -3,7 +3,7 @@ module Avo
     class ProLicense < License
       def abilities
         [
-          :authorization,
+          :authorization
         ]
       end
     end

data/lib/avo/loaders/fields_loader.rb

@@ -10,13 +10,13 @@ module Avo
           field[:name].to_s == method.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.present?
-            field = klass.new(args[0], **args[1] || {}, &block)
+          field = if block.present?
+            klass.new(args[0], **args[1] || {}, &block)
           else
-            field = klass.new(args[0], **args[1] || {})
+            klass.new(args[0], **args[1] || {})
           end
 
           add_field field

data/lib/avo/services/authorization_service.rb

@@ -44,7 +44,7 @@ module Avo
             end
 
             true
-          rescue Pundit::NotDefinedError => error
+          rescue Pundit::NotDefinedError
             false
           rescue => error
             if args[:raise_exception] == false
@@ -69,7 +69,7 @@ module Avo
 
           begin
             Pundit.policy_scope! user, model
-          rescue => exception
+          rescue
             model
           end
         end

data/lib/avo/services/panel_service.rb

@@ -11,15 +11,15 @@ module Avo
       end
 
       def default_panel_name
-        return @request[:via_relation_param].capitalize if @request[:via_relation_param] == 'has_one'
+        return @request[:via_relation_param].capitalize if @request[:via_relation_param] == "has_one"
 
         case @view
         when :show
-          I18n.t('avo.resource_details', item: @resource.name.downcase, title: @resource.model_title).upcase_first
+          I18n.t("avo.resource_details", item: @resource.name.downcase, title: @resource.model_title).upcase_first
         when :edit
-          I18n.t('avo.update_item', item: @resource.name.downcase, title: @resource.model_title).upcase_first
+          I18n.t("avo.update_item", item: @resource.name.downcase, title: @resource.model_title).upcase_first
         when :new
-          I18n.t('avo.create_new_item', item: @resource.name.downcase).upcase_first
+          I18n.t("avo.create_new_item", item: @resource.name.downcase).upcase_first
         end
       end
     end