trestle 0.8.3 → 0.8.6

data/lib/trestle/table/actions_column.rb

@@ -1,10 +1,10 @@
 module Trestle
   class Table
     class ActionsColumn
-      attr_reader :table, :block
+      attr_reader :table, :options, :block
 
-      def initialize(table, &block)
-        @table = table
+      def initialize(table, options={}, &block)
+        @table, @options = table, options
         @block = block_given? ? block : default_actions
       end
 
@@ -13,8 +13,10 @@ module Trestle
       end
 
       def default_actions
+        admin = table.admin
+
         ->(action) do
-          action.delete
+          action.delete if admin && admin.actions.include?(:destroy)
         end
       end
 
@@ -23,37 +25,40 @@ module Trestle
 
         delegate :table, to: :@column
 
+        delegate :concat, :icon, :link_to, :admin_url_for, :admin_link_to, to: :@template
+
         def initialize(column, template, instance)
           @column, @template, @instance = column, template, instance
         end
 
+        def show
+          button(icon("fa fa-info"), instance, action: :show, class: "btn-info")
+        end
+
+        def edit
+          button(icon("fa fa-pencil"), instance, action: :edit, class: "btn-warning")
+        end
+
         def delete
-          button(@template.icon("fa fa-trash"), @template.admin_url_for(instance, admin: table.options[:admin], action: :destroy), method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
+          button(icon("fa fa-trash"), instance, action: :destroy, method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
         end
 
-        def button(content, url, options={})
+        def button(content, instance_or_url, options={})
           options[:class] = Array(options[:class])
           options[:class] << "btn" unless options[:class].include?("btn")
 
-          @template.concat @template.link_to(content, url, options)
+          concat admin_link_to(content, instance_or_url, options.reverse_merge(admin: table.admin))
         end
         alias_method :link, :button
       end
 
       class Renderer < Column::Renderer
         def header
+          options[:header]
         end
 
         def classes
-          "actions"
-        end
-
-        def options
-          {}
-        end
-
-        def data
-          {}
+          super + ["actions"]
         end
 
         def content(instance)

data/lib/trestle/table/automatic.rb

@@ -3,7 +3,6 @@ module Trestle
     class Automatic < Table
       def initialize(admin)
         super(sortable: true, admin: admin)
-        @admin = admin
       end
 
       def columns
@@ -11,20 +10,14 @@ module Trestle
       end
 
       def content_columns
-        @admin.default_attributes.map.with_index do |attribute, index|
-          next if attribute.inheritance_column?
-          next if attribute.counter_cache?
-
-          if attribute.association?
+        admin.default_table_attributes.map.with_index do |attribute, index|
+          case attribute.type
+          when :association
             Column.new(self, attribute.association_name, sort: false)
-          elsif attribute.text?
-            Column.new(self, attribute.name, link: index.zero?) do |instance|
-              truncate(instance.public_send(attribute.name))
-            end
           else
-            Column.new(self, attribute.name, link: index.zero?, align: (:center if attribute.datetime? || attribute.boolean?))
+            Column.new(self, attribute.name, link: index.zero?, align: (:center if [:datetime, :boolean].include?(attribute.type)))
           end
-        end.compact
+        end
       end
 
       def actions_column

data/lib/trestle/table/builder.rb

@@ -5,6 +5,7 @@ module Trestle
 
       def initialize(options={})
         @table = Table.new(options)
+        @output_buffer = ActionView::OutputBuffer.new
       end
 
       def row(options={}, &block)
@@ -24,8 +25,8 @@ module Trestle
         table.columns << Column.new(table, field, options, &(proc || block))
       end
 
-      def actions(&block)
-        table.columns << ActionsColumn.new(table, &block)
+      def actions(options={}, &block)
+        table.columns << ActionsColumn.new(table, options, &block)
       end
     end
   end

data/lib/trestle/table/column.rb

@@ -28,8 +28,18 @@ module Trestle
         options[:sort].is_a?(Hash) ? options[:sort] : {}
       end
 
+      def header
+        if options[:header]
+          options[:header]
+        elsif table.admin
+          table.admin.human_attribute_name(field)
+        else
+          field.to_s.humanize.titleize
+        end
+      end
+
       class Renderer
-        delegate :options, to: :@column
+        delegate :options, :table, to: :@column
 
         def initialize(column, template)
           @column, @template = column, template
@@ -38,24 +48,22 @@ module Trestle
         def header
           return if options.has_key?(:header) && options[:header].in?([nil, false])
 
-          header = I18n.t("admin.table.headers.#{@column.field}", default: options[:header] || @column.field.to_s.humanize.titleize)
+          header = I18n.t("admin.table.headers.#{@column.field}", default: @column.header)
           header = @template.sort_link(header, @column.sort_field, @column.sort_options) if @column.sortable?
           header
         end
 
         def content(instance)
           value = column_value(instance)
-
-          return blank_column(instance) if value.nil?
-
-          content = format_column(value)
+          content = @template.format_value(value, options)
 
           if value.respond_to?(:id) && options[:link] != false
+            # Column value was a model instance (e.g. from an association).
             # Automatically link to instance's admin if available
             content = @template.admin_link_to(content, value)
           elsif options[:link]
             # Explicitly link to the specified admin, or the table's admin
-            content = @template.admin_link_to(content, instance, admin: options[:admin] || @column.table.options[:admin])
+            content = @template.admin_link_to(content, instance, admin: options[:admin] || table.admin)
           end
 
           content
@@ -72,48 +80,22 @@ module Trestle
       private
         def column_value(instance)
           if @column.block
-            @template.capture { @template.instance_exec(instance, &@column.block).to_s }
+            if defined?(Haml) && Haml::Helpers.block_is_haml?(@column.block)
+              # In order for table column blocks to work properly within Haml templates,
+              # the _hamlout local variable needs to be defined in the scope of the block,
+              # so that the Haml version of the capture method is used. Because we
+              # evaluate the block using instance_exec, we need to set this up manually.
+              -> {
+                _hamlout = eval('_hamlout', @column.block.binding)
+                @template.capture { @template.instance_exec(instance, &@column.block).to_s }
+              }.call
+            else
+              @template.capture { @template.instance_exec(instance, &@column.block).to_s }
+            end
           else
             instance.send(@column.field)
           end
         end
-
-        def blank_column(value)
-          text = options.key?(:blank) ? options[:blank] : I18n.t("admin.table.column.blank")
-          @template.content_tag(:span, text, class: "blank")
-        end
-
-        def format_column(value)
-          if options.key?(:format)
-            format_from_options(value)
-          else
-            autoformat_value(value)
-          end
-        end
-
-        def format_from_options(value)
-          case options[:format]
-          when :currency
-            @template.number_to_currency(value)
-          else
-            value
-          end
-        end
-
-        def autoformat_value(value)
-          case value
-          when Time, DateTime
-            @template.timestamp(value)
-          when Date
-            @template.datestamp(value)
-          when TrueClass, FalseClass
-            @template.status_tag(@template.icon("fa fa-check"), :success) if value
-          when ->(value) { value.respond_to?(:id) }
-            @template.display(value)
-          else
-            value
-          end
-        end
       end
     end
   end

data/lib/trestle/table/row.rb

@@ -21,15 +21,21 @@ module Trestle
 
         def options(instance)
           options = Trestle::Options.new
-          options.merge!(data: { url: admin_url_for(instance) }) if table.options[:admin]
+
+          if table.admin && table.autolink?
+            options.merge!(data: { url: admin_url_for(instance) })
+            options.merge!(data: { behavior: "dialog" }) if table.admin.form.dialog?
+          end
+
           options.merge!(@row.options)
           options.merge!(@template.instance_exec(instance, &@row.block)) if @row.block
+
           options
         end
 
       protected
         def admin_url_for(instance)
-          @template.admin_url_for(instance, admin: table.options[:admin])
+          @template.admin_url_for(instance, admin: table.admin)
         end
       end
     end

data/lib/trestle/table.rb

@@ -9,11 +9,13 @@ module Trestle
     autoload :SelectColumn
     autoload :Row
 
-    attr_reader :columns, :options
+    attr_reader :columns, :options, :admin
     attr_writer :row
 
     def initialize(options={})
       @options = options
+      @admin = Trestle.lookup(options[:admin]) if options.key?(:admin)
+
       @columns = []
     end
 
@@ -21,6 +23,10 @@ module Trestle
       options[:sortable] == true
     end
 
+    def autolink?
+      options[:autolink] != false
+    end
+
     def renderer(template)
       Renderer.new(self, template)
     end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.3"
+  VERSION = "0.8.6"
 end

data/lib/trestle.rb

@@ -18,6 +18,7 @@ module Trestle
   autoload :Configuration
   autoload :Display
   autoload :Form
+  autoload :ModelName
   autoload :Navigation
   autoload :Options
   autoload :Reloader

data/trestle.gemspec

@@ -33,11 +33,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2.2"
 
-  spec.add_dependency "rails",              ">= 4.2.0"
-  spec.add_dependency "sass-rails",         "~> 5.0.6"
-  spec.add_dependency "coffee-rails",       "~> 4.2.1"
-  spec.add_dependency "autoprefixer-rails", "~> 6.4.0"
-  spec.add_dependency "kaminari",           "~> 0.17.0"
+  spec.add_dependency "railties",           ">= 4.2.0"
+  spec.add_dependency "activemodel",        ">= 4.2.0"
+  spec.add_dependency "sass-rails",         ">= 5.0.6"
+  spec.add_dependency "autoprefixer-rails", ">= 7.1.2"
+  spec.add_dependency "kaminari",           "~> 1.1.0"
 
   spec.add_development_dependency "bundler",     "~> 1.12"
   spec.add_development_dependency "rake",        "~> 10.0"

data/vendor/assets/bower_components/trestle/flatpickr/dist/flatpickr.css

@@ -14,12 +14,14 @@
   line-height: 24px;
   border-radius: 5px;
   position: absolute;
-  width: 315px;
-  box-sizing: border-box;
+  width: 307.875px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   -ms-touch-action: manipulation;
       touch-action: manipulation;
   background: #fff;
-  box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
+  -webkit-box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
+          box-shadow: 1px 0 0 #e6e6e6, -1px 0 0 #e6e6e6, 0 1px 0 #e6e6e6, 0 -1px 0 #e6e6e6, 0 3px 13px rgba(0,0,0,0.08);
 }
 .flatpickr-calendar.open,
 .flatpickr-calendar.inline {
@@ -194,6 +196,7 @@
 }
 .flatpickr-prev-month svg path,
 .flatpickr-next-month svg path {
+  -webkit-transition: fill 0.1s;
   transition: fill 0.1s;
   fill: inherit;
 }
@@ -218,7 +221,8 @@
   opacity: 0;
   cursor: pointer;
   border: 1px solid rgba(57,57,57,0.05);
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .numInputWrapper span:hover {
   background: rgba(0,0,0,0.1);
@@ -326,7 +330,8 @@
 }
 .flatpickr-current-month input.cur-year {
   background: transparent;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   color: inherit;
   cursor: default;
   padding: 0 0 0 0.5ch;
@@ -355,10 +360,12 @@
   background: transparent;
   text-align: center;
   overflow: hidden;
-  width: 315px;
+  width: 100%;
+  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
+  -webkit-box-align: center;
   -webkit-align-items: center;
       -ms-flex-align: center;
           align-items: center;
@@ -373,6 +380,7 @@ span.flatpickr-weekday {
   margin: 0;
   text-align: center;
   display: block;
+  -webkit-box-flex: 1;
   -webkit-flex: 1;
       -ms-flex: 1;
           flex: 1;
@@ -385,10 +393,11 @@ span.flatpickr-weekday {
 .flatpickr-days {
   position: relative;
   overflow: hidden;
+  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  width: 315px;
+  width: 307.875px;
 }
 .flatpickr-days:focus {
   outline: 0;
@@ -397,12 +406,14 @@ span.flatpickr-weekday {
   padding: 0;
   outline: 0;
   text-align: left;
-  width: 315px;
-  min-width: 315px;
-  max-width: 315px;
-  box-sizing: border-box;
+  width: 307.875px;
+  min-width: 307.875px;
+  max-width: 307.875px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   display: inline-block;
   display: -ms-flexbox;
+  display: -webkit-box;
   display: -webkit-flex;
   display: flex;
   -webkit-flex-wrap: wrap;
@@ -442,7 +453,8 @@ span.flatpickr-weekday {
   background: none;
   border: 1px solid transparent;
   border-radius: 150px;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   color: #393939;
   cursor: pointer;
   font-weight: 400;
@@ -450,12 +462,13 @@ span.flatpickr-weekday {
   -webkit-flex-basis: 14.2857143%;
       -ms-flex-preferred-size: 14.2857143%;
           flex-basis: 14.2857143%;
-  max-width: 40px;
-  height: 40px;
-  line-height: 40px;
+  max-width: 39px;
+  height: 39px;
+  line-height: 39px;
   margin: 0;
   display: inline-block;
   position: relative;
+  -webkit-box-pack: center;
   -webkit-justify-content: center;
       -ms-flex-pack: center;
           justify-content: center;
@@ -506,7 +519,8 @@ span.flatpickr-weekday {
 .flatpickr-day.startRange.nextMonthDay,
 .flatpickr-day.endRange.nextMonthDay {
   background: #569ff7;
-  box-shadow: none;
+  -webkit-box-shadow: none;
+          box-shadow: none;
   color: #fff;
   border-color: #569ff7;
 }
@@ -523,7 +537,8 @@ span.flatpickr-weekday {
 .flatpickr-day.selected.startRange + .endRange,
 .flatpickr-day.startRange.startRange + .endRange,
 .flatpickr-day.endRange.startRange + .endRange {
-  box-shadow: -10px 0 0 #569ff7;
+  -webkit-box-shadow: -10px 0 0 #569ff7;
+          box-shadow: -10px 0 0 #569ff7;
 }
 .flatpickr-day.selected.startRange.endRange,
 .flatpickr-day.startRange.startRange.endRange,
@@ -532,7 +547,8 @@ span.flatpickr-weekday {
 }
 .flatpickr-day.inRange {
   border-radius: 0;
-  box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+  -webkit-box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
+          box-shadow: -5px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
 }
 .flatpickr-day.disabled,
 .flatpickr-day.disabled:hover {
@@ -552,7 +568,8 @@ span.flatpickr-weekday {
 }
 .flatpickr-day.week.selected {
   border-radius: 0;
-  box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
+  -webkit-box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
+          box-shadow: -5px 0 0 #569ff7, 5px 0 0 #569ff7;
 }
 .rangeMode .flatpickr-day {
   margin-top: 1px;
@@ -563,7 +580,8 @@ span.flatpickr-weekday {
 }
 .flatpickr-weekwrapper .flatpickr-weeks {
   padding: 0 12px;
-  box-shadow: 1px 0 0 #e6e6e6;
+  -webkit-box-shadow: 1px 0 0 #e6e6e6;
+          box-shadow: 1px 0 0 #e6e6e6;
 }
 .flatpickr-weekwrapper .flatpickr-weekday {
   float: none;
@@ -577,16 +595,19 @@ span.flatpickr-weekday {
 }
 .flatpickr-innerContainer {
   display: block;
+  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   overflow: hidden;
 }
 .flatpickr-rContainer {
   display: inline-block;
   padding: 0;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .flatpickr-time {
   text-align: center;
@@ -595,8 +616,10 @@ span.flatpickr-weekday {
   height: 0;
   line-height: 40px;
   max-height: 40px;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   overflow: hidden;
+  display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -607,6 +630,7 @@ span.flatpickr-weekday {
   clear: both;
 }
 .flatpickr-time .numInputWrapper {
+  -webkit-box-flex: 1;
   -webkit-flex: 1;
       -ms-flex: 1;
           flex: 1;
@@ -628,7 +652,8 @@ span.flatpickr-weekday {
 }
 .flatpickr-time input {
   background: transparent;
-  box-shadow: none;
+  -webkit-box-shadow: none;
+          box-shadow: none;
   border: 0;
   border-radius: 0;
   text-align: center;
@@ -640,7 +665,8 @@ span.flatpickr-weekday {
   color: #393939;
   font-size: 14px;
   position: relative;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .flatpickr-time input.flatpickr-hour {
   font-weight: bold;
@@ -668,7 +694,6 @@ span.flatpickr-weekday {
           user-select: none;
   -webkit-align-self: center;
       -ms-flex-item-align: center;
-              -ms-grid-row-align: center;
           align-self: center;
 }
 .flatpickr-time .flatpickr-am-pm {