adminable 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50dbc10813e44d6cbaafaf677198e95604541bd9
-  data.tar.gz: 1a583fe099f1a41a986ff8e61b2deb632dae6e9e
+  metadata.gz: 6ddb7fa61bee7a687cdc0c39c37990d5bb521304
+  data.tar.gz: 39e26845450a55d099ed58a2abc9feb49c151427
 SHA512:
-  metadata.gz: 1f46365f19a81adde1666e349976db7626b32a396db05ef6546e9e1a2681816ec4b66c7c02e782a4e8d687ffec705c873550311eb3efbf96cd76dec9fff1af2b
-  data.tar.gz: e735b3c8245ba04e89450b6bf444d9e628eeaa816498875a91fb3d0a6e3918431cc3993f8b6b08b531595b1a3ebb8316af1e022b15204fd2e061d2ccfe2feeeb
+  metadata.gz: 030afe5a4016c70a0ecbd93ab4d42872b2b14307f697d2268f36707c400b8cd0d6a28a93baa939dd4de0ce0cf6b2d89260de5ae618089fc5ee97c0b6fd32d85e
+  data.tar.gz: be70b417ed4ef1804fd51549fda2443645be24f6cf3463cb9ffbbdafe3df0eef12dc951ec4c0597ce56592b86e439fec6e64c2c06b2d4c0543020b6f2d66f948

data/README.md

@@ -11,7 +11,7 @@ Simple admin interface for Ruby on Rails applications.
 
 ## Features
 
