avo 1.3.0.pre.1 → 1.3.0

data/bin/spring

@@ -4,14 +4,14 @@
 # It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
-  require 'rubygems'
-  require 'bundler'
+  require "rubygems"
+  require "bundler"
 
   lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
-  spring = lockfile.specs.detect { |spec| spec.name == 'spring' }
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
   if spring
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-    gem 'spring', spring.version
-    require 'spring/binstub'
+    gem "spring", spring.version
+    require "spring/binstub"
   end
 end

data/config/webpacker.yml

@@ -13,7 +13,7 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  additional_paths_paths: []
+  additional_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false

data/lib/avo.rb

@@ -10,6 +10,10 @@ module Avo
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
 
+  class LicenseVerificationTemperedError < StandardError; end
+
+  class LicenseInvalidError < StandardError; end
+
   class << self
     def webpacker
       @webpacker ||= ::Webpacker::Instance.new(
@@ -17,6 +21,15 @@ module Avo
         config_path: ROOT_PATH.join("config/webpacker.yml")
       )
     end
+
+    def manifester
+      @manifester ||= ::Manifester::Instance.new(
+        root_path: ROOT_PATH,
+        public_output_dir: "avo-packs",
+        cache_manifest: Rails.env.production?,
+        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT || Rails.env.test?}
+      )
+    end
   end
 end
 

data/lib/avo/app.rb

@@ -26,12 +26,16 @@ module Avo
         self.request = request
         self.context = context
 
+        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
+
         # Set the current host for ActiveStorage
-        ActiveStorage::Current.host = request.base_url
+        begin
+          ActiveStorage::Current.host = request.base_url
+        rescue => exception
+          Rails.logger.debug "[Avo] Failed to set ActiveStorage::Current.host, #{exception.inspect}"
+        end
 
         init_resources
-
-        self.license = Licensing::LicenseManager.new(Licensing::HQ.new(request).response).license
       end
 
       def cache_store

data/lib/avo/configuration.rb

@@ -21,6 +21,7 @@ module Avo
     attr_accessor :context
     attr_accessor :display_breadcrumbs
     attr_accessor :initial_breadcrumbs
+    attr_accessor :home_path
 
     def initialize
       @root_path = "/avo"
@@ -54,6 +55,7 @@ module Avo
         add_breadcrumb I18n.t("avo.home").humanize, avo.root_path
       }
       @display_breadcrumbs = true
+      @home_path = nil
     end
 
     def locale_tag
@@ -81,6 +83,10 @@ module Avo
     def set_initial_breadcrumbs(&block)
       @initial_breadcrumbs = block if block.present?
     end
+
+    def namespace
+      root_path.delete "/"
+    end
   end
 
   def self.configuration

data/lib/avo/fields/key_value_field.rb

@@ -3,11 +3,6 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
-      attr_reader :key_label
-      attr_reader :value_label
-      attr_reader :action_text
-      attr_reader :disable_adding_rows
-
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: "key-value-field"
@@ -38,13 +33,7 @@ module Avo
         [:"#{id}", "#{id}": {}]
       end
 
-      def parsed_value
-        value.to_json
-      rescue
-        {}
-      end
-
-      def options
+      def hydrate_field(fields, model, resource, view)
         {
           key_label: @key_label,
           value_label: @value_label,
@@ -55,18 +44,6 @@ module Avo
           disable_deleting_rows: @disable_deleting_rows
         }
       end
-
-      def fill_field(model, key, value)
-        begin
-          new_value = JSON.parse(value)
-        rescue
-          new_value = {}
-        end
-
-        model[key] = new_value
-
-        model
-      end
     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".freeze unless const_defined?(:ENDPOINT)
+      CACHE_KEY = "avo.hq.response".freeze unless const_defined?(:CACHE_KEY)
       REQUEST_TIMEOUT = 5 unless const_defined?(:REQUEST_TIMEOUT) # seconds
 
       def initialize(current_request)
@@ -54,7 +54,7 @@ module Avo
       end
 
       def perform_request
-        puts "Performing request to avohq.io API to check license availability.".inspect if Rails.env.development?
+        ::Rails.logger.debug "[Avo] 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
       end

data/lib/avo/licensing/license.rb

@@ -4,11 +4,13 @@ module Avo
       attr_accessor :id
       attr_accessor :response
       attr_accessor :valid
+      attr_accessor :payload
 
       def initialize(response)
         @response = response
         @id = response["id"]
         @valid = response["valid"]
+        @payload = response["payload"]
       end
 
       def valid?

