avo 2.5.1 → 2.5.2.pre.1

data/app/components/avo/card_component.rb

@@ -3,9 +3,21 @@
 class Avo::CardComponent < ViewComponent::Base
   def initialize(card: nil)
     @card = card
+
+    init_card
   end
 
   def render?
     !@card.nil?
   end
+
+  # Initializing the card byt running the query method.
+  # We'll still keep the query block around for compatibility reasons.
+  def init_card
+    if @card.respond_to? :query
+      @card.query
+    elsif @card.query_block.present?
+      @card.compute_result
+    end
+  end
 end

data/app/views/avo/dashboards/_chartkick_card.html.erb

@@ -1,3 +1,3 @@
 <div class="relative flex flex-col <%= @card.chartkick_classes %>">
-  <%= send(@card.chart_type, @card.compute_result.result_data, **@card.chartkick_options) %>
+  <%= send(@card.chart_type, @card.result_data, **@card.chartkick_options) %>
 </div>

data/app/views/avo/dashboards/_metric_card.html.erb

@@ -1,5 +1,5 @@
 <div class="flex mt-4 items-end">
   <span class="text-3xl"><%= @card.prefix %></span>
-  <span class="text-5xl"><%= @card.compute_result.result_data %></span>
+  <span class="text-5xl"><%= @card.result_data %></span>
   <span class="text-3xl"><%= @card.suffix %></span>
 </div>

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.5.1" unless const_defined?(:VERSION)
+  VERSION = "2.5.2.pre.1" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/cards/chartkick_card.tt

@@ -3,7 +3,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart
 
-  query do
+  def query
     data = 3.times.map do |index|
       {
         name: "Batch #{index}",

data/lib/generators/avo/templates/cards/chartkick_card_sample.tt

@@ -9,7 +9,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   # self.chart_options = { library: { plugins: { legend: { display: true } } } }
   # self.flush = true
 
-  query do
+  def query
     points = 16
     i = Time.new.year.to_i - points
     base_data = Array.new(points).map do

data/lib/generators/avo/templates/cards/metric_card.tt

@@ -2,7 +2,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
 
-  query do
+  def query
     result 101
   end
 end

data/lib/generators/avo/templates/cards/metric_card_sample.tt

@@ -8,7 +8,7 @@ class <%= class_name.camelize %> < Avo::Dashboards::MetricCard
   # self.prefix = ""
   # self.suffix = ""
 
-  query do
+  def query
     # from = Date.today.midnight - 1.week
     # to = DateTime.current
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2.pre.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -248,6 +248,9 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/assets/builds/avo.css
+- app/assets/builds/avo.js
+- app/assets/builds/avo.js.map
 - app/assets/config/avo_manifest.js
 - app/assets/stylesheets/avo.css
 - app/assets/stylesheets/css/active-storage.css
@@ -1320,9 +1323,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: