avo 3.0.0.pre13 → 3.0.0.pre14

data/lib/avo/fields/belongs_to_field.rb

@@ -113,16 +113,16 @@ module Avo
 
       def values_for_type(model = nil)
         resource = target_resource
-        resource = Avo::App.resources.get_resource_by_model_class model if model.present?
+        resource = Avo.resource_manager.get_resource_by_model_class model if model.present?
 
-        query = resource.class.query_scope
+        query = resource.query_scope
 
         if attach_scope.present?
           query = Avo::ExecutionContext.new(target: attach_scope, query: query, parent: get_model).handle
         end
 
         query.all.map do |record|
-          [resource.hydrate(record: record).record_title, record.id]
+          [resource.new(record: record).record_title, record.id]
         end
       end
 
@@ -180,7 +180,8 @@ module Avo
       end
 
       def label
-        target_resource.hydrate(record: value).record_title
+        return if target_resource.blank?
+        target_resource.new(record: value)&.record_title
       end
 
       def to_permitted_param
@@ -232,7 +233,7 @@ module Avo
 
         if is_polymorphic?
           if value.present?
-            return Avo::App.resources.get_resource_by_model_class(value.class)
+            return Avo.resource_manager.get_resource_by_model_class(value.class)
           else
             return nil
           end
@@ -241,9 +242,9 @@ module Avo
         reflection_key = polymorphic_as || id
 
         if @record._reflections[reflection_key.to_s].klass.present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s
         elsif @record._reflections[reflection_key.to_s].options[:class_name].present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name]
         else
           App.get_resource_by_name reflection_key.to_s
         end

data/lib/avo/fields/concerns/is_searchable.rb

@@ -5,7 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def is_searchable?
-          defined?(AvoPro) && @searchable && ::Avo::App.license.has_with_trial(:searchable_associations)
+          defined?(Avo::Pro) && @searchable && Avo.license.has_with_trial(:searchable_associations)
         end
       end
     end

data/lib/avo/fields/concerns/use_resource.rb

@@ -5,7 +5,7 @@ module Avo
         extend ActiveSupport::Concern
 
         def use_resource
-          Avo::App.resources.get_resource @use_resource
+          Avo.resource_manager.get_resource @use_resource
         rescue
           # On boot we eager load the resources before the app is set.
           # Because of that, we don't have a resource manager.

data/lib/avo/fields/field_manager.rb

@@ -11,12 +11,22 @@ module Avo
 
       attr_reader :fields
 
-      alias_method :all, :fields
-
       def initialize
         @fields = []
       end
 
+      def all
+        fields
+          .map do |field|
+            field[:name] = field[:name].to_s
+
+            field
+          end
+          .uniq do |field|
+            field[:name]
+          end
+      end
+
       # This method will find all fields available in the Avo::Fields namespace and add them to the fields class_variable array
       # so later we can instantiate them on our resources.
       #
@@ -36,7 +46,7 @@ module Avo
 
       def load_field(method_name, klass)
         fields.push(
-          name: method_name,
+          name: method_name.to_s,
           class: klass
         )
       end

data/lib/avo/fields/has_base_field.rb

@@ -27,7 +27,7 @@ module Avo
       end
 
       def field_resource
-        resource || Avo::App.resources.get_resource_by_model_class(@record.class)
+        resource || Avo.resource_manager.get_resource_by_model_class(@record.class)
       end
 
       def turbo_frame
@@ -57,11 +57,11 @@ module Avo
 
       def target_resource
         if @record._reflections[id.to_s].klass.present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s
         elsif @record._reflections[id.to_s].options[:class_name].present?
-          Avo::App.resources.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
+          Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name]
         else
-          Avo::App.resources.get_resource_by_name id.to_s
+          Avo.resource_manager.get_resource_by_name id.to_s
         end
       end
 

data/lib/avo/fields/has_one_field.rb

@@ -29,7 +29,7 @@ module Avo
           related_record = nil
         else
           related_class = model.class.reflections[name.to_s.downcase].class_name
-          related_resource = Avo::App.resources.get_resource_by_model_class(related_class)
+          related_resource = Avo.resource_manager.get_resource_by_model_class(related_class)
           related_record = related_resource.find_record value
         end
 

data/lib/avo/fields/location_field.rb

@@ -3,13 +3,14 @@
 module Avo
   module Fields
     class LocationField < BaseField