data/lib/avo/licensing/pro_license.rb

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

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.3.0.pre.1"
+  VERSION = "1.3.0"
 end

data/lib/generators/avo/eject_generator.rb

@@ -12,10 +12,11 @@ module Generators
 
       TEMPLATES = {
         sidebar: "app/views/avo/sidebar/_sidebar.html.erb",
-        logo: "app/views/avo/partials/logo.html.erb",
-        header: "app/views/avo/partials/header.html.erb",
-        footer: "app/views/avo/partials/footer.html.erb",
-        scripts: "app/views/avo/partials/scripts.html.erb"
+        logo: "app/views/avo/partials/_logo.html.erb",
+        head: "app/views/avo/partials/_head.html.erb",
+        header: "app/views/avo/partials/_header.html.erb",
+        footer: "app/views/avo/partials/_footer.html.erb",
+        scripts: "app/views/avo/partials/_scripts.html.erb"
       }
 
       def handle

data/lib/generators/avo/filter_generator.rb

@@ -13,7 +13,7 @@ module Generators
 
         type = "select" if options[:select]
 
-        template "filters/#{type}_filter.rb", "app/services/avo/filters/#{singular_name}.rb"
+        template "filters/#{type}_filter.tt", "app/services/avo/filters/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/resource_generator.rb

@@ -10,9 +10,6 @@ module Generators
       def create
         template "resource/resource.tt", "app/avo/resources/#{resource_name}.rb"
         template "resource/controller.tt", "app/controllers/avo/#{controller_name}.rb"
-
-        # Show a warning if the model doesn't exists
-        say("We couldn't find the #{class_name} model in your codebase. You should have one present for Avo to display the resource.", :yellow) unless current_models.include? class_name
       end
 
       def resource_class
@@ -20,7 +17,7 @@ module Generators
       end
 
       def controller_class
-        "Avo::#{plural_name.humanize}Controller"
+        "Avo::#{class_name.camelize.pluralize}Controller"
       end
 
       def resource_name

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

@@ -29,10 +29,10 @@ Avo.configure do |config|
   # }
 
   ## == Localization ==
+  # config.locale = 'en-US'
 
   ## == Customization ==
   # config.app_name = 'Avocadelicious'
-  # config.locale = 'en-US'
   # config.timezone = 'UTC'
   # config.currency = 'USD'
   # config.per_page = 24
@@ -43,4 +43,13 @@ Avo.configure do |config|
   # config.full_width_container = false
   # config.full_width_index_view = false
   # config.cache_resources_on_index_view = true
+
+  # Where should the user be redirected when he hits the `/<%= options[:path] %>` url
+  # config.home_path = nil
+
+  ## == Breadcrumbs ==
+  # config.display_breadcrumbs = true
+  # config.set_initial_breadcrumbs do
+  #   add_breadcrumb "Home", '/<%= options[:path] %>'
+  # end
 end

data/lib/generators/avo/tool_generator.rb

@@ -34,8 +34,8 @@ module Generators
         template "tool/view.tt", "app/views/avo/tools/#{file_name}.html.erb"
 
         route <<-ROUTE
-namespace :#{::Avo.configuration.root_path.gsub('/', '')} do
-  get "#{file_name}", to: "tools##{file_name}"
+scope :#{::Avo.configuration.namespace} do
+  get "#{file_name}", to: "avo/tools##{file_name}"
 end
         ROUTE
       end

data/public/avo-packs/css/{application-5af67922.css → application-af3e670d.css}

@@ -1388,7 +1388,7 @@ span.flatpickr-weekday {
   }
 }
 
-/*! tailwindcss v2.1.1 | MIT License | https://tailwindcss.com *//*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
+/*! tailwindcss v2.0.4 | MIT License | https://tailwindcss.com *//*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */
 
 /*
 Document
@@ -1915,7 +1915,7 @@ object {
 
 /**
  * Constrain images and videos to the parent width and preserve
- * their intrinsic aspect ratio.
+ * their instrinsic aspect ratio.
  *
  * https://github.com/mozdevs/cssremedy/issues/14
  */
@@ -2329,10 +2329,6 @@ select {
 	z-index: 10;
 }
 
