avo 2.15.0 → 2.15.2.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28077d1bee6c3fbd827dda92a04cc8355cfad4911c676672e7bdc1b815c16d78
-  data.tar.gz: 78a39f2bbbed254b543a683b7406424ae7abff30396c42491236b4474c0a4d53
+  metadata.gz: e1ab7eb43d1f112ff5307e96837c8d4a7198864b5f27730fb798fc3f35b4f3df
+  data.tar.gz: edbe08766003e670fe83553e5eb11300cb61985e7826b11f7eb96552d5c68bec
 SHA512:
-  metadata.gz: 4eb4cd41172fc2cd8e046bb614c4561c687663be76c36d8ac8960e3902f9d7750747ccadf159a7a9f928805c6253df9ee07f2ed9654ff419cac795fdf64ecf61
-  data.tar.gz: 9a19ac21d995411cdf147d0659c6fe5c886333188f1e7c4374a7b0e14d9155186e91ecb833a594ab3c1c46ff1d5ec410f2bb128a38f5bb06022153b38e097c65
+  metadata.gz: f194547e6652e8f1d3aefa09ccadb769ee3fdce46aaeb2c75ec25b6e45671293bb405e93be8b18cf7850537182a934b32c607266e7c25a04453c2029e4fd18fb
+  data.tar.gz: 10faeb4cc74ae9cc025aad81fac3e1b0d6364fd609c5169e4ed91dbec20b99946fd360a75cf13a520ef97611fdf9c4963993581ee6b80b13ffbd964009106310

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.15.0)
+    avo (2.15.2.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/views/layouts/avo/application.html.erb

@@ -6,8 +6,8 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <%= render partial: 'avo/partials/javascript' %>
-    <%= render partial: 'avo/partials/head' %>
     <%= render partial: 'avo/partials/branding' %>
+    <%= render partial: 'avo/partials/pre_head' %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
       <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/configuration/branding.rb

@@ -1,6 +1,6 @@
 class Avo::Configuration::Branding
   def initialize(colors: nil, chart_colors: nil, logo: nil, logomark: nil)
-    @colors = colors
+    @colors = colors || {}
     @chart_colors = chart_colors
     @logo = logo
     @logomark = logomark

data/lib/avo/version.rb

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

data/lib/generators/avo/base_generator.rb

@@ -9,7 +9,7 @@ module Generators
         super(*args)
 
         # Don't output the version if requested so
-        unless args.include?(["--no-avo-version"])
+        unless args.include?(["--skip-avo-version"])
           invoke "avo:version", *args
         end
       end

data/lib/generators/avo/eject_generator.rb

@@ -14,6 +14,7 @@ module Generators
         head: "app/views/avo/partials/_head.html.erb",
         header: "app/views/avo/partials/_header.html.erb",
         footer: "app/views/avo/partials/_footer.html.erb",
+        pre_head: "app/views/avo/partials/_pre_head.html.erb",
         scripts: "app/views/avo/partials/_scripts.html.erb",
         sidebar_extra: "app/views/avo/partials/_sidebar_extra.html.erb",
       }

data/lib/generators/avo/js/install_generator.rb

@@ -31,7 +31,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_importmap_tags \"avo.custom\" %>"
@@ -48,7 +48,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_include_tag \"avo.custom\", \"data-turbo-track\": \"reload\", defer: true %>"

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -21,7 +21,7 @@ module Generators
           end
 
           if Rails.root.join("Procfile.dev").exist?
-            append_to_file "Procfile.dev", "css: bin/rails avo:tailwindcss:watch\n"
+            append_to_file "Procfile.dev", "avo_css: bin/rails avo:tailwindcss:watch\n"
           else
             say "Add default Procfile.dev"
             copy_file template_path("Procfile.dev"), "Procfile.dev"
@@ -30,13 +30,14 @@ module Generators
             run "gem install foreman"
           end
 
-          append_to_file "Procfile.dev", "avo_css: bin/rails tailwindcss:watch\n"
-
-          say "Ejecting the _head.html.erb partial"
-          Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+          # Ensure that the _pre_head.html.erb template is available
+          unless Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb").exist?
+            say "Ejecting the _pre_head.html.erb partial"
+            Rails::Generators.invoke("avo:eject", [":pre_head", "--skip-avo-version"], {destination_root: Rails.root})
+          end
 
           say "Adding the CSS asset to the partial"
-          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
         end
 
         no_tasks do

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

@@ -62,7 +62,7 @@ Avo.configure do |config|
   ## == Branding ==
   # config.branding = {
   #   colors: {
-  #     background => "248 246 242",
+  #     background: "248 246 242",
   #     100 => "#CEE7F8",
   #     400 => "#399EE5",
   #     500 => "#0886DE",

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -1,2 +1,2 @@
 web: bin/rails server -p 3000
-css: bin/rails avo:tailwindcss:watch
+avo_css: bin/rails avo:tailwindcss:watch

data/lib/tasks/tailwindcss_rails.rake

@@ -8,7 +8,7 @@ if Gem.loaded_specs.key? TAILWINDCSS_RAILS
   # Get the path
   GEM_PATH = Gem.loaded_specs[TAILWINDCSS_RAILS].full_gem_path
   # Compose the compile command
-  AVO_TAILWIND_COMPILE_COMMAND = "#{RbConfig.ruby} #{Pathname.new(GEM_PATH)}/exe/tailwindcss -i '#{Rails.root.join("app/assets/stylesheets/avo.css")}' -o '#{Rails.root.join(ASSET_FILE)}' -c '#{Rails.root.join("config/tailwind.config.js")}' --minify"
+  AVO_TAILWIND_COMPILE_COMMAND = "#{RbConfig.ruby} #{Pathname.new(GEM_PATH)}/exe/tailwindcss -i '#{Rails.root.join("app/assets/stylesheets/avo.tailwind.css")}' -o '#{Rails.root.join(ASSET_FILE)}' -c '#{Rails.root.join("config/tailwind.config.js")}' --minify"
 
   namespace "avo:tailwindcss" do
     desc "Build your Tailwind CSS"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.2.pre.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1719,6 +1719,7 @@ files:
 - app/views/avo/partials/_javascript.html.erb
 - app/views/avo/partials/_logo.html.erb
 - app/views/avo/partials/_navbar.html.erb
+- app/views/avo/partials/_pre_head.html.erb
 - app/views/avo/partials/_resource_search.html.erb
 - app/views/avo/partials/_scripts.html.erb
 - app/views/avo/partials/_sidebar_extra.html.erb
@@ -1742,6 +1743,7 @@ files:
 - config/cable.yml
 - config/credentials.yml.enc
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1974,9 +1976,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: