action_admin 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982edc1021b2a77531f490363c7bd03ccd771dc6
-  data.tar.gz: d31e4dd9c6d0a407a1484ca3fbc4e303f1ab5299
+  metadata.gz: e8c1c4bce91ccdc0e91b160a64bb2d33c4813b5a
+  data.tar.gz: b4a4abebea3d0b3db713543c4a80600849ffb163
 SHA512:
-  metadata.gz: dbc141a4e4a8da89026d6d74f925a6408723cdbd7fb99aad16311e6c4d9e1741077170adebfe74b1eef46ac20f2060c0a31b0eeb4851559c5e151effd3683625
-  data.tar.gz: 18fd1ac7ffa3a656ed76982930ca505222c24d5f0f6bd6dce7ca750ce7a830f5b7c8d790e698308514fdfe0131e8c5ba023c728db53db3c73b4bfa04113fb702
+  metadata.gz: a3d44fb6749ae4bc557f5d04d906427c5295073466633c6d8317bc67818d67d383943a57d66e4e4f7bd3e11a9340f3210a26bd4944538dad971cd7bbea73a55c
+  data.tar.gz: 1ab6296221e9377178c6fbf56f18cece1af8a5c9dc908140b75e83cf06bdd50537ec1a838e36b9fb8d640b3db3b951125ef4e9fb2ebd79ec7ad5da7d2256b1d4

data/app/assets/stylesheets/action_admin/action-admin.scss

@@ -68,3 +68,25 @@
     }
   }
 }
+
+
+// Table elements
+
+table {
+
+  .avatar:not(:only-child) {
+    margin-right: 5px;
+  }
+
+  .thumbnail {
+    margin: 0;
+  }
+
+  .label {
+    margin-right: 5px;
+
+    a {
+      color: inherit;
+    }
+  }
+}

data/app/presenters/action_admin/presenter.rb

@@ -27,8 +27,8 @@ module ActionAdmin
       attribute_names.map { |i| @model.human_attribute_name(i) }
     end
 
-    def render_attribute(name)
-      @context.simple_attribute_for(@record, name, Hash(attributes[name]))
+    def render_attribute(name, options={})
+      @context.simple_attribute_for(@record, name, options)
     end
 
     def render_attributes(*args)
@@ -135,5 +135,32 @@ module ActionAdmin
         sorted_panels.select { |_i, o| o[:context] == context }
       end
     end
+
+    # def render_table(table)
+    #   table = self.record_tables[table]
+    # end
+
+    def render_table_header(table)
+      table = self.record_tables[table]
+      cells = []
+
+      table.header.each do |_k, v|
+        cells << @context.content_tag(:th, v[:label], v[:html])
+      end
+
+      cells.join.html_safe
+    end
+
+    def render_table_columns(table)
+      table = self.record_tables[table]
+      cells = []
+
+      table.columns.each do |k, v|
+        options = v.fetch(:attribute, {})
+        cells << @context.content_tag(:td, render_attribute(k, options), v[:html])
+      end
+
+      cells.join.html_safe
+    end
   end
 end

data/app/presenters/concerns/action_admin/presentable.rb

@@ -6,10 +6,12 @@ module ActionAdmin
       class_attribute :record_attributes
       class_attribute :record_fields
       class_attribute :record_panels
+      class_attribute :record_tables
 
       self.record_attributes = {}
       self.record_fields     = {}
       self.record_panels     = {}
+      self.record_tables     = {}
     end
 
     class_methods do
@@ -24,6 +26,15 @@ module ActionAdmin
       def panel(name, options={})
         self.record_panels = self.record_panels.merge(name => options)
       end
+
+      def table(name, options={}, &block)
+        new_table = ActionAdmin::Table.new(name, options)
+        new_table.merge(self.record_tables[name])
+
+        yield new_table if block_given?
+
+        self.record_tables = self.record_tables.merge(name => new_table)
+      end
     end
   end
 end

data/app/views/admin/records/index.html.slim

@@ -10,13 +10,13 @@
       table.unstriped.margin-0
         thead
           tr
-            = admin_present(current_model).render_attributes_labels(:th)
-            th = 'Actions'
+            = admin_present(current_model).render_table_header(:index)
+            th.shrink.actions.text-right = 'Actions'
 
         tbody
           - admin_present_many(current_records).each do |record|
             tr