-      attr_reader :stored_as
+      attr_reader :stored_as, :zoom
 
       def initialize(id, **args, &block)
         hide_on :index
         super(id, **args, &block)
 
         @stored_as = args[:stored_as].present? ? args[:stored_as] : nil # You can pass it an array of db columns [:latitude, :longitude]
+        @zoom = args[:zoom].present? ? args[:zoom].to_i : 15
       end
 
       def value_as_array?
@@ -59,11 +60,27 @@ module Avo
         end
       end
 
+      def value
+        if value_as_array?
+          [@record.send(stored_as.first), @record.send(stored_as.last)]
+        else
+          super
+        end
+      end
+
       def value_present?
         return value.first.present? && value.second.present? if value.is_a?(Array) && value.count == 2
 
         value.present?
       end
+
+      def assign_value(record:, value:)
+        return super if stored_as.blank?
+
+        stored_as.each_with_index do |database_id, index|
+          record.send("#{database_id}=", value[index])
+        end
+      end
     end
   end
 end

data/lib/avo/licensing/h_q.rb

@@ -4,6 +4,7 @@ module Avo
       attr_accessor :current_request
       attr_accessor :cache_store
 
+      # ENDPOINT = "https://v3.avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       ENDPOINT = "https://avohq.io/api/v1/licenses/check".freeze unless const_defined?(:ENDPOINT)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
       CACHE_TIME = 3600 unless const_defined?(:CACHE_TIME) # seconds
@@ -16,7 +17,7 @@ module Avo
 
       def initialize(current_request = nil)
         @current_request = current_request
-        @cache_store = Avo::App.cache_store
+        @cache_store = Avo.cache_store
       end
 
       def response
@@ -69,10 +70,10 @@ module Avo
           app_name: app_name
         }
 
-        metadata = Avo::Services::DebugService.avo_metadata
-        if metadata[:resources_count] != 0
-          result[:avo_metadata] = metadata
-        end
+        # metadata = Avo::Services::DebugService.avo_metadata
+        # if metadata[:resources_count] != 0
+        #   result[:avo_metadata] = "metadata"
+        # end
 
         result
       end
@@ -149,7 +150,11 @@ module Avo
       def perform_request
         Avo.logger.debug "Performing request to avohq.io API to check license availability." if Rails.env.development?
 
-        HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
+        if Rails.env.test?
+          OpenStruct.new({code: 200, parsed_response: {id: "pro", valid: true}})
+        else
+          HTTParty.post ENDPOINT, body: payload.to_json, headers: {"Content-type": "application/json"}, timeout: REQUEST_TIMEOUT
+        end
       end
 
       def app_name

data/lib/avo/licensing/license.rb

@@ -6,7 +6,7 @@ module Avo
       attr_accessor :valid
       attr_accessor :payload
 
-      def initialize(response)
+      def initialize(response = {})
         @response = response
         @id = response["id"]
         @valid = response["valid"]

data/lib/avo/licensing/license_manager.rb

@@ -12,7 +12,7 @@ module Avo
         when "pro"
           ProLicense.new @hq_response
         else
-          NullLicense.new @hq_response
+          NilLicense.new @hq_response
         end
       end
 

data/lib/avo/licensing/{null_license.rb → nil_license.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Licensing
-    class NullLicense < License
+    class NilLicense < License
       def initialize(response = nil)
         response ||= {
           id: "community",

data/lib/avo/loaders/fields_loader.rb

@@ -6,7 +6,7 @@ module Avo
       end
 
       def method_missing(method, *args, &block)
-        matched_field = Avo::App.fields.find do |field|
+        matched_field = Avo.field_manager.find do |field|
           field[:name].to_s == method.to_s
         end
 
@@ -22,6 +22,12 @@ module Avo
           add_field field
         end
       end
+
+      def respond_to_missing?(method)
+        Avo.field_manager.find do |field|
+          field[:name].to_s == method.to_s
+        end
+      end
     end
   end
 end

data/lib/avo/plugin_manager.rb

@@ -25,15 +25,13 @@ module Avo
     end
 
     def register_field(method_name, klass)
-      Avo::App.fields.load_field method_name, klass
+      Avo.field_manager.load_field method_name, klass
     end
 
     def register_resource_tool
-      # puts ["register_resource_tool->"].inspect
     end
 
     def register_tool
-      # puts ["register_tool->"].inspect
     end
 
     def as_json(*arg)
@@ -47,7 +45,7 @@ module Avo
 
     def installed?(name)
       plugins.any? do |plugin|
-        plugin.klass.to_s.split("::").first.underscore == name.to_s || plugin.klass.to_s.split("::").first == name.to_s
+        plugin.klass.to_s.chomp("::Plugin").underscore.tr("/", "-") == name.to_s
       end
     end
   end

data/lib/avo/reloader.rb

@@ -46,7 +46,7 @@ class Avo::Reloader
     if reload_lib?
       dirs[Avo::Engine.root.join("lib", "avo").to_s] = ["rb"]
       if Avo.avo_filters_installed?
-        dirs[AvoFilters::Engine.root.join("lib", "avo_filters").to_s] = ["rb"]
+        dirs[Avo::DynamicFilters::Engine.root.join("lib", "avo", "dynamic_filters").to_s] = ["rb"]
       end
     end
 

data/lib/avo/resources/items/holder.rb

@@ -22,7 +22,7 @@ class Avo::Resources::Items::Holder
         name: field_name,
         as: as,
         # resource: resource_class.name,
-        message: "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: #{as}</code>"
+        message: "There's an invalid field configuration for this resource. <br/> <code class='px-1 py-px rounded bg-red-600'>field :#{field_name}, as: :#{as}</code>"
       })
     end
 