-.focus\:border-none:focus {
-	border-style: none;
-}
-
 .focus\:border-blue-300:focus {
 	--tw-border-opacity: 1;
 	border-color: rgba(147, 197, 253, var(--tw-border-opacity));
@@ -2343,11 +2339,6 @@ select {
 	border-color: rgba(148, 163, 184, var(--tw-border-opacity));
 }
 
-.focus\:border-gray-700:focus {
-	--tw-border-opacity: 1;
-	border-color: rgba(55, 65, 81, var(--tw-border-opacity));
-}
-
 .focus\:bg-white:focus {
 	--tw-bg-opacity: 1;
 	background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
@@ -3655,6 +3646,11 @@ span.CodeMirror-selectedtext { background: none; }
   min-height: auto;
 }
 
+/* overlay CodeMirror fullscreen & Preview on small screens */
+.CodeMirror-fullscreen, .editor-preview-active-side {
+  z-index: 50;
+}
+
 .container {
     width: 100%;
 }
@@ -4316,9 +4312,6 @@ span.CodeMirror-selectedtext { background: none; }
 .focus\:z-10:focus {
     z-index: 10;
 }
-.focus\:border-none:focus {
-    border-style: none;
-}
 .focus\:border-blue-300:focus {
     --tw-border-opacity: 1;
     border-color: rgba(147, 197, 253, var(--tw-border-opacity));
@@ -4327,10 +4320,6 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(148, 163, 184, var(--tw-border-opacity));
 }
-.focus\:border-gray-700:focus {
-    --tw-border-opacity: 1;
-    border-color: rgba(55, 65, 81, var(--tw-border-opacity));
-}
 .focus\:bg-white:focus {
     --tw-bg-opacity: 1;
     background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
@@ -4538,9 +4527,6 @@ span.CodeMirror-selectedtext { background: none; }
     }
 }
 
-.pointer-events-none {
-    pointer-events: none
-}
 .visible {
     visibility: visible
 }
@@ -4577,15 +4563,15 @@ span.CodeMirror-selectedtext { background: none; }
 .top-full {
     top: 100%
 }
+.bottom-0 {
+    bottom: 0px
+}
 .left-1\/2 {
     left: 50%
 }
 .top-1\/2 {
     top: 50%
 }
-.bottom-0 {
-    bottom: 0px
-}
 .top-\[-1px\] {
     top: -1px
 }
@@ -4651,6 +4637,12 @@ span.CodeMirror-selectedtext { background: none; }
 .mb-0 {
     margin-bottom: 0px
 }
+.mt-1 {
+    margin-top: 0.25rem
+}
+.mb-4 {
+    margin-bottom: 1rem
+}
 .-ml-20 {
     margin-left: -5rem
 }
@@ -4699,33 +4691,30 @@ span.CodeMirror-selectedtext { background: none; }
 .mb-2 {
     margin-bottom: 0.5rem
 }
-.mb-4 {
-    margin-bottom: 1rem
-}
 .ml-2 {
     margin-left: 0.5rem
 }
 .block {
     display: block
 }
