adminable 0.0.1 → 0.0.2

data/app/views/adminable/resources/form/_decimal.html.haml

@@ -1,2 +1,3 @@
-= render 'adminable/shared/label', f: f, attribute: attribute
-= f.number_field attribute.name, class: 'form-control'
+= render 'adminable/shared/label', attribute: attribute
+= number_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name], class: 'form-control'

data/app/views/adminable/resources/form/_float.html.haml

@@ -1,2 +1,3 @@
-= render 'adminable/shared/label', f: f, attribute: attribute
-= f.number_field attribute.name, class: 'form-control'
+= render 'adminable/shared/label', attribute: attribute
+= number_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name], class: 'form-control'

data/app/views/adminable/resources/form/_has_many.html.haml

@@ -1,9 +1,13 @@
-= render 'adminable/shared/label', f: f, attribute: attribute
+= render 'adminable/shared/label', attribute: attribute
 = hidden_field_tag "#{@resource.model.model_name.param_key}[#{attribute.key}][]", nil
-#clusterizeScrollArea.clusterize-scroll
-  #clusterizeContentArea.clusterize-content.list-group
-    - attribute.options_for_select(entry).each do |value, key|
-      .list-group-item.bg-faded.toggleCheckbox{ :class => ('active' if f.object.send(attribute.key).include?(key)) }
-        = check_box_tag "#{@resource.model.model_name.param_key}[#{attribute.key}][]",
-          key, f.object.send(attribute.key).include?(key), hidden: true
-        = value
+#clusterizeScrollArea.clusterize-scroll.associations
+  #clusterizeContentArea.clusterize-content
+    - attribute.association.all.each do |association_entry|
+      .association
+        %label.c-input.c-checkbox.m-a-0
+          = check_box_tag "#{@resource.model.model_name.param_key}[#{attribute.key}][]",
+            association_entry.id, entry.send(attribute.key).include?(association_entry.id)
+          %span.c-indicator
+          = link_to association_entry.to_name,
+            edit_polymorphic_path(association_entry),
+            target: '_blank'

data/app/views/adminable/resources/form/_integer.html.haml

@@ -1,2 +1,3 @@
-= render 'adminable/shared/label', f: f, attribute: attribute
-= f.number_field attribute.name, class: 'form-control'
+= render 'adminable/shared/label', attribute: attribute
+= number_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name], class: 'form-control'

data/app/views/adminable/resources/form/_string.html.haml

@@ -1,2 +1,3 @@
-= render 'adminable/shared/label', f: f, attribute: attribute
-= f.text_field attribute.name, class: 'form-control'
+= render 'adminable/shared/label', attribute: attribute
+= text_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name], class: 'form-control'

data/app/views/adminable/resources/form/_text.html.haml

@@ -1,2 +1,4 @@
-= render 'adminable/shared/label', f: f, attribute: attribute
-= f.text_area attribute.name, class: "form-control #{ 'wysiwyg' if attribute.wysiwyg? }", rows: 5
+= render 'adminable/shared/label', attribute: attribute
+= text_area_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name],
+  class: "form-control #{ 'wysiwyg' if attribute.options[:wysiwyg] }", rows: 5

data/app/views/adminable/resources/form/_time.html.haml

@@ -0,0 +1,3 @@
+= render 'adminable/shared/label', attribute: attribute
+= text_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name], class: 'form-control'

data/app/views/adminable/resources/form/_timestamp.html.haml

@@ -0,0 +1,3 @@
+= render 'adminable/shared/label', attribute: attribute
+= text_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]",
+  entry[attribute.name], class: 'form-control'

data/app/views/adminable/resources/index.html.haml

@@ -1,35 +1,33 @@
 .m-b-1.clearfix
   %h1.pull-md-left.m-b-2
-    = @resource.model.model_name.human.pluralize
+    = @resource.model.model_name.human(count: 2)
   = link_to t('adminable.buttons.new', resource: @resource.model.model_name.human),
     new_polymorphic_path(@resource.model), class: 'btn btn-primary pull-md-right m-b-2'
 .row