-              = record.render_attributes(:td, class: 'expand')
+              = record.render_table_columns(:index)
               = record.action_links(:td, class: 'shrink actions')
 
     - if current_records.respond_to? :current_page

data/config/initializers/simple_attribute.rb

@@ -0,0 +1,24 @@
+SimpleAttribute.setup do |config|
+  config.avatar   = { html: { class: 'rounded bordered' } }
+  config.image    = { html: { class: 'thumbnail' }, default_value: 'upload-preview.svg' }
+  config.boolean  = { true: 'success', false: 'alert', wrapper: { class: 'label' } }
+  config.wrappers = { badge: { class: 'badge' } }
+
+  config.wrappers do |wrapper|
+    wrapper.label_default   = { class: 'label default' }
+    wrapper.label_primary   = { class: 'label primary' }
+    wrapper.label_secondary = { class: 'label secondary' }
+    wrapper.label_info      = { class: 'label info' }
+    wrapper.label_success   = { class: 'label success' }
+    wrapper.label_warning   = { class: 'label warning' }
+    wrapper.label_alert     = { class: 'label alert' }
+
+    wrapper.badge_default   = { class: 'badge default' }
+    wrapper.badge_primary   = { class: 'badge primary' }
+    wrapper.badge_secondary = { class: 'badge secondary' }
+    wrapper.badge_info      = { class: 'badge info' }
+    wrapper.badge_success   = { class: 'badge success' }
+    wrapper.badge_warning   = { class: 'badge warning' }
+    wrapper.badge_alert     = { class: 'badge alert' }
+  end
+end

data/lib/action_admin.rb

@@ -15,6 +15,7 @@ module ActionAdmin
   autoload :Config
   autoload :Form
   autoload :Header
+  autoload :Table
 
   # Set attr accessors
   mattr_accessor :config

data/lib/action_admin/header.rb

@@ -42,10 +42,13 @@ module ActionAdmin
     end
 
     def default_title(context)
+      singular = context.controller.try(:instance_name)
+      plural   = context.controller.try(:collection_name)
+
       if context.action_name == 'index'
-        context.controller_name.titleize
+        "#{plural || context.controller_name}".strip.titleize
       else
-        context.action_name.titleize
+        "#{context.action_name} #{singular}".strip.titleize
       end
     end
 

data/lib/action_admin/table.rb

@@ -0,0 +1,37 @@
+module ActionAdmin
+  class Table
+    class_attribute :name
+    class_attribute :options
+    class_attribute :columns
+    class_attribute :header
+
+    def initialize(name, options)
+      self.name    = name
+      self.options = options
+      self.columns = {}
+      self.header  = {}
+    end
+
+    def column(name, options={})
+      self.columns = self.columns.merge(name => options)
+      self.header  = self.header.merge(name => set_column_header(name, options))
+    end
+
+    def merge(table)
+      if table.is_a? ActionAdmin::Table
+        self.options = table.options.deep_merge(self.options)
+        self.columns = table.columns.merge(self.columns)
+        self.header  = table.header.merge(self.header)
+      end
+    end
+
+    private
+
+      def set_column_header(name, options={})
+        label = options.fetch(:label, name.to_s.titleize)
+        html  = options.fetch(:html, {})
+
+        { label: label, html: html }
+      end
+  end
+end

data/lib/action_admin/version.rb

@@ -1,3 +1,3 @@
 module ActionAdmin
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,6 +242,7 @@ files:
 - app/views/layouts/admin.html.slim
 - app/views/layouts/admin/devise.html.slim
 - config/initializers/admin_simple_form.rb
+- config/initializers/simple_attribute.rb
 - config/routes.rb
 - lib/action_admin.rb
 - lib/action_admin/config.rb
@@ -252,6 +253,7 @@ files:
 - lib/action_admin/form/minimal_builder.rb
 - lib/action_admin/header.rb
 - lib/action_admin/routes.rb
+- lib/action_admin/table.rb
 - lib/action_admin/version.rb
 - lib/tasks/action_admin_tasks.rake
 homepage: https://github.com/hardpixel/action-admin
@@ -274,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails mountable engine to create admin interfaces