@@ -41,6 +41,10 @@ class Avo::Resources::Items::Holder
     add_item Avo::Resources::Items::Tab::Builder.parse_block(name: name, **args, &block)
   end
 
+  def row(**args, &block)
+    add_item Avo::Resources::Items::Row::Builder.parse_block(**args, &block)
+  end
+
   def tool(klass, **args)
     instance = klass.new(**args)
     add_item instance

data/lib/avo/resources/items/item_group.rb

@@ -30,6 +30,7 @@ class Avo::Resources::Items::ItemGroup
 
     delegate :heading, to: :items_holder
     delegate :field, to: :items_holder
+    delegate :row, to: :items_holder
     delegate :items, to: :items_holder
 
     attr_reader :items_holder

data/lib/avo/resources/items/row.rb

@@ -0,0 +1,54 @@
+class Avo::Resources::Items::Row
+  include Avo::Concerns::IsResourceItem
+  include Avo::Concerns::HasItems
+  include Avo::Concerns::HasItemType
+  include Avo::Concerns::IsVisible
+
+  class_attribute :item_type, default: :row
+
+  attr_reader :view
+  attr_accessor :items_holder
+
+  delegate :items, :add_item, to: :items_holder
+
+  def initialize(view: nil)
+    @view = view
+    @items_holder = Avo::Resources::Items::Holder.new
+  end
+
+  def hydrate(view: nil, resource: nil, **args)
+    @view = view
+    @resource = resource
+
+    self
+  end
+
+  def has_items?
+    @items.present?
+  end
+
+  class Builder
+    class << self
+      def parse_block(**args, &block)
+        Docile.dsl_eval(new(**args), &block).build
+      end
+    end
+
+    attr_reader :items_holder
+
+    delegate :field, to: :items_holder
+    delegate :tool, to: :items_holder
+    delegate :items, to: :items_holder
+
+    def initialize(**args)
+      @row = Avo::Resources::Items::Row.new(**args)
+      @items_holder = Avo::Resources::Items::Holder.new
+    end
+
+    # Fetch the tab
+    def build
+      @row.items_holder = @items_holder
+      @row
+    end
+  end
+end

data/lib/avo/resources/resource_manager.rb

@@ -66,9 +66,6 @@ module Avo
             # We need to de-duplicate them
             klass.name
           end
-          .map do |resource|
-            resource.new if resource.is_a? Class
-          end
       end
 
       def check_bad_resources
@@ -76,13 +73,13 @@ module Avo
           has_model = resource.model_class.present?
 
           unless has_model
-            possible_model = resource.class.to_s.gsub "Avo::Resources::", ""
+            possible_model = resource.to_s.gsub "Avo::Resources::", ""
             possible_model = possible_model.gsub "Resource", ""
 