-  .col-md-9
+  %div{ :class => (@resource.attributes.search.any? ? 'col-md-9' : 'col-md-12') }
     .table-responsive.m-b-3
       %table.table.table-striped
         %thead
           %tr
-            - @resource.attributes.index.each_value do |attribute|
-              %th.text-nowrap{ :class => ('text-md-center' if attribute.center?) }
-                = @resource.model.human_attribute_name(attribute.name)
+            - @resource.attributes.index.each do |attribute|
+              %th.text-nowrap{ :class => ('text-md-center' if attribute.options[:center]) }
+                = sort_link(@q, attribute.name, hide_indicator: true)
             %th
         %tbody
           - @entries.each do |entry|
             %tr
-              - @resource.attributes.index.each_value do |attribute|
-                %td{ :class => ('text-md-center' if attribute.center?) }
+              - @resource.attributes.index.each do |attribute|
+                %td{ :class => ('text-md-center' if attribute.options[:center]) }
                   = render attribute.index_partial_path, entry: entry,
                     attribute: attribute, value: entry[attribute.key]
               %td.text-nowrap.text-md-right
-                = link_to t('adminable.buttons.edit'), edit_polymorphic_path(entry),
-                  class: 'label label-primary'
-                = link_to t('adminable.buttons.delete'), polymorphic_path(entry),
-                  class: 'label label-danger', method: :delete,
-                  data: { confirm: t('adminable.ui.confirm') }
+                = entry.link_to_edit_small
+                = entry.link_to_delete_small
           - if @entries.empty?
             %tr
               %td.text-md-center.text-muted{ :colspan => @resource.attributes.index.size + 1 }
                 No data available
-  .col-md-3.hidden-sm-down
-    = render 'search'
+  - if @resource.attributes.search.any?
+    .col-md-3.hidden-sm-down
+      = render 'search'
 = paginate @entries, views_prefix: 'adminable'

data/app/views/adminable/resources/index/_belongs_to.html.haml

@@ -1,5 +1,4 @@
-- if value.present?
-  - if attribute.association.klass.exists?(value)
-    = link_to "##{ value }", edit_polymorphic_path(attribute.association.klass.find_by(id: value))
-  - else
-    = "##{ value }"
+- if entry.public_send(attribute.name)
+  = Adminable::EntryPresenter.new(entry.public_send(attribute.name)).link_to_self
+- else
+  = "##{value}"

data/app/views/adminable/resources/index/_date.html.haml

@@ -0,0 +1,2 @@
+- if value
+  = l value, format: '%-d %b %Y'

data/app/views/adminable/resources/index/_has_many.html.haml

@@ -1,3 +1,2 @@
 - if entry
-  - entry.send(attribute.name).each do |resource|
-    = link_to "##{ resource.id }", edit_polymorphic_path(resource)
+  = Adminable::EntriesPresenter.new(entry.public_send(attribute.name)).to_s

data/app/views/adminable/resources/index/_text.html.haml

@@ -1 +1 @@
-= strip_tags(value.truncate(100)).squish
+= strip_tags(value).truncate(30).squish

data/app/views/adminable/resources/index/_time.html.haml

@@ -0,0 +1,2 @@
+- if value
+  = l value, format: '%H:%M:%S'

data/app/views/adminable/resources/index/_timestamp.html.haml

@@ -0,0 +1,2 @@
+- if value
+  = l value, format: '%H:%M:%S, %-d %b %Y'

data/app/views/adminable/shared/_label.html.haml

@@ -1,5 +1,8 @@
 = label_tag attribute.name do
   = @resource.model.human_attribute_name(attribute.name)