-* Built with common Rails controllers with a small DSL.
+* Built with common Rails controllers and views without DSL.
 * Supports namespaced models.
 * Has simple search with [Ransack](https://github.com/activerecord-hackery/ransack).
 * Uses [Bootstrap](https://github.com/twbs/bootstrap) 4.0.
@@ -43,7 +43,7 @@ $ gem install adminable
 
 ## Getting Started
 
-First things first. Add routes and create `application_controller.rb` class using generator:
+First things first. Add routes and create `adminable/application_controller.rb` class using generator:
 
 ```bash
 rails g adminable:install
@@ -51,93 +51,80 @@ rails g adminable:install
 # => insert config/routes.rb
 ```
 
-#### Generating Resources
+### Generating Resources
 
-For example you have model `User`, then run:
+Assume you have model `User`, then run:
 
 ```bash
-rails g adminable:resource user
+rails g adminable:resource users
 # => create  app/controllers/adminable/users_controller.rb
 ```
 
 For namespaced models, like `Blog::Post`, use:
 
 ```bash
-rails g adminable:resource blog/post
+rails g adminable:resource blog/posts
 # => create  app/controllers/adminable/blog/posts_controller.rb
 ```
 
-#### Customizing Attributes
+### Customizing Fields
 
-You can update attributes with simple DSL inside `set_attributes` block:
-
-##### For existing attributes
+Change fields as you like inside `fields` method array:
 
 ```ruby
-  set(name, options = {})
-```
-
-##### For new attributes
-
-```ruby
-  add(name, type, options = {})
+class Adminable::Blog::PostsController < Adminable::ResourcesController
+  def fields
+    [
+      Adminable::Fields::String.new(:title),
+      Adminable::Fields::Text.new(:body),
+      Adminable::Fields::Float.new(:rating, form: false),
+      Adminable::Fields::Boolean.new(:published),
+      Adminable::Fields::BelongsTo.new(:user),
+      Adminable::Fields::HasMany.new(:blog_comments)
+    ]
+  end
+end
 ```
 
-##### Attributes Parameters
-
-* `index` - (`true` or `false`) - Shows attribute on index page.
-* `form` - (`true` or `false`) - Shows attribute on new/edit page.
-* `center` - (`true` or `false`) - Adds `text-align: center` for attribute value on index page.
-* `search` - (`true` or `false`) - Enables search for this attribute.
+### Fields Parameters
 
-##### Examples
+#### index
+`true` or `false`, default: `true`.
 
-```ruby
-class Adminable::Blog::PostsController < Adminable::ResourcesController
-  set_attributes do |attributes|
-    # Enables search for title column
-    attributes.set :title, search: true
+Shows field on index page.
 
-    # Hides title from new and edit pages
-    attributes.set :title, form: true
+#### form
+`true` or `false`, default: `true`.
 
-    # Adds wysiwyg plugin and hides from index table
-    attributes.set :text, wysiwyg: true, index: false
+Shows field on new/edit page.
 
-    # Adds new attribute `password` with type `string` and some options
-    attributes.add :password, :string, wysiwyg: true, index: false
+#### center
+`true` or `false`, default `true` for `integer`, `boolean`, `float` and `decimal` fields, `false` otherwise.
 
-    # Adds new attribute `author`
-    attributes << Adminable::Attributes::Types::String.new(:author)
+Adds `text-align: center` for field value on index page.
 
-    # Allows search for multiple attributes
-    attributes.set :title, :body, search: true
-  end
-end
-```
+#### search
+`true` or `false`, default: `false`.
+Enables search for this field.
 
-##### See Also
+### See Also
 
 * Configured controller for Devise model: [app/controllers/adminable/users_controller.rb](https://github.com/droptheplot/adminable/blob/master/spec/dummy/app/controllers/adminable/users_controller.rb)
 
-## Built-in Attributes
-
-List of attributes with default parameters.
-
-|            | index | form | center | wysiwyg |
-|------------|-------|------|--------|---------|
-| String     |   +   |   +  |        |         |
-| Text       |   +   |   +  |        |    +    |
-| Integer    |   +   |   +  |    +   |         |
-| Float      |   +   |   +  |    +   |         |
-| Decimal    |   +   |   +  |    +   |         |
-| Date       |   +   |   +  |        |         |
-| DateTime   |   +   |   +  |        |         |
-| Time       |   +   |   +  |        |         |
-| Timestamp  |   +   |   +  |        |         |
-| Boolean    |   +   |   +  |    +   |         |
-| Belongs To |       |   +  |        |         |
-| Has Many   |       |   +  |        |         |
+## Built-in Fields
+
+* String
+* Text
+* Integer
+* Float     
+* Decimal
+* Date
+* DateTime
+* Time
+* Timestamp
+* Boolean
+* Belongs To
+* Has Many
 
 ## Generating Partials
 
@@ -146,7 +133,7 @@ You can use generator to copy original partial to your application.
 `rails g adminable:partial [layout] [type] [resource]`
 
 * `layout` - `index` or `form`.
-* `type` - `string`, `text` etc. See [Built-in Attributes](#built-in-attributes).
+* `type` - `string`, `text` etc. See [Built-in Fields](#built-in-fields).
 * `resource` - Use controller name (e.g. `users`) to replace partial only for single controller or leave blank to replace partials for all controllers.
 
 ## F.A.Q

data/app/controllers/adminable/resources_controller.rb

@@ -9,6 +9,7 @@ module Adminable
     end
 
     before_action :set_entry, only: [:edit, :update, :destroy]
+    before_action :set_fields, only: [:index, :new, :edit, :create, :update]
 
     before_action do
       append_view_path(
@@ -23,7 +24,7 @@ module Adminable
     def index
       @q = @resource.model.ransack(params[:q])
       @entries = Adminable::Presenters::Entries.new(
-        @q.result.includes(*@resource.includes).order(id: :desc)
+        @q.result.includes(*includes).order(id: :desc)
                                               .page(params[:page]).per(25)
       )
     end
@@ -74,32 +75,6 @@ module Adminable
                   )
     end
 
-    # Calls from children controller class to manage resource attributes
-    # @example Update attributes for Adminable::Blog::PostsController
-    #   # app/controllers/adminable/blog/posts_controller.rb
-    #
-    #   set_attributes do |attributes|
-    #     # Enables search for title column
-    #     attributes.set :title, search: true
-    #
-    #     # Hides title from new and edit pages
-    #     attributes.set :title, form: true
-    #
-    #     # Adds wysiwyg plugin and hides from index table
-    #     attributes.set :text, wysiwyg: true, index: false
-    #
-    #     # Adds new attribute `password` with type `string` and some options
-    #     attributes.add :password, :string, wysiwyg: true, index: false
-    #
-    #     # Adds new attribute `author`
-    #     attributes << Adminable::Attributes::Types::String.new(:author)
-    #   end
-    def self.set_attributes
-      before_action do
-        @resource.attributes.configure { yield(@resource.attributes) }
-      end
-    end
-
     private
 
       def set_entry
@@ -107,14 +82,30 @@ module Adminable
         @entry = Adminable::Presenters::Entry.new(entry)
       end
 
+      def set_fields
+        @fields = Adminable::Presenters::Fields.new(fields)
+      end
+
       def resource_model_name
         controller_path.sub(%r{^adminable/}, '')
       end
 
       def resource_params
         params.require(@resource.model.model_name.param_key).permit(
-          *@resource.attributes.form.map(&:strong_parameter)
+          *fields.map(&:strong_parameter)
         )
       end
+
+      def fields
+        raise Adminable::FieldsNotDefined
+      end
+
+      def includes
+        association_fields = fields.select do |field|
+          %i(belongs_to has_many).include?(field.type)
+        end
+
+        association_fields.any? ? association_fields.map(&:name) : false
+      end
   end
 end

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

@@ -1,7 +1,7 @@
 = form_for @entry, method: (@entry.persisted? ? :patch : :post) do |f|
-  - @resource.attributes.form.each do |attribute|
+  - @fields.form.each do |field|
     %fieldset.form-group
-      = render attribute.form_partial_path, entry: @entry, attribute: attribute
+      = render field.form_partial_path, entry: @entry, field: field
   %fieldset.form-group
     = f.submit t('adminable.buttons.submit'), class: 'btn btn-primary'
     = link_to t('adminable.buttons.back'), polymorphic_path(@resource.model),

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

@@ -1,9 +1,9 @@
 .card.bg-faded
   .card-block
     = search_form_for @q do |f|
-      - @resource.attributes.search.each do |attribute|
+      - @fields.search.each do |field|
         %fieldset.form-group
-          = f.label attribute.ransack_name, @resource.model.human_attribute_name(attribute.name),
+          = f.label field.ransack_name, @resource.model.human_attribute_name(field.name),
             class: 'text-muted'
-          = f.search_field attribute.ransack_name, class: 'form-control'
+          = f.search_field field.ransack_name, class: 'form-control'
       = f.submit t('adminable.buttons.search'), class: 'btn btn-primary-outline'

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

@@ -1,11 +1,11 @@
-= render 'adminable/shared/label', attribute: attribute
-= hidden_field_tag "#{@resource.model.model_name.param_key}[#{attribute.key}]", nil
+= render 'adminable/shared/label', field: field
+= hidden_field_tag "#{@resource.model.model_name.param_key}[#{field.key}]", nil
 #clusterizeScrollArea.clusterize-scroll.associations
   #clusterizeContentArea.clusterize-content
-    - attribute.association.entries.each do |association_entry|
+    - Adminable::Presenters::Entries.new(entry.association(field.name).klass.all).each do |association_entry|
       .association
         %label.c-input.c-radio.m-a-0
-          = radio_button_tag "#{@resource.model.model_name.param_key}[#{attribute.key}]",
-            association_entry.id, entry.send(attribute.key) == association_entry.id
+          = radio_button_tag "#{@resource.model.model_name.param_key}[#{field.key}]",
+            association_entry.id, entry.send(field.key) == association_entry.id
           %span.c-indicator
           = association_entry.link_to_self

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

@@ -1,6 +1,6 @@
 %label.c-input.c-checkbox
-  = hidden_field_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]", 0
-  = check_box_tag "#{@resource.model.model_name.param_key}[#{attribute.name}]", 1,
-    entry.send(attribute.key)
+  = hidden_field_tag "#{@resource.model.model_name.param_key}[#{field.name}]", 0
+  = check_box_tag "#{@resource.model.model_name.param_key}[#{field.name}]", 1,
+    entry.send(field.key)
   %span.c-indicator
-  = @resource.model.human_attribute_name(attribute.name)
+  = @resource.model.human_attribute_name(field.name)

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

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

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

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

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

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

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

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

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

@@ -1,12 +1,12 @@
-= render 'adminable/shared/label', attribute: attribute
-= hidden_field_tag "#{@resource.model.model_name.param_key}[#{attribute.key}][]", nil
+= render 'adminable/shared/label', field: field
+= hidden_field_tag "#{@resource.model.model_name.param_key}[#{field.key}][]", nil
 #clusterizeScrollArea.clusterize-scroll.associations
   #clusterizeContentArea.clusterize-content
-    - attribute.association.entries.each do |association_entry|
+    - Adminable::Presenters::Entries.new(entry.association(field.name).klass.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)
+          = check_box_tag "#{@resource.model.model_name.param_key}[#{field.key}][]",
+            association_entry.id, entry.send(field.key).include?(association_entry.id)
           %span.c-indicator
           = link_to association_entry.to_name,
             edit_polymorphic_path(association_entry),

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

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

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

@@ -1,3 +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'
+= render 'adminable/shared/label', field: field
+= text_field_tag "#{@resource.model.model_name.param_key}[#{field.name}]",
+  entry[field.name], class: 'form-control'

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

@@ -1,4 +1,4 @@
-= 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
+= render 'adminable/shared/label', field: field
+= text_area_tag "#{@resource.model.model_name.param_key}[#{field.name}]",
+  entry[field.name],
+  class: "form-control #{ 'wysiwyg' if field.options[:wysiwyg] }", rows: 5

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

@@ -1,3 +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'
+= render 'adminable/shared/label', field: field
+= text_field_tag "#{@resource.model.model_name.param_key}[#{field.name}]",
+  entry[field.name], class: 'form-control'

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

@@ -1,3 +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'
+= render 'adminable/shared/label', field: field
+= text_field_tag "#{@resource.model.model_name.param_key}[#{field.name}]",
+  entry[field.name], class: 'form-control'

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

@@ -4,30 +4,30 @@
   = 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
-  %div{ :class => (@resource.attributes.search.any? ? 'col-md-9' : 'col-md-12') }
+  %div{ :class => (@fields.search.any? ? 'col-md-9' : 'col-md-12') }
     .table-responsive.m-b-3
       %table.table.table-striped
         %thead
           %tr
-            - @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)
+            - @fields.index.each do |field|
+              %th.text-nowrap{ :class => ('text-md-center' if field.options[:center]) }
+                = sort_link(@q, field.name, hide_indicator: true)
             %th
         %tbody
           - @entries.each do |entry|
             %tr
-              - @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.public_send(attribute.name)
+              - @fields.index.each do |field|
+                %td{ :class => ('text-md-center' if field.options[:center]) }
+                  = render field.index_partial_path, entry: entry,
+                    field: field, value: entry.public_send(field.name)
               %td.text-nowrap.text-md-right
                 = 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 }
+              %td.text-md-center.text-muted{ :colspan => @fields.index.size + 1 }
                 No data available
-  - if @resource.attributes.search.any?
+  - if @fields.search.any?
     .col-md-3.hidden-sm-down
       = render 'search'
 = paginate @entries, views_prefix: 'adminable'

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

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

data/lib/adminable.rb

@@ -7,24 +7,23 @@ require 'adminable/resource'
 require 'adminable/presenters/base'
 require 'adminable/presenters/entry'
 require 'adminable/presenters/entries'
+require 'adminable/presenters/fields'
 
-require 'adminable/attributes/collection'
-require 'adminable/attributes/association'
+require 'adminable/field_collector'
 
-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'
-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 'adminable/fields/base'
+require 'adminable/fields/belongs_to'
+require 'adminable/fields/boolean'
+require 'adminable/fields/date'
+require 'adminable/fields/datetime'
+require 'adminable/fields/decimal'
+require 'adminable/fields/float'
+require 'adminable/fields/has_many'
+require 'adminable/fields/integer'
+require 'adminable/fields/string'
+require 'adminable/fields/text'
+require 'adminable/fields/time'
+require 'adminable/fields/timestamp'
 
 require 'haml-rails'
 require 'sass-rails'

data/lib/adminable/errors.rb

@@ -1,7 +1,10 @@
 module Adminable
-  class AttributeNotImplemented < StandardError
+  class FieldsNotDefined < StandardError
   end
 
-  class AttributeNotFound < StandardError
+  class FieldNotImplemented < StandardError
+  end
+
+  class FieldNotFound < StandardError
   end
 end

data/lib/adminable/field_collector.rb

@@ -0,0 +1,53 @@
+module Adminable
+  class FieldCollector
+    # @return [ActiveRecord::Base] activerecord model class
+    # @example
+    #   Adminable::Fields::Collection.new(User).model
+    #   # => User(id: integer, email: string, password_hash: string)
+    attr_reader :model
+
+    # @return [Array] fields from activerecord model
+    attr_reader :all
+
+    # @param model [ActiveRecord::Base] activerecord model class
+    def initialize(model)
+      @model = model
+      @all ||= columns + associations
+    end
+
+    # Collects fields from model columns
+    # @return [Array]
+    #
+    # rubocop:disable Metrics/MethodLength
+    def columns
+      @columns ||= [].tap do |fields|
+        @model.columns.reject { |a| a.name.match(/_id$/) }.each do |column|
+          fields << resolve(column.type, column.name)
+        end
+      end
+    end
+
+    # Collects fields from model associations
+    # @return [Array]
+    def associations
+      @associations ||= [].tap do |fields|
+        @model.reflect_on_all_associations.each do |association|
+          fields << resolve(association.macro, association.name)
+        end
+      end
+    end
+
+    private
+
+      def resolve(type, name)
+        class_name = "adminable/fields/#{type}".classify
+        "#{class_name}.new(:#{name})"
+      end
+
+      def required?(name)
+        @model.validators_on(name).any? do |validator|
+          validator.class == ActiveRecord::Validations::PresenceValidator
+        end
+      end
+  end
+end

data/lib/adminable/{attributes → fields}/base.rb

@@ -1,44 +1,52 @@
 module Adminable
-  module Attributes
-    # Base class for attributes types
+  module Fields
+    # Base class for fields
     # @note Cannot be initialized
     class Base
-      attr_reader :name, :options, :key, :strong_parameter, :association
+      # @return [Symbol] field name
+      attr_reader :name
 
-      # @param name [Symbol] attribute name e.g. `:id` or `:title`
+      # @return [Hash] default options for field
+      attr_reader :options
+
+      # @param name [Symbol] field 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.to_sym
         @options = default_options.merge(options)
-
-        @association = Adminable::Attributes::Association.new(
-          options[:association]
-        ) if options[:association]
       end
 
+      # @return [Symbol] field form key
       def key
         @key ||= name
       end
 
+      # @return [Symbol] controller strong parameters key
       def strong_parameter
         @strong_parameter ||= key
       end
 
+      # @return [String] ransack form key
       def ransack_name
         @ransack_name ||= "#{name}_cont"
       end
 
-      # @return [Symbol] class type e.g. `:text` for Adminable::Attributes::Text
+      # @return [Symbol] field type
+      # @example
+      #   Adminable::Fields::String.new(:title).type
+      #   # => :string
       def type
         @type ||= self.class.name.demodulize.underscore.to_sym
       end
 
+      # @return [String] path to field index partial
       def index_partial_path
         "index/#{type}"
       end
 
+      # @return [String] path to field form partial
       def form_partial_path
         "form/#{type}"
       end
@@ -47,12 +55,12 @@ module Adminable
 
         def default_options
           {
-            index: %i(belongs_to has_many).exclude?(type),
+            index: true,
+            form: true,
+            wysiwyg: false,
             search: false,
-            form: %i(id created_at updated_at).exclude?(name),
             required: false,
-            center: %i(integer boolean float decimal).include?(type),
-            wysiwyg: false
+            center: %i(integer boolean float decimal).include?(type)
           }
         end
     end

data/lib/adminable/fields/belongs_to.rb

@@ -0,0 +1,9 @@
+module Adminable
+  module Fields
+    class BelongsTo < Base
+      def key
+        "#{name}_id"
+      end
+    end
+  end
+end

data/lib/adminable/fields/boolean.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Boolean < Base
+    end
+  end
+end

data/lib/adminable/fields/date.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Date < Base
+    end
+  end
+end

data/lib/adminable/fields/datetime.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Datetime < Base
+    end
+  end
+end

data/lib/adminable/fields/decimal.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Decimal < Base
+    end
+  end
+end

data/lib/adminable/fields/float.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Float < Base
+    end
+  end
+end

data/lib/adminable/fields/has_many.rb

@@ -0,0 +1,13 @@
+module Adminable
+  module Fields
+    class HasMany < Base
+      def key
+        "#{@name.to_s.singularize}_ids"
+      end
+
+      def strong_parameter
+        { key => [] }
+      end
+    end
+  end
+end

data/lib/adminable/fields/integer.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Integer < Base
+    end
+  end
+end

data/lib/adminable/fields/string.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class String < Base
+    end
+  end
+end

data/lib/adminable/fields/text.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Text < Base
+    end
+  end
+end

data/lib/adminable/fields/time.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Time < Base
+    end
+  end
+end

data/lib/adminable/fields/timestamp.rb

@@ -0,0 +1,6 @@
+module Adminable
+  module Fields
+    class Timestamp < Base
+    end
+  end
+end

data/lib/adminable/presenters/fields.rb

@@ -0,0 +1,17 @@
+module Adminable
+  module Presenters
+    class Fields < SimpleDelegator
+      def index
+        select { |field| field.options[:index] }
+      end
+
+      def form
+        select { |field| field.options[:form] }
+      end
+
+      def search
+        select { |field| field.options[:search] }
+      end
+    end
+  end
+end

data/lib/adminable/resource.rb

@@ -1,6 +1,8 @@
 module Adminable
   class Resource
-    attr_reader :name, :model, :attributes
+    include Comparable
+
+    attr_reader :name, :model, :fields
 
     # @param name [String] resource name, usually same as the model name
     def initialize(name)
@@ -13,22 +15,8 @@ module Adminable
       @route ||= @model.name.underscore.pluralize.tr('/', '_')
     end
 
-    # @return [Array] of associations names for ActiveRecord queries
-    def includes
-      @includes ||= if attributes.associations.present?
-                      attributes.associations.map(&:name)
-                    else
-                      false
-                    end
-    end
-
-    # @return [Array] collection, see {Adminable::Attributes::Collection}
-    def attributes
-      @attributes ||= Adminable::Attributes::Collection.new(@model)
-    end
-
-    def ==(other)
-      other.is_a?(Adminable::Resource) && name == other.name
+    def <=>(other)
+      other.is_a?(Adminable::Resource) && name <=> other.name
     end
   end
 end

data/lib/adminable/version.rb

@@ -1,3 +1,3 @@
 module Adminable
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

data/lib/generators/adminable/resource/templates/resource_controller.rb.erb

@@ -1,2 +1,7 @@
-class <%= resource_class %>Controller < Adminable::ResourcesController
+class <%= resource_class_name %>Controller < Adminable::ResourcesController
+  def fields
+    [
+      <%= fields.join(",\n\t\t\t") %>
+    ]
+  end
 end

data/lib/generators/adminable/resource_generator.rb

@@ -20,9 +20,17 @@ module Adminable
           name.underscore.pluralize
         end
 
-        def resource_class
+        def resource_class_name
           "adminable/#{resource_name}".classify.pluralize
         end
+
+        def model_class
+          name.classify.constantize
+        end
+
+        def fields
+          Adminable::FieldCollector.new(model_class).all
+        end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sergey Novikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -370,27 +370,27 @@ files:
 - config/locales/adminable.ru.yml
 - config/routes.rb
 - lib/adminable.rb
-- lib/adminable/attributes/association.rb
-- lib/adminable/attributes/base.rb
-- lib/adminable/attributes/collection.rb
-- lib/adminable/attributes/types/belongs_to.rb
-- lib/adminable/attributes/types/boolean.rb
-- lib/adminable/attributes/types/date.rb
-- lib/adminable/attributes/types/datetime.rb
-- lib/adminable/attributes/types/decimal.rb
-- lib/adminable/attributes/types/float.rb
-- lib/adminable/attributes/types/has_many.rb
-- lib/adminable/attributes/types/integer.rb
-- lib/adminable/attributes/types/string.rb
-- lib/adminable/attributes/types/text.rb
-- lib/adminable/attributes/types/time.rb
-- lib/adminable/attributes/types/timestamp.rb
 - lib/adminable/configuration.rb
 - lib/adminable/engine.rb
 - lib/adminable/errors.rb
+- lib/adminable/field_collector.rb
+- lib/adminable/fields/base.rb
+- lib/adminable/fields/belongs_to.rb
+- lib/adminable/fields/boolean.rb
+- lib/adminable/fields/date.rb
+- lib/adminable/fields/datetime.rb
+- lib/adminable/fields/decimal.rb
+- lib/adminable/fields/float.rb
+- lib/adminable/fields/has_many.rb
+- lib/adminable/fields/integer.rb
+- lib/adminable/fields/string.rb
+- lib/adminable/fields/text.rb
+- lib/adminable/fields/time.rb
+- lib/adminable/fields/timestamp.rb
 - lib/adminable/presenters/base.rb
 - lib/adminable/presenters/entries.rb
 - lib/adminable/presenters/entry.rb
+- lib/adminable/presenters/fields.rb
 - lib/adminable/resource.rb
 - lib/adminable/version.rb
 - lib/generators/adminable/install/templates/application_controller.rb

data/lib/adminable/attributes/association.rb

@@ -1,14 +0,0 @@
-module Adminable
-  module Attributes
-    class Association
-      attr_reader :reflection, :model, :entries
-
-      # @param reflection [Object] ActiveRecord::Reflection::HasManyReflection
-      def initialize(reflection)
-        @reflection = reflection
-        @model = @reflection.klass
-        @entries = Adminable::Presenters::Entries.new(@model)
-      end
-    end
-  end
-end

data/lib/adminable/attributes/collection.rb

@@ -1,116 +0,0 @@
-module Adminable
-  module Attributes
-    class Collection
-      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
-        all.select { |attribute| attribute.options[:index] }
-      end
-
-      def form
-        all.select { |attribute| attribute.options[:form] }
-      end
-
-      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 |attributes|
-          @model.columns.reject { |a| a.name.match(/_id$/) }.each do |column|
-            begin
-              attributes << resolve(column.type).new(
-                column.name,
-                required: required?(column.name)
-              )
-            rescue Adminable::AttributeNotImplemented
-              next
-            end
-          end
-        end
-      end
-
-      # 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: required?(association.name),
-              association: association
-            )
-          end
-        end
-      end
-
-      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
-      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 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
-        end
-    end
-  end
-end

data/lib/adminable/attributes/types/belongs_to.rb

@@ -1,11 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class BelongsTo < Base
-        def key
-          @association.reflection.foreign_key
-        end
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/boolean.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Boolean < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/date.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Date < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/datetime.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Datetime < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/decimal.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Decimal < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/float.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Float < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/has_many.rb

@@ -1,15 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class HasMany < Base
-        def key
-          @key = "#{@name.to_s.singularize}_ids"
-        end
-
-        def strong_parameter
-          { key => [] }
-        end
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/integer.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Integer < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/string.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class String < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/text.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Text < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/time.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Time < Base
-      end
-    end
-  end
-end

data/lib/adminable/attributes/types/timestamp.rb

@@ -1,8 +0,0 @@
-module Adminable
-  module Attributes
-    module Types
-      class Timestamp < Base
-      end
-    end
-  end
-end