-            Avo::App.errors.add({
+            Avo.error_manager.add({
               url: "https://docs.avohq.io/2.0/resources.html#custom-model-class",
               target: "_blank",
-              message: "#{resource.class} does not have a valid model assigned. It failed to find the #{possible_model} model. \n\r Please create that model or assign one using self.model_class = YOUR_MODEL"
+              message: "#{resource} does not have a valid model assigned. It failed to find the #{possible_model} model. \n\r Please create that model or assign one using self.model_class = YOUR_MODEL"
             })
           end
         end
@@ -100,7 +97,7 @@ module Avo
         resource = "Avo::Resources::#{resource}" unless resource.to_s.starts_with?("Avo::Resources::")
 
         resources.find do |available_resource|
-          resource.to_s == available_resource.class.to_s
+          resource.to_s == available_resource.to_s
         end
       end
 

data/lib/avo/services/debug_service.rb

@@ -12,7 +12,7 @@ class Avo::Services::DebugService
       payload[:hq_payload] = hq&.payload
       payload[:thread_count] = get_thread_count
       payload[:license_abilities] = Avo::Current&.license&.abilities
-      payload[:cache_store] = Avo::App.cache_store&.class&.to_s
+      payload[:cache_store] = Avo.cache_store&.class&.to_s
       payload[:avo_metadata] = avo_metadata
       payload[:app_timezone] = Time.current.zone
       payload[:cache_key] = Avo::Licensing::HQ.cache_key
@@ -31,8 +31,8 @@ class Avo::Services::DebugService
     end
 
     def avo_metadata
-      resources = Avo::Current.app.resource_manager.all
-      dashboards = defined?(AvoDashboards) ? AvoDashboards.dashboard_manager.all : []
+      resources = Avo.resource_manager.all
+      dashboards = defined?(Avo::Dashboards) ? Avo::Dashboards.dashboard_manager.all : []
       field_definitions = resources.map(&:get_field_definitions)
       fields_count = field_definitions.map(&:count).sum
       fields_per_resource = sprintf("%0.01f", fields_count / (resources.count + 0.0))
@@ -55,11 +55,11 @@ class Avo::Services::DebugService
         fields_per_resource: fields_per_resource,
         custom_fields_count: custom_fields_count,
         field_types: field_types,
-        # **other_metadata(:actions), #FIEXME: this is fetching actions without hydration
+        # **other_metadata(:actions), # TODO: this is fetching actions without hydration
         **other_metadata(:filters),
         main_menu_present: Avo.configuration.main_menu.present?,
         profile_menu_present: Avo.configuration.profile_menu.present?,
-        cache_store: Avo::App.cache_store&.class&.to_s,
+        cache_store: Avo.cache_store&.class&.to_s,
         **config_metadata
       }
     # rescue => error
@@ -69,7 +69,7 @@ class Avo::Services::DebugService
     end
 
     def other_metadata(type = :actions)
-      resources = Avo::Current.app.resource_manager.all
+      resources = Avo.resource_manager.all
 
       types = resources.map(&:"get_#{type}")
       type_count = types.flatten.uniq.count

data/lib/avo/services/telemetry_service.rb

@@ -23,7 +23,7 @@ class Avo::Services::TelemetryService
     end
 
     def avo_metadata
-      resources = Avo::Current.app.resource_manager.all
+      resources = Avo.resource_manager.all
       dashboards = Avo::Current.app.dashboard_manager.all
       field_definitions = resources.map(&:get_field_definitions)
       fields_count = field_definitions.map(&:count).sum
@@ -51,7 +51,7 @@ class Avo::Services::TelemetryService
         **other_metadata(:filters),
         main_menu_present: Avo.configuration.main_menu.present?,
         profile_menu_present: Avo.configuration.profile_menu.present?,
-        cache_store: Avo::App.cache_store&.class&.to_s,
+        cache_store: Avo.cache_store&.class&.to_s,
         **config_metadata
       }
     # rescue => error
@@ -61,7 +61,7 @@ class Avo::Services::TelemetryService
     end
 
     def other_metadata(type = :actions)
-      resources = Avo::Current.app.resource_manager.all
+      resources = Avo.resource_manager.all
 
       types = resources.map(&:"get_#{type}")
       type_count = types.flatten.uniq.count

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.0.pre13" unless const_defined?(:VERSION)
+  VERSION = "3.0.0.pre14" unless const_defined?(:VERSION)
 end

data/lib/avo.rb