-  - if attribute.required?
-    %i.text-muted
-      (required)
+  - if attribute.options[:required]
+    %span.text-muted.m-l-1
+      %i.fa.fa-exclamation-circle{ 'data-toggle' => :tooltip, 'data-placement' => :right, :title => 'Required' }
+  - if %i(belongs_to has_many).include?(attribute.type)
+    %span.text-muted.m-l-1.uncheck-associations
+      %i.fa.fa-remove{ 'data-toggle' => :tooltip, 'data-placement' => :right, :title => 'Uncheck all' }

data/app/views/layouts/adminable/application.html.haml

@@ -14,7 +14,7 @@
   %body
     #collapsing-nav.collapse.p-y-1
       - Adminable::Configuration.resources.each do |resource|
-        = link_to resource.model.model_name.human.pluralize,
+        = link_to resource.model.model_name.human(count: 2),
           polymorphic_path(resource.route), class: 'btn btn-link btn-block'
     .navbar.navbar-full.navbar-dark.bg-primary.m-b-3
       .hidden-md-up
@@ -27,14 +27,13 @@
               %i.fa.fa-home
           - Adminable::Configuration.resources.each do |resource|
             %li.nav-item{ :class => ('active' if current_page?(File.join('/adminable/', resource.name))) }
-              = link_to resource.model.model_name.human.pluralize,
+              = link_to resource.model.model_name.human(count: 2),
                 polymorphic_path(resource.route), class: 'nav-link'
     .container.p-b-3
       - if flash[:alert] || notice.present?
         .p-b-2
           - if flash[:alert]
-            - flash[:alert].each do |alert|
-              = render 'adminable/shared/alert', message: alert, type: 'danger'
+            = render 'adminable/shared/alert', message: alert, type: 'danger'
           - if notice.present?
             = render 'adminable/shared/alert', message: notice, type: 'success'
       = yield

data/config/locales/adminable.en.yml

@@ -4,13 +4,16 @@ en:
     ui:
       confirm: Are you sure?
       not_selected: Not selected
+      and_more: and %{size} more.
     buttons:
       submit: Submit
       back: Back
       edit: Edit
+      delete: Delete
       new: New %{resource}
+      search: Search
     titles:
-      edit: Edit %{resource}
+      edit: "Edit %{resource} #%{id}"
       new: New %{resource}
     resources:
       created: "%{resource} has been successfully created."

data/config/locales/adminable.ru.yml

@@ -0,0 +1,21 @@
+---
+ru:
+  adminable:
+    ui:
+      confirm: Вы уверены?
+      not_selected: Не выбрано
+      and_more: и еще %{size}.
+    buttons:
+      submit: Сохранить
+      back: Назад
+      edit: Изменить
+      delete: Удалить
+      new: Новый %{resource}
+      search: Поиск
+    titles:
+      edit: "Редактирование %{resource} #%{id}"
+      new: Создание %{resource}
+    resources:
+      created: "%{resource} успешно создан."
+      updated: "%{resource} успешно обновлен."
+      deleted: "%{resource} успешно удален."

data/config/routes.rb

@@ -3,5 +3,5 @@ Adminable::Engine.routes.draw do
     resources r.route, except: :show, path: r.name, controller: r.name
   end
 
-  root 'application#welcome'
+  root to: redirect(Adminable::Configuration.resources.first.name)
 end

data/lib/adminable.rb

@@ -1,10 +1,13 @@
 require 'adminable/engine'
 require 'adminable/configuration'
-
-require 'adminable/extensions/devise'
+require 'adminable/errors'
 
 require 'adminable/resource'
 
+require 'adminable/presenters/base_presenter'
+require 'adminable/presenters/entry_presenter'
+require 'adminable/presenters/entries_presenter'
+
 require 'adminable/attributes/collection'
 require 'adminable/attributes/association'
 
@@ -12,6 +15,7 @@ require 'adminable/attributes/base'
 
 require 'adminable/attributes/types/belongs_to'
 require 'adminable/attributes/types/boolean'
+require 'adminable/attributes/types/date'
 require 'adminable/attributes/types/datetime'
 require 'adminable/attributes/types/decimal'
 require 'adminable/attributes/types/float'
