avo 3.0.1.beta4 → 3.0.1.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737f7485e4fbc1d44c4241c0f39010b74d078f58e0cc06279223bb81e9878079
-  data.tar.gz: b19cc62af7812c430274e0f0b002843a7601ef16e81fa32b0dfc2ae8d96ca304
+  metadata.gz: e19747c9140b19ceca5cd7cecbbe40e42bc6409f98631b0ccaa0b47c0366657d
+  data.tar.gz: 9611006c73ee0c1e59710a4071b6ad6878c6eca4a3c83053f4d4f4c455404041
 SHA512:
-  metadata.gz: 995a9e1a12c9bce7368abdc7fb6b5cae46dff35603f3d7b51e4942a730d4f314f52fbfd04ee38948b3c919d3bf25440131559b5bed3a5af7331b608c50ef69d0
-  data.tar.gz: 8491c4c0b5a55144ee300574788591c45596b9b97e193e26688f01e8b319f0895eff3b3b55e9c7dca74bf18021f0cb00180f7d624bf22d4e7690daae1456c096
+  metadata.gz: 21af73f9bb522c0247ba3229203dcf5ecb8e026256a267a4f8226d618bf2bb28b20dc1a799d49c3d695651d3070fb6171f1a5f0c7169b3dc59b4403bf42c3e99
+  data.tar.gz: a29427283f5435e805f9cfc5d94f198eefca0d49b493366e32003cfc84cde58faff54d56c0ca74862155eb26fe06f5f4c671902abb20024d45d79ae100777ab4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.0.1.beta4)
+    avo (3.0.1.beta6)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/app/components/avo/fields/common/status_viewer_component.html.erb

@@ -2,12 +2,15 @@
   classes = "inline-block"
   classes += " text-red-600" if @status == 'failed'
   classes += " text-green-600" if @status == 'success'
+  classes += " text-gray-600" if @status == 'neutral'
 %>
 <div class="flex flex-shrink-0 <%= classes %> items-center">
   <% if @status == 'success' %>
     <%= helpers.svg 'heroicons/solid/check-circle', class: 'h-4' %>
   <% elsif @status == 'failed' %>
     <%= helpers.svg 'heroicons/solid/x-circle', class: 'h-4' %>
+  <% elsif @status == 'neutral' %>
+    <%= helpers.svg 'heroicons/solid/minus-circle', class: 'h-4' %>
   <% elsif @status == 'loading' %>
     <div class="spinner">
       <div class="double-bounce1 bg-gray-600"></div>

data/lib/avo/base_action.rb

@@ -25,7 +25,7 @@ module Avo
     delegate :view, to: :class
     # TODO: find a differnet way to delegate this to the uninitialized Current variable
     delegate :context, to: Avo::Current
-    def curent_user
+    def current_user
       Avo::Current.user
     end
     delegate :params, to: Avo::Current

data/lib/avo/base_resource.rb

@@ -12,7 +12,7 @@ module Avo
 
     # Avo::Current methods
     delegate :context, to: Avo::Current
-    def curent_user
+    def current_user
       Avo::Current.user
     end
     delegate :params, to: Avo::Current

data/lib/avo/configuration.rb

@@ -12,7 +12,6 @@ module Avo
     attr_accessor :locale
     attr_accessor :currency
     attr_accessor :default_view_type
-    attr_accessor :license
     attr_accessor :license_key
     attr_accessor :authorization_methods
     attr_accessor :authenticate
@@ -55,7 +54,6 @@ module Avo
       @locale = nil
       @currency = "USD"
       @default_view_type = :table
-      @license = "community"
       @license_key = nil
       @current_user = proc {}
       @authenticate = proc {}
@@ -142,6 +140,24 @@ module Avo
     def app_name
       Avo::ExecutionContext.new(target: @app_name).handle
     end
+
+    def license=(value)
+      if Rails.env.development?
+        puts "[Avo DEPRECATION WARNING]: The `config.license` configuration option is no longer supported and will be removed in future versions. Please discontinue its use and solely utilize the `license_key` instead."
+      end
+    end
+
+    def license
+      gems = Gem::Specification.map {|gem| gem.name}
+
+      @license ||= if gems.include?("avo-advanced")
+        "advanced"
+      elsif gems.include?("avo-pro")
+        "pro"
+      elsif gems.include?("avo")
+        "community"
+      end
+    end
   end
 
   def self.configuration

data/lib/avo/current.rb

@@ -30,10 +30,4 @@ class Avo::Current < ActiveSupport::CurrentAttributes
   def request
     view_context.request || ActionDispatch::Request.empty
   end
-
-  def current_user
-    Rails.logger.warn "DEPRECATION WARNING: Avo::Current.current_user become deprecated and will become obsolete on futhure versions. Please use Avo::Current.user instead."
-
-    user
-  end
 end

data/lib/avo/fields/status_field.rb

@@ -6,13 +6,15 @@ module Avo
 
         @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten.map(&:to_sym) : [:waiting, :running]
         @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten.map(&:to_sym) : [:failed]
+        @success_when = args[:success_when].present? ? [args[:success_when]].flatten.map(&:to_sym) : []
       end
 
       def status
-        status = "success"
+        status = "neutral"
         if value.present?
           status = "failed" if @failed_when.include? value.to_sym
           status = "loading" if @loading_when.include? value.to_sym
+          status = "success" if @success_when.include? value.to_sym
         end
 
         status

data/lib/avo/filters/base_filter.rb

@@ -15,7 +15,7 @@ module Avo
       delegate :params, to: Avo::Current
       delegate :request, to: Avo::Current
       delegate :view_context, to: Avo::Current
-      def curent_user
+      def current_user
         Avo::Current.user
       end
 

data/lib/avo/html/builder.rb

@@ -22,7 +22,7 @@ class Avo::HTML::Builder
   delegate :app, to: Avo::Current
   delegate :root_path, to: :app
   delegate :params, to: Avo::Current
-  def curent_user
+  def current_user
     Avo::Current.user
   end
 

data/lib/avo/licensing/license_manager.rb

@@ -9,10 +9,7 @@ module Avo
         case @hq_response["id"]
         when "community"
           CommunityLicense.new @hq_response
-        when "pro"
-          ProLicense.new @hq_response
-        # temporary fix
-        when "advanced"
+        when "pro", "advanced"
           ProLicense.new @hq_response
         else
           NilLicense.new @hq_response

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.1.beta4" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta6" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -9,7 +9,6 @@ Avo.configure do |config|
   # config.home_path = nil
 
   ## == Licensing ==
-  config.license = 'community' # change this to 'pro' when you add the license key
   # config.license_key = ENV['AVO_LICENSE_KEY']
 
   ## == Set the context ==

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.0.1.beta4
+  version: 3.0.1.beta6
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord