avo 0.5.0.beta4 → 0.5.0.beta5

data/lib/avo/engine.rb

@@ -8,44 +8,25 @@ module Avo
   class Engine < ::Rails::Engine
     isolate_namespace Avo
 
-    initializer 'avo.autoload', before: :set_autoload_paths do |app|
-      {
-        'Avo::Resources': ['app', 'avo', 'resources'],
-        'Avo::Filters': ['app', 'avo', 'filters'],
-        'Avo::Actions': ['app', 'avo', 'actions'],
-      }.each do |namespace, path|
-        next unless Rails.root.join(*path).exist?
-
-        Rails.autoloaders.main.push_dir(Rails.root.join(*path), namespace: namespace.to_s.safe_constantize)
-      end
+    config.after_initialize do
+      # Boot Avo
+      ::Avo::App.boot
     end
 
-    initializer 'avo.init' do |app|
-      avo_root_path = Avo::Engine.root.to_s
-
-      app.config.middleware.use I18n::JS::Middleware
-
-      if Avo::IN_DEVELOPMENT
-        # Register reloader
-        app.reloaders << app.config.file_watcher.new([], {
-          Avo::Engine.root.join('lib', 'avo').to_s => ['rb'],
-        }) {}
-
-        # What to do on file change
-        config.to_prepare do
-          Dir.glob(avo_root_path + '/lib/avo/app/**/*.rb'.to_s).each { |c| load c }
-          Avo::App.boot
-        end
-      else
-        Dir.glob(avo_root_path + '/lib/avo/app/**/*.rb'.to_s).each { |c| require c }
+    initializer 'avo.autoload', before: :set_autoload_paths do |app|
+      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'avo', 'filters'))
+      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'avo', 'actions'))
+      Rails.autoloaders.main.push_dir(Rails.root.join('app', 'avo', 'resources'))
+    end
 
-        Avo::App.boot if Avo::PACKED
-      end
+    initializer 'avo.init_fields' do |app|
+      # Init the fields
+      ::Avo::App.init_fields
     end
 
     initializer 'webpacker.proxy' do |app|
       app.config.debug_exception_response_format = :api
-      app.config.logger = ::Logger.new(STDOUT)
+      # app.config.logger = ::Logger.new(STDOUT)
 
       insert_middleware = begin
                             Avo.webpacker.config.dev_server.present?

data/lib/avo/{app/fields → fields}/badge_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class BadgeField < Field
+    class BadgeField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'badge-field',

data/lib/avo/{app/fields/field.rb → fields/base_field.rb}

@@ -1,11 +1,9 @@
-require_relative 'field_extensions/visible_in_different_views'
-require_relative 'field_extensions/has_field_name'
-
 module Avo
   module Fields
-    class Field
-      include Avo::Fields::FieldExtensions::VisibleOnDifferentViews
+    class BaseField
+      extend ActiveSupport::DescendantsTracker
       extend Avo::Fields::FieldExtensions::HasFieldName
+      include Avo::Fields::FieldExtensions::VisibleInDifferentViews
 
       attr_accessor :id
       attr_accessor :name
@@ -32,7 +30,6 @@ module Avo
       attr_accessor :view
       attr_accessor :user
       attr_accessor :action
-      attr_accessor :grid_position
       attr_accessor :meta
       attr_accessor :panel_name
       attr_accessor :link_to_resource
@@ -67,7 +64,6 @@ module Avo
           help: nil,
           default: nil,
           can_see: nil,
-          grid_position: false,
           meta: {},
           panel_name: nil,
         }