@@ -19,15 +23,16 @@ require 'adminable/attributes/types/has_many'
 require 'adminable/attributes/types/integer'
 require 'adminable/attributes/types/string'
 require 'adminable/attributes/types/text'
+require 'adminable/attributes/types/time'
+require 'adminable/attributes/types/timestamp'
 
 require 'haml-rails'
 require 'sass-rails'
-require 'coffee-rails'
 require 'jquery-rails'
 require 'bootstrap'
 require 'rails-assets-tether'
-require 'babosa'
 require 'kaminari'
+require 'ransack'
 
 module Adminable
 end

data/lib/adminable/attributes/association.rb

@@ -1,21 +1,14 @@
 module Adminable
   module Attributes
-    module Association
-      attr_reader :options_for_select, :association
+    class Association
+      attr_reader :reflection, :model, :all
 
-      def options_for_select(entry)
-        @association.klass.all.reject { |e| e == entry }.collect do |e|
-          [association_option_name(e), e.id]
-        end
+      # @param reflection [Object] ActiveRecord::Reflection::HasManyReflection
+      def initialize(reflection)
+        @reflection = reflection
+        @model = @reflection.klass
+        @all = Adminable::EntriesPresenter.new(@model)
       end
-
-      private
-
-        def association_option_name(entry)
-          %i(email login name title id).each do |a|
-            return entry.try(a) unless entry.try(a).nil?
-          end
-        end
     end
   end
 end

data/lib/adminable/attributes/base.rb

@@ -1,33 +1,38 @@
 module Adminable
   module Attributes
+    # Base class for attributes types
+    # @note Cannot be initialized
     class Base
-      attr_accessor :name, :required, :show, :center, :wysiwyg
-      attr_reader :key, :ransack_name
+      attr_reader :name, :options, :key, :strong_parameter, :association
 
+      # @param name [Symbol] attribute name e.g. `:id` or `:title`
+      # @param options [Hash] options, see {default_options}
       def initialize(name, options = {})
         raise 'Base class cannot be initialized' if self.class == Base
 
-        @name = name
-        @key = options[:key] || @name
-        @ransack_name = "#{@name}_cont"
-        @association = options[:association]
-        @required = options[:required] || false
-        @show = true
-        @center = %w(integer boolean float decimal).include?(type)
-        @wysiwyg = %w(text).include?(type)
-      end
+        @name = name.to_sym
+        @options = default_options.merge(options)
 
-      alias required? required
-      alias show? show
-      alias center? center
-      alias wysiwyg? wysiwyg
+        @association = Adminable::Attributes::Association.new(
+          options[:association]
+        ) if options[:association]
+      end
 
-      def type
-        self.class.name.demodulize.underscore
+      def key
+        @key ||= name
       end
 
       def strong_parameter
-        key
+        @strong_parameter ||= key
+      end
+
+      def ransack_name
+        @ransack_name ||= "#{name}_cont"
+      end
+
+      # @return [Symbol] class type e.g. `:text` for Adminable::Attributes::Text
+      def type
+        @type ||= self.class.name.demodulize.underscore.to_sym
       end
 
       def index_partial_path
@@ -37,6 +42,19 @@ module Adminable
       def form_partial_path
         "adminable/resources/form/#{type}"
       end
+
+      private
+
+        def default_options
+          {
+            index: %i(belongs_to has_many).exclude?(type),
+            search: false,
+            form: %i(id created_at updated_at).exclude?(name),
+            required: false,
+            center: %i(integer boolean float decimal).include?(type),
+            wysiwyg: false
+          }
+        end
     end
   end
 end

data/lib/adminable/attributes/collection.rb

@@ -1,73 +1,112 @@
 module Adminable
   module Attributes
     class Collection
-      attr_reader :model
-      attr_writer :index, :form
+      include Enumerable
+      extend Forwardable
 
+      def_delegators :@all, :[], :<<, :each, :first, :last, :push, :unshift
+
+      attr_reader :model, :all
+
+      # @param model [Class] model from Rails application e.g. `User` or `Post`
       def initialize(model)
         @model = model