-.inline-block {
-    display: inline-block
+.inline-flex {
+    display: inline-flex
+}
+.flex {
+    display: flex
 }
 .inline {
     display: inline
 }
-.flex {
-    display: flex
+.grid {
+    display: grid
 }
-.inline-flex {
-    display: inline-flex
+.inline-block {
+    display: inline-block
 }
 .table {
     display: table
 }
-.grid {
-    display: grid
-}
 .hidden {
     display: none
 }
@@ -4735,6 +4724,9 @@ span.CodeMirror-selectedtext { background: none; }
 .h-5 {
     height: 1.25rem
 }
+.h-6 {
+    height: 1.5rem
+}
 .h-64 {
     height: 16rem
 }
@@ -4747,9 +4739,6 @@ span.CodeMirror-selectedtext { background: none; }
 .h-full {
     height: 100%
 }
-.h-6 {
-    height: 1.5rem
-}
 .h-16 {
     height: 4rem
 }
@@ -4813,9 +4802,6 @@ span.CodeMirror-selectedtext { background: none; }
 .w-64 {
     width: 16rem
 }
-.w-1\/2 {
-    width: 50%
-}
 .w-11\/12 {
     width: 91.666667%
 }
@@ -4880,9 +4866,6 @@ span.CodeMirror-selectedtext { background: none; }
 .cursor-wait {
     cursor: wait
 }
-.cursor-not-allowed {
-    cursor: not-allowed
-}
 .appearance-none {
     -webkit-appearance: none;
             appearance: none
@@ -5012,9 +4995,6 @@ span.CodeMirror-selectedtext { background: none; }
 .rounded {
     border-radius: 0.25rem
 }
-.rounded-none {
-    border-radius: 0px
-}
 .rounded-full {
     border-radius: 9999px
 }
@@ -5042,18 +5022,6 @@ span.CodeMirror-selectedtext { background: none; }
 .border-r {
     border-right-width: 1px
 }
-.border-l-0 {
-    border-left-width: 0px
-}
-.border-b-0 {
-    border-bottom-width: 0px
-}
-.border-t-0 {
-    border-top-width: 0px
-}
-.border-l {
-    border-left-width: 1px
-}
 .border-pink-600 {
     --tw-border-opacity: 1;
     border-color: rgba(219, 39, 119, var(--tw-border-opacity))
@@ -5166,9 +5134,9 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-bg-opacity: 1;
     background-color: rgba(243, 244, 246, var(--tw-bg-opacity))
 }
-.bg-teal-700 {
+.bg-green-700 {
     --tw-bg-opacity: 1;
-    background-color: rgba(15, 118, 110, var(--tw-bg-opacity))
+    background-color: rgba(4, 120, 87, var(--tw-bg-opacity))
 }
 .bg-blue-gray-200 {
     --tw-bg-opacity: 1;
@@ -5261,14 +5229,14 @@ span.CodeMirror-selectedtext { background: none; }
     padding-top: 1px;
     padding-bottom: 1px
 }
-.py-3 {
-    padding-top: 0.75rem;
-    padding-bottom: 0.75rem
-}
 .py-0 {
     padding-top: 0px;
     padding-bottom: 0px
 }
+.py-3 {
+    padding-top: 0.75rem;
+    padding-bottom: 0.75rem
+}
 .py-8 {
     padding-top: 2rem;
     padding-bottom: 2rem
@@ -5437,6 +5405,9 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-text-opacity: 1;
     color: rgba(185, 28, 28, var(--tw-text-opacity))
 }
+.opacity-75 {
+    opacity: 0.75
+}
 .opacity-50 {
     opacity: 0.5
 }
@@ -5452,37 +5423,12 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
     box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
 }
-.shadow-lg {
-    --tw-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
-    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
-}
-.shadow {
-    --tw-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
-    box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)
-}
 .outline-none {
     outline: 2px solid transparent;
     outline-offset: 2px
 }
-.filter {
-    --tw-blur: var(--tw-empty,/*!*/ /*!*/);
-    --tw-brightness: var(--tw-empty,/*!*/ /*!*/);
-    --tw-contrast: var(--tw-empty,/*!*/ /*!*/);
-    --tw-grayscale: var(--tw-empty,/*!*/ /*!*/);
-    --tw-hue-rotate: var(--tw-empty,/*!*/ /*!*/);
-    --tw-invert: var(--tw-empty,/*!*/ /*!*/);
-    --tw-saturate: var(--tw-empty,/*!*/ /*!*/);
-    --tw-sepia: var(--tw-empty,/*!*/ /*!*/);
-    --tw-drop-shadow: var(--tw-empty,/*!*/ /*!*/);
-    filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)
-}
-.invert {
-    --tw-invert: invert(100%)
-}
 .transition {
-    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
-    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
-    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
+    transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform;
     transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
     transition-duration: 150ms
 }
@@ -5677,9 +5623,6 @@ span.CodeMirror-selectedtext { background: none; }
 .focus\:z-10:focus {
     z-index: 10
 }
-.focus\:border-none:focus {
-    border-style: none
-}
 .focus\:border-blue-300:focus {
     --tw-border-opacity: 1;
     border-color: rgba(147, 197, 253, var(--tw-border-opacity))
@@ -5688,10 +5631,6 @@ span.CodeMirror-selectedtext { background: none; }
     --tw-border-opacity: 1;
     border-color: rgba(148, 163, 184, var(--tw-border-opacity))
 }
-.focus\:border-gray-700:focus {
-    --tw-border-opacity: 1;
-    border-color: rgba(55, 65, 81, var(--tw-border-opacity))
-}
 .focus\:bg-white:focus {
     --tw-bg-opacity: 1;
     background-color: rgba(255, 255, 255, var(--tw-bg-opacity))
@@ -5925,9 +5864,7 @@ html, body{
   --tw-scale-x: 1;
   --tw-scale-y: 1;
   transform: translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
-  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
-  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
+  transition-property: background-color, border-color, color, fill, stroke, opacity, box-shadow, transform;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
   transition-duration: 150ms;
   transition-duration: 150ms;
@@ -5977,4 +5914,4 @@ html, body{
 }
 
 
-/*# sourceMappingURL=application-5af67922.css.map*/
+/*# sourceMappingURL=application-af3e670d.css.map*/