data/lib/avo/{app/fields/belongs_to.rb → fields/belongs_to_field.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class BelongsToField < Field
+    class BelongsToField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'belongs-to-field',
@@ -17,7 +17,7 @@ module Avo
         target_resource.model_class.all.map do |model|
           {
             value: model.id,
-            label: model.send(target_resource.title)
+            label: model.send(target_resource.class.title)
           }
         end
       end
@@ -43,7 +43,7 @@ module Avo
       end
 
       def label
-        value.send(target_resource.title)
+        value.send(target_resource.class.title)
       end
 
       def to_permitted_param

data/lib/avo/{app/fields → fields}/boolean_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class BooleanField < Field
+    class BooleanField < BaseField
       attr_reader :true_value
       attr_reader :false_value
 

data/lib/avo/{app/fields → fields}/boolean_group_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class BooleanGroupField < Field
+    class BooleanGroupField < BaseField
       attr_reader :options
 
       def initialize(name, **args, &block)

data/lib/avo/{app/fields → fields}/code_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class CodeField < Field
+    class CodeField < BaseField
       attr_reader :height
       attr_reader :language
       attr_reader :theme

data/lib/avo/{app/fields → fields}/country_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class CountryField < Field
+    class CountryField < BaseField
       attr_reader :countries
       attr_reader :display_code
 

data/lib/avo/{app/fields → fields}/currency_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class CurrencyField < Field
+    class CurrencyField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'currency-field',

data/lib/avo/{app/fields → fields}/date_field.rb

@@ -1,5 +1,3 @@
-require_relative 'text_field'
-
 module Avo
   module Fields
     class DateField < TextField

data/lib/avo/{app/fields → fields}/date_time_field.rb

@@ -1,5 +1,3 @@
-require_relative 'date_field'
-
 module Avo
   module Fields
     class DateTimeField < DateField

data/lib/avo/{app/fields → fields}/external_image_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class ExternalImageField < Field
+    class ExternalImageField < BaseField
       attr_reader :width
       attr_reader :height
       attr_reader :radius

data/lib/avo/{app/fields → fields}/field_extensions/visible_in_different_views.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     module FieldExtensions
-      module VisibleOnDifferentViews
+      module VisibleInDifferentViews
         attr_accessor :show_on_index
         attr_accessor :show_on_show
         attr_accessor :show_on_new

data/lib/avo/{app/fields → fields}/file_field.rb

@@ -1,7 +1,6 @@
 module Avo
   module Fields
-    class FileField < Field
-      include Rails.application.routes.url_helpers
+    class FileField < BaseField
       attr_accessor :is_avatar
       attr_accessor :is_image
 

data/lib/avo/{app/fields → fields}/files_field.rb

@@ -1,7 +1,6 @@
 module Avo
   module Fields
-    class FilesField < Field
-      include Rails.application.routes.url_helpers
+    class FilesField < BaseField
       attr_accessor :is_image
 
       def initialize(name, **args, &block)

data/lib/avo/{app/fields → fields}/gravatar_field.rb

@@ -3,7 +3,7 @@ require 'erb'
 
 module Avo
   module Fields
-    class GravatarField < Field
+    class GravatarField < BaseField
       attr_reader :size
       attr_reader :rounded
       attr_reader :default

data/lib/avo/{app/fields/has_and_belongs_to_many.rb → fields/has_and_belongs_to_many_field.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class HasAndBelongsToManyField < Field
+    class HasAndBelongsToManyField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,

data/lib/avo/{app/fields/has_many.rb → fields/has_many_field.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class HasManyField < Field
+    class HasManyField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,

data/lib/avo/{app/fields/has_one.rb → fields/has_one_field.rb}

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class HasOneField < Field
+    class HasOneField < BaseField
       attr_accessor :relation_method
       attr_accessor :display
 

data/lib/avo/{app/fields → fields}/heading_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class HeadingField < Field
+    class HeadingField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           updatable: false,

data/lib/avo/{app/fields → fields}/hidden_field.rb

@@ -1,5 +1,3 @@
-require_relative 'text_field'
-
 module Avo
   module Fields
     class HiddenField < TextField

data/lib/avo/{app/fields → fields}/id_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class IdField < Field
+    class IdField < BaseField
       def initialize(name, **args, &block)
         default_value = 'id'
 

data/lib/avo/{app/fields → fields}/key_value_field.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module Avo
   module Fields
-    class KeyValueField < Field
+    class KeyValueField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'key-value-field',

data/lib/avo/{app/fields → fields}/markdown_field.rb

@@ -1,8 +1,6 @@
-require_relative 'field'
-
 module Avo
   module Fields
-    class MarkdownField < Field
+    class MarkdownField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'markdown-field',

data/lib/avo/{app/fields → fields}/number_field.rb

@@ -1,5 +1,3 @@
-require_relative 'text_field'
-
 module Avo
   module Fields
     class NumberField < TextField

data/lib/avo/{app/fields → fields}/password_field.rb

@@ -1,5 +1,3 @@
-require_relative 'text_field'
-
 module Avo
   module Fields
     class PasswordField < TextField

data/lib/avo/{app/fields → fields}/select_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class SelectField < Field
+    class SelectField < BaseField
       attr_reader :options
       attr_reader :enum
       attr_reader :display_value

data/lib/avo/{app/fields → fields}/status_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class StatusField < Field
+    class StatusField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'status-field',

data/lib/avo/{app/fields → fields}/text_field.rb

@@ -1,6 +1,6 @@
 module Avo
   module Fields
-    class TextField < Field
+    class TextField < BaseField
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: 'text-field',

data/lib/avo/{app/fields → fields}/textarea_field.rb

@@ -1,5 +1,3 @@
-require_relative 'text_field'
-
 module Avo
   module Fields
     class TextareaField < TextField

data/lib/avo/{app/fields → fields}/trix_field.rb

@@ -1,8 +1,6 @@
-require_relative 'field'
-
 module Avo
   module Fields
-    class TrixField < Field
+    class TrixField < BaseField
       attr_reader :always_show
 
       def initialize(name, **args, &block)

data/lib/avo/filters/base_filter.rb

@@ -0,0 +1,20 @@
+module Avo
+  module Filters
+    class BaseFilter
+      class_attribute :name, default: 'Filter'
+      class_attribute :component, default: 'boolean-filter'
+      class_attribute :default, default: ''
+      class_attribute :template, default: 'avo/base/select_filter'
+
+      def apply_query(request, query, value)
+        value.symbolize_keys! if value.is_a? Hash
+
+        self.apply(request, query, value)
+      end
+
+      def id
+        self.class.name.underscore.gsub('/', '_')
+      end
+    end
+  end
+end

data/lib/avo/filters/boolean_filter.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Filters
+    class BooleanFilter < BaseFilter
+      self.template = 'avo/base/boolean_filter'
+    end
+  end
+end

data/lib/avo/filters/select_filter.rb

@@ -0,0 +1,7 @@
+module Avo
+  module Filters
+    class SelectFilter < BaseFilter
+      self.template = 'avo/base/select_filter'
+    end
+  end
+end

data/lib/avo/{app/grid_fields → grid_fields}/body_field.rb

@@ -1,5 +1,3 @@
-require_relative 'grid_field'
-
 module Avo
   module GridFields
     class BodyField < GridField

data/lib/avo/{app/grid_fields → grid_fields}/preview_field.rb

@@ -1,5 +1,3 @@
-require_relative 'grid_field'
-
 module Avo
   module GridFields
     class PreviewField < GridField

data/lib/avo/{app/grid_fields → grid_fields}/title_field.rb

@@ -1,5 +1,3 @@
-require_relative 'grid_field'
-
 module Avo
   module GridFields
     class TitleField < GridField

data/lib/avo/licensing/community_license.rb

@@ -0,0 +1,6 @@
+module Avo
+  module Licensing
+    class CommunityLicense < License
+    end
+  end
+end