+        @all ||= columns + associations
       end
 
       def index
-        @index ||= all.except(:created_at, :updated_at)
+        all.select { |attribute| attribute.options[:index] }
       end
 
       def form
-        @form ||= all.except(:id, :created_at, :updated_at)
-      end
-
-      def ransack
-        @ransack ||= columns.except(:id, :created_at, :updated_at)
-                            .select { |k, v| %w(string text).include?(v.type) }
-      end
-
-      def all
-        [columns, belongs_to, has_many].inject(&:merge)
+        all.select { |attribute| attribute.options[:form] }
       end
 
-      def association
-        [belongs_to, has_many].inject(&:merge)
+      def search
+        all.select { |attribute| attribute.options[:search] }
       end
 
+      # Collects attributes from model columns
+      # @return [Array]
+      #
+      # rubocop:disable Metrics/MethodLength
       def columns
-        @columns ||= {}.tap do |attribute|
+        @columns ||= [].tap do |attributes|
           @model.columns.reject { |a| a.name.match(/_id$/) }.each do |column|
-            attribute[column.name] = "adminable/attributes/types/#{column.type}"
-              .classify.constantize.new(
+            begin
+              attributes << resolve(column.type).new(
                 column.name,
-                required: attribute_required?(column.name)
+                required: required?(column.name)
               )
+            rescue Adminable::AttributeNotImplemented
+              next
+            end
           end
-        end.symbolize_keys
+        end
       end
 
-      def belongs_to
-        @belongs_to ||= {}.tap do |attribute|
-          @model.reflect_on_all_associations(:belongs_to).each do |association|
-            attribute[association.name] = Adminable::Attributes::Types::BelongsTo.new(
+      # Collects attributes from model associations
+      # @return [Array]
+      def associations
+        @associations ||= [].tap do |attributes|
+          @model.reflect_on_all_associations.each do |association|
+            attributes << resolve(association.macro).new(
               association.name,
-              required: attribute_required?(association.name),
+              required: required?(association.name),
               association: association
             )
           end
-        end.symbolize_keys
+        end
       end
 
-      def has_many
-        @has_many ||= {}.tap do |attribute|
-          @model.reflect_on_all_associations(:has_many).each do |association|
-            attribute[association.name] = Adminable::Attributes::Types::HasMany.new(
-              association.name,
-              required: attribute_required?(association.name),
-              association: association
-            )
+      def configure
+        yield
+      end
+
+      # Changes options for given attribute
+      # @param name [Symbol] name of attribute e.g. `:title`
+      # @param options [Hash] options to update
+      def set(*args)
+        options = args.extract_options!
+        names = args
+
+        options.each do |key, value|
+          names.each do |name|
+            get(name).options[key] = value
           end
-        end.symbolize_keys
+        end
+      end
+
+      # Finds attribute by name
+      # @param name [Symbol] name of attribute e.g. `:title`
+      # @return [Object] e.g. `Adminable::Attribute::Types::String` for `:title`
+      def get(name)
+        @all.find { |attribute| attribute.name == name } ||
+          raise(
+            Adminable::AttributeNotFound,
+            "couldn't find attribute with name `#{name}`"
+          )
+      end
+
+      # Adds new attribute to collection
+      # @param name [Symbol] name of attribute e.g. `:title`
+      # @param type [Symbol] type of attribute e.g. `:string`
+      def add(name, type, options = {})
+        @all << resolve(type).new(name, **options)
       end
 
       private
 
-        def attribute_required?(name)
+        def resolve(type)
+          "adminable/attributes/types/#{type}".classify.constantize
+        rescue NameError
+          raise(
+            Adminable::AttributeNotImplemented,
+            "type `#{type}` is not supported yet."
+          )
+        end
+
+        def required?(name)
           @model.validators_on(name).any? do |validator|
             validator.class == ActiveRecord::Validations::PresenceValidator
           end