@@ -11,31 +11,9 @@ loader.inflector.inflect(
 loader.ignore("#{__dir__}/generators")
 loader.setup
 
-#                                      .//*,,.....,,*/(*
-#                                   **,,..............,*#.
-#                               ,*,,.....         .....*/#.
-#                            **,,....             ....,*/%%
-#                        ,**,,.......           . ....*/#&%
-#                    **,,,...... .             . ....*/#&&%
-#                **,,........ .           .     ...,//#&&&.
-#            */*,,..*//***,,,,*/(,..      .. .....*//%&%&*
-#         ,/**,..**/******,,***/(###,...........,//(%&&%.
-#       /**,,..((//*****////((##%%%%%*.........*//%%&&%
-#     ****,...#/**,,,*,*/(#%##%%%%&&&(*,.....,*/(%&&&/
-#    /**,....(/*,,,,,,,*(##%%%%%&&&&&(,.....,*(#&&&&.
-#  ,//*,.....(/*,,**//(##%%%%&&&&@&&%/,....,*((&&&&*
-# .//*,,.....(((//(((##%%%&&&&&&&&@#/,....,*/#%&&&#
-# (/**,,......###%%%%%&&&&&&&&&&@#/,,...,,*/#&&&&&
-# (/**,,........%%%%%&&&&&&&&@%(*,...,,,*//(&&&&%.
-# ///*,,,.........,*#&&&&#(/,,.....,,,*//(%&&&&%*
-#  (//**,,,.....................,,,,*//(%&&&&&&*
-#   *(///**,,,,............,,,,,,**/((&&&&&&&%.
-#     ((///*****,,,,,,,,,,,,***//((&&&&&%&%&#
-#       .((((////********///(((%&%&&&&%%%%%
-#           (############%%%%%%%%%%%%%%%*
-#               ,(############%%%%%#*
-
 module Avo
+  extend ActiveSupport::LazyLoadHooks
+
   ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
@@ -64,8 +42,112 @@ module Avo
   class DeprecatedAPIError < StandardError; end
 
   class << self
+    attr_reader :logger
+    attr_reader :cache_store
+    attr_reader :field_manager
+
+    delegate :license, :app, :error_manager, :tool_manager, :resource_manager, to: Avo::Current
+
+    def boot
+      boot_logger
+      boot_fields
+      @cache_store = get_cache_store
+      plugin_manager.boot_plugins
+      Avo.run_load_hooks(:boot, self)
+    end
+
+    def init
+      Avo::Current.error_manager = Avo::ErrorManager.build
+      Avo::Current.resource_manager = Avo::Resources::ResourceManager.build
+      Avo::Current.tool_manager = Avo::Tools::ToolManager.build
+
+      Avo.run_load_hooks(:init, self)
+    end
+
+    # Renerate a dynamic root path using the URIService
+    def root_path(paths: [], query: {}, **args)
+      Avo::Services::URIService.parse(Avo::Current.view_context.avo.root_url.to_s)
+        .append_paths(paths)
+        .append_query(query)
+        .to_s
+    end
+
+    def mount_path
+      Avo::Engine.routes.find_script_name({})
+    end
+
+    def main_menu
+      return unless Avo.plugin_manager.installed?("avo-menu")
+
+      # Return empty menu if the app doesn't have the profile menu configured
+      return Avo::Menu::Builder.new.build unless has_main_menu?
+
+      Avo::Menu::Builder.parse_menu(&Avo.configuration.main_menu)
+    end
+
+    def profile_menu
+      return unless Avo.plugin_manager.installed?("avo-menu")
+
+      # Return empty menu if the app doesn't have the profile menu configured
+      return Avo::Menu::Builder.new.build unless has_profile_menu?
+
+      Avo::Menu::Builder.parse_menu(&Avo.configuration.profile_menu)
+    end
+
+    def app_status
+      license.valid?
+    end
+
     def avo_filters_installed?
-      defined?(AvoFilters).present?
+      defined?(Avo::DynamicFilters).present?
+    end
+
+    def has_main_menu?
+      return false if Avo.license.lacks_with_trial(:menu_editor)
+      return false if Avo.configuration.main_menu.nil?
+
+      true
+    end
+
+    def has_profile_menu?
+      return false if Avo.license.lacks_with_trial(:menu_editor)
+      return false if Avo.configuration.profile_menu.nil?
+
+      true
+    end
+
+    private
+
+    def boot_logger
+      file_logger = ActiveSupport::Logger.new(Rails.root.join("log", "avo.log"))
+
+      file_logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+      file_logger.formatter = proc do |severity, time, progname, msg|
+        "[Avo] #{time}: #{msg}\n".tap do |i|
+          puts i
+        end
+      end
+
+      @logger = file_logger
+    end
+
+    def boot_fields
+      @field_manager = Avo::Fields::FieldManager.build
+    end
+
+    def get_cache_store
+      if Rails.env.production?
+        case Rails.cache.class.to_s
+        when "ActiveSupport::Cache::MemCacheStore", "ActiveSupport::Cache::RedisCacheStore"
+          Rails.cache
+        else
+          ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
+        end
+      elsif Rails.env.test?
+        Rails.cache
+      else
+        ActiveSupport::Cache.lookup_store(:memory_store)
+      end
     end
   end
 end