trestle 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499a6802f0891311253e5a4999b494715ccdfa8d070bae35827268044fc5a7f8
-  data.tar.gz: 5ac6a1b33a8b33ae636a7c948adc42d73212f6fba90b7ea71953a69b961f4723
+  metadata.gz: c1640cda170a3f473968769e1c0380de2689ac11ecdd88c0b19bf93796701680
+  data.tar.gz: c3c78457d933155de6eba4bac6500a906e4fb78dce4232a68040ddeb2dfd919e
 SHA512:
-  metadata.gz: aef9565030e42e5fe42dd0a0773c65b1eb35a41c743678a1799ae57df99e438f7d61c3cb74b905171ff844134176f9a1c95a21ff917e6e25e072b494d1d776bb
-  data.tar.gz: 4971e16e2e693081c8ed4d20a53bf4ce980261e66c0370c208356eadd41877f411290a8c81f5e0e5a796e5cfa70ff17a2cb5ab7b5b74848e658806d99cb89646
+  metadata.gz: d597693a4f29721adb0a3b8e0b6d15679bef552b6d050b390940fcf53a28922f99cca9c993d1f9458d284786f5f4e29fbce2bef6bcc7891be639b53e7502ea83
+  data.tar.gz: ba5bd00f7a509ea1a349e57d52dd46e15f86c78d95fd0cabc755a82c5079155fcc9db8b405523378977119f274d171ff9e3ca0d5c128631a39f6a2fb72577afa

data/README.md

@@ -38,7 +38,11 @@ After restarting your Rails server, visit http://localhost:3000/admin to view yo
 ```ruby
 Trestle.resource(:posts) do
   # Add a link to this admin in the main navigation
-  menu :posts, icon: "fa fa-file-text-o", group: :blog_management
+  menu do
+    group :blog_management, priority: :first do
+      item :posts, icon: "fa fa-file-text-o"
+    end
+  end
 
   # Define custom scopes for the index view
   scope :all, default: true

data/app/assets/javascripts/trestle/components/_dialog.js

@@ -1,7 +1,7 @@
 Trestle.Dialog = function(options) {
   options = options || {};
 
-  this.el = Trestle.Dialog.getElement();
+  this.el = Trestle.Dialog.createElement();
 
   if (options.modalClass) {
     this.el.find('.modal-dialog').addClass(options.modalClass);
@@ -9,30 +9,31 @@ Trestle.Dialog = function(options) {
 };
 
 Trestle.Dialog.TEMPLATE =
-  '<div id="dialog" class="modal fade" tabindex="-1">' +
+  '<div class="modal fade" tabindex="-1">' +
     '<div class="modal-dialog">' +
       '<div class="modal-content" data-context></div>' +
     '</div>' +
   '</div>';
 
-Trestle.Dialog.getElement = function() {
-  var el = $('#dialog');
+Trestle.Dialog.createElement = function() {
+  var el = $(Trestle.Dialog.TEMPLATE).appendTo('body');
 
-  if (el.length == 0) {
-    el = $(Trestle.Dialog.TEMPLATE).appendTo('body');
+  el.modal({ show: false });
 
-    el.modal({ show: false });
+  // Remove dialog elements once hidden
+  el.on('hidden.bs.modal', function() {
+    el.remove();
+  });
 
-    // Remove dialog elements once hidden
-    el.on('hidden.bs.modal', function() {
-      el.remove();
-    });
+  // Restore the next visible modal to the foreground
+  el.on('hide.bs.modal', function() {
+    el.prevAll('.modal.in').last().removeClass('background');
+  });
 
-    // Set X-Trestle-Dialog header on AJAX requests initiated from the dialog
-    el.on('ajax:beforeSend', '[data-remote]', function(e, xhr, options) {
-      xhr.setRequestHeader("X-Trestle-Dialog", true);
-    });
-  }
+  // Set X-Trestle-Dialog header on AJAX requests initiated from the dialog
+  el.on('ajax:beforeSend', '[data-remote]', function(e, xhr, options) {
+    xhr.setRequestHeader("X-Trestle-Dialog", true);
+  });
 
   return el;
 };
@@ -113,6 +114,9 @@ Trestle.Dialog.prototype.showError = function(title, content) {
 
 Trestle.Dialog.prototype.show = function() {
   this.el.modal('show');
+
+  // Background any existing visible modals
+  this.el.prevAll('.modal.in').addClass('background');
 };
 
 Trestle.Dialog.prototype.hide = function() {

data/app/assets/stylesheets/trestle/components/_content.scss

@@ -53,6 +53,12 @@
   min-width: 0;
 }
 
+.main-content-header,
+.main-content-footer {
+  display: flex;
+  justify-content: space-between;
+}
+
 .main-content-header {
   margin: -20px -20px 20px !important;
   padding: $main-content-header-padding;
@@ -114,6 +120,12 @@
     padding: 15px;
   }
 
+  .main-content-header,
+  .main-content-footer {
+    flex-direction: column;
+    align-items: center;
+  }
+
   .main-content-header {
     margin: -15px -15px 15px !important;
     padding-left: 15px;

data/app/assets/stylesheets/trestle/components/_fields.scss

@@ -1,3 +1,20 @@
+.form-group {
+  position: relative;
+}
+
+.help-block {
+  font-size: 13px;
+
+  @media (min-width: $screen-sm-min) {
+    &.floating {
+      position: absolute;
+      top: 0;
+      right: 0;
+      margin: 2px 0;
+    }
+  }
+}
+
 .select2-container--bootstrap {
   // This is required to ensure the select field is rendered at full width
   // within Bootstrap tabs that are hidden when the page is first loaded.

data/app/assets/stylesheets/trestle/components/_modal.scss

@@ -1,3 +1,12 @@
+.modal {
+  &.background {
+    .modal-dialog {
+      transform: scale(0.9);
+      opacity: 0.75;
+    }
+  }
+}
+
 .modal-content {
   border: none;
   border-radius: 0;

data/app/assets/stylesheets/trestle/components/_pagination.scss

@@ -1,4 +1,5 @@
 .pagination-container {
+  margin-left: auto;
   text-align: right;
 
   p {
@@ -24,6 +25,8 @@
 
 @include mobile {
   .pagination-container {
+    margin-right: auto;
+
     text-align: center;
 
     display: flex;

data/app/helpers/trestle/url_helper.rb

@@ -30,6 +30,9 @@ module Trestle
         admin ||= self.admin if respond_to?(:admin)
 
         if admin
+          # Ensure admin has controller context
+          admin = admin.new(self) if admin.is_a?(Class)
+
           # Generate path
           action = options.delete(:action) || :show
           params = options.delete(:params) || {}
@@ -59,6 +62,9 @@ module Trestle
       admin ||= admin_for(instance)
       return unless admin
 
+      # Ensure admin has controller context
+      admin = admin.new(self) if admin.is_a?(Class)
+
       if admin.respond_to?(:instance_path)
         admin.instance_path(instance, options)
       else

data/app/views/trestle/resource/_scopes.html.erb

@@ -2,7 +2,7 @@
   <% admin.scopes.each do |name, scope| %>
     <%= content_tag(:li, class: ("active" if scope.active?(params))) do %>
       <%= link_to persistent_params.merge(scope: (name unless scope.active?(params))) do %>
-        <strong><%= scope.label %></strong> (<%= number_with_delimiter(scope.count(admin.initialize_collection(params))) %>)
+        <strong><%= scope.label %></strong> (<%= number_with_delimiter(scope.count(admin.collection(params))) %>)
       <% end %>
     <% end %>
   <% end %>

data/app/views/trestle/table/_table.html.erb

@@ -2,6 +2,7 @@
 
 <div class="table-container">
   <%= content_tag(:table, id: table.id, class: table.classes, data: table.data) do %>
+    <% if table.header? %>
     <thead>
       <tr>
         <% table.columns.each do |column| %>
@@ -9,6 +10,7 @@
         <% end %>
       </tr>
     </thead>
+    <% end %>
 
     <tbody>
       <% collection.each do |instance| %>

data/lib/trestle/adapters/active_record_adapter.rb

@@ -17,11 +17,11 @@ module Trestle
         instance.assign_attributes(attrs)
       end
 
-      def save_instance(instance)
+      def save_instance(instance, params={})
         instance.save
       end
 
-      def delete_instance(instance)
+      def delete_instance(instance, params={})
         instance.destroy
       end
 

data/lib/trestle/adapters/adapter.rb

@@ -4,8 +4,9 @@ module Trestle
       attr_reader :admin
       delegate :model, to: :admin
 
-      def initialize(admin)
+      def initialize(admin, context=nil)
         @admin = admin
+        @context = context
       end
 
       # Loads the initial collection for use by the index action.
@@ -46,18 +47,20 @@ module Trestle
       # Saves an instance (used by the create and update actions).
       #
       # instance - The instance to save
+      # params   - Unfiltered params hash from the controller
       #
       # Returns a boolean indicating the success/fail status of the save.
-      def save_instance(instance)
+      def save_instance(instance, params={})
         raise NotImplementedError
       end
 
       # Deletes an instance (used by the destroy action).
       #
       # instance - The instance to delete
+      # params   - Unfiltered params hash from the controller
       #
       # Returns a boolean indicating the success/fail status of the deletion.
-      def delete_instance(instance)
+      def delete_instance(instance, params={})
         raise NotImplementedError
       end
 
@@ -176,6 +179,23 @@ module Trestle
       def default_form_attributes
         raise NotImplementedError
       end
+
+    protected
+      # Missing methods are called on the given context if available.
+      #
+      # We include private methods as methods such as current_user
+      # are usually declared as private or protected.
+      def method_missing(name, *args, &block)
+        if @context && @context.respond_to?(name, true)
+          @context.send(name, *args, &block)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(name, include_private=false)
+        (@context && @context.respond_to?(name, true)) || super
+      end
     end
   end
 end

data/lib/trestle/adapters/sequel_adapter.rb

@@ -26,11 +26,11 @@ module Trestle
         instance.set(attrs)
       end
 
-      def save_instance(instance)
+      def save_instance(instance, params={})
         instance.save
       end
 
-      def delete_instance(instance)
+      def delete_instance(instance, params={})
         instance.destroy
       end
 

data/lib/trestle/admin.rb

@@ -5,6 +5,25 @@ module Trestle
     autoload :Builder
     autoload :Controller
 
+    delegate :to_param, to: :class
+
+    def initialize(context=nil)
+      @context = context
+    end
+
+    # Delegate all missing methods to corresponding class method if available
+    def method_missing(name, *args, &block)
+      if self.class.respond_to?(name)
+        self.class.send(name, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(name, include_private=false)
+      self.class.respond_to?(name, include_private) || super
+    end
+
     class << self
       attr_accessor :menu
 
@@ -89,6 +108,10 @@ module Trestle
         Engine.routes.url_for(options.merge(controller: controller_namespace, action: action, only_path: true))
       end
 
+      def to_param(*)
+        raise NoMethodError, "#to_param called on non-resourceful admin. You may need to explicitly specify the admin."
+      end
+
       def actions
         [:index]
       end

data/lib/trestle/admin/controller.rb

@@ -12,7 +12,9 @@ module Trestle
         end
       end
 
-      delegate :admin, to: :class
+      def admin
+        @_admin ||= self.class.admin.new(self)
+      end
       helper_method :admin
 
     protected

data/lib/trestle/form/fields/form_group.rb

@@ -16,7 +16,16 @@ module Trestle
         end
 
         def help_message
-          content_tag(:p, options[:help], class: "help-block")
+          classes = ["help-block"]
+
+          if options[:help].is_a?(Hash)
+            message = options[:help][:text]
+            classes << "floating" if options[:help][:float]
+          else
+            message = options[:help]
+          end
+
+          content_tag(:p, message, class: classes)
         end
 
         def error_message

data/lib/trestle/navigation.rb

@@ -14,7 +14,10 @@ module Trestle
     end
 
     def by_group
-      Hash[stable_sort(items.group_by(&:group)).map { |group, items| [group, stable_sort(items)] }]
+      sorted_groups = stable_sort(items.group_by { |item| groups[item.group.id] })
+      sorted_items = sorted_groups.map { |group, items| [group, stable_sort(items)] }
+
+      Hash[sorted_items]
     end
 
     def each(&block)
@@ -38,5 +41,14 @@ module Trestle
     def stable_sort(items)
       items.sort_by.with_index { |item, i| [item, i] }
     end
+
+    def groups
+      @groups ||= items.inject({}) { |groups, item|
+        group = groups[item.group.id]
+
+        groups[item.group.id] = group ? group.merge(item.group) : item.group
+        groups
+      }
+    end
   end
 end

data/lib/trestle/navigation/group.rb

@@ -26,6 +26,10 @@ module Trestle
         end
       end
 
+      def merge(other)
+        self.class.new(name, options.merge(other.options))
+      end
+
       def priority
         case options[:priority]
         when :first
@@ -70,6 +74,10 @@ module Trestle
       def <=>(other)
         -1
       end
+
+      def merge(other)
+        self
+      end
     end
   end
 end

data/lib/trestle/resource.rb

@@ -2,10 +2,13 @@ module Trestle
   class Resource < Admin
     extend ActiveSupport::Autoload
 
+    autoload :AdapterMethods
     autoload :Builder
     autoload :Collection
     autoload :Controller
 
+    include AdapterMethods
+
     RESOURCE_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
     READONLY_ACTIONS = [:index, :show]
 
@@ -14,61 +17,43 @@ module Trestle
     class_attribute :pagination_options
     self.pagination_options = {}
 
-    class << self
-      def adapter
-        @adapter ||= Trestle.config.default_adapter.new(self)
-      end
-
-      def adapter=(klass)
-        @adapter = klass.new(self)
-      end
-
-      # Defines a method that can be overridden with a custom block,
-      # but is otherwise delegated to the adapter instance.
-      def self.adapter_method(name)
-        block_method = :"#{name}_block"
-        attr_accessor block_method
-
-        define_method(name) do |*args|
-          if override = public_send(block_method)
-            instance_exec(*args, &override)
-          else
-            adapter.public_send(name, *args)
-          end
-        end
-      end
-
-      # Collection-focused adapter methods
-      adapter_method :collection
-      adapter_method :merge_scopes
-      adapter_method :sort
-      adapter_method :paginate
-      adapter_method :finalize_collection
-      adapter_method :decorate_collection
-      adapter_method :count
-
-      # Instance-focused adapter methods
-      adapter_method :find_instance
-      adapter_method :build_instance
-      adapter_method :update_instance
-      adapter_method :save_instance
-      adapter_method :delete_instance
-      adapter_method :permitted_params
-
-      # Common adapter methods
-      adapter_method :to_param
-      adapter_method :human_attribute_name
-
-      # Automatic tables and forms adapter methods
-      adapter_method :default_table_attributes
-      adapter_method :default_form_attributes
-
-      def prepare_collection(params)
-        Collection.new(self).prepare(params)
-      end
+    # Collection-focused adapter methods
+    adapter_method :collection
+    adapter_method :merge_scopes
+    adapter_method :sort
+    adapter_method :paginate
+    adapter_method :finalize_collection
+    adapter_method :decorate_collection
+    adapter_method :count
+
+    # Instance-focused adapter methods
+    adapter_method :find_instance
+    adapter_method :build_instance
+    adapter_method :update_instance
+    adapter_method :save_instance
+    adapter_method :delete_instance
+    adapter_method :permitted_params
+
+    # Common adapter methods
+    adapter_method :to_param
+    adapter_method :human_attribute_name
+
+    # Automatic tables and forms adapter methods
+    adapter_method :default_table_attributes
+    adapter_method :default_form_attributes
+
+    # Prepares a collection for use in the resource controller's index action.
+    #
+    # Applies scopes, sorts, pagination, finalization and decorators according
+    # to the admin's adapter and any admin-specific adapter methods.
+    def prepare_collection(params, options={})
+      Collection.new(self, options).prepare(params)
+    end
 
-      def initialize_collection(params)
-        collection(params)
+    class << self
+      # Deprecated: use instance method instead
+      def prepare_collection(params, options={})
+        Collection.new(self, options).prepare(params)
       end
 
       def scopes
@@ -155,7 +140,7 @@ module Trestle
       end
 
       def validate!
-        if singular? && find_instance_block.nil?
+        if singular? && !adapter_methods.method_defined?(:find_instance)
           raise NotImplementedError, "Singular resources must define an instance block."
         end
       end

data/lib/trestle/resource/adapter_methods.rb

@@ -0,0 +1,62 @@
+module Trestle
+  class Resource
+    module AdapterMethods
+      extend ActiveSupport::Concern
+
+      # Adapter instance bound to the current resource's context.
+      def adapter
+        @adapter ||= adapter_class.new(self, @context)
+      end
+
+      module ClassMethods
+        # Declares a method that is handled by the admin's adapter class.
+        def adapter_method(name)
+          delegate name, to: :adapter
+
+          singleton_class.class_eval do
+            delegate name, to: :adapter
+          end
+        end
+
+        # Defines an admin-specific adapter method.
+        #
+        # The given block is wrapped rather than passed to #define_method directly, so that
+        # adapter methods can be defined with incomplete block parameters. Unfortunately
+        # this means we lose the ability to call super from within a custom adapter method.
+        def define_adapter_method(name, &block)
+          return unless block_given?
+
+          adapter_methods.module_eval do
+            define_method(name) do |*args|
+              instance_exec(*args, &block)
+            end
+          end
+        end
+
+        # Returns the adapter class for this admin.
+        #
+        # Defaults to a subclass of `Trestle.config.default_adapter` with
+        # the admin-specific adapter methods module included.
+        def adapter_class
+          @adapter_class ||= Class.new(Trestle.config.default_adapter).include(adapter_methods)
+        end
+
+        # Sets an explicit adapter class for this admin.
+        # A subclass is created with the admin-specific adapter methods module included.
+        def adapter_class=(klass)
+          @adapter_class = Class.new(klass).include(adapter_methods)
+        end
+
+        # Module container for admin-specific adapter methods.
+        def adapter_methods
+          @adapter_methods ||= Module.new
+        end
+
+        # Unbound instance of adapter.
+        def adapter
+          @adapter ||= adapter_class.new(self)
+        end
+      end
+    end
+  end
+end

data/lib/trestle/resource/builder.rb

@@ -5,13 +5,13 @@ module Trestle
       self.controller = Controller
 
       def adapter(&block)
-        klass = admin.adapter
-        klass.instance_eval(&block) if block_given?
+        klass = admin.adapter_class
+        klass.class_eval(&block) if block_given?
         klass
       end
 
       def adapter=(adapter)
-        admin.adapter = adapter
+        admin.adapter_class = adapter
       end
 
       def remove_action(*actions)
@@ -22,36 +22,36 @@ module Trestle
       end
 
       def collection(&block)
-        admin.collection_block = block
+        admin.define_adapter_method(:collection, &block)
       end
 
       def find_instance(&block)
-        admin.find_instance_block = block
+        admin.define_adapter_method(:find_instance, &block)
       end
       alias instance find_instance
 
       def build_instance(&block)
-        admin.build_instance_block = block
+        admin.define_adapter_method(:build_instance, &block)
       end
 
       def update_instance(&block)
-        admin.update_instance_block = block
+        admin.define_adapter_method(:update_instance, &block)
       end
 
       def save_instance(&block)
-        admin.save_instance_block = block
+        admin.define_adapter_method(:save_instance, &block)
       end
 
       def delete_instance(&block)
-        admin.delete_instance_block = block
+        admin.define_adapter_method(:delete_instance, &block)
       end
 
       def to_param(&block)
-        admin.to_param_block = block
+        admin.define_adapter_method(:to_param, &block)
       end
 
       def params(&block)
-        admin.permitted_params_block = block
+        admin.define_adapter_method(:permitted_params, &block)
       end
 
       def decorator(decorator)
@@ -59,15 +59,15 @@ module Trestle
       end
 
       def decorate_collection(&block)
-        admin.decorate_collection_block = block
+        admin.define_adapter_method(:decorate_collection, &block)
       end
 
       def merge_scopes(&block)
-        admin.merge_scopes_block = block
+        admin.define_adapter_method(:merge_scopes, &block)
       end
 
       def sort(&block)
-        admin.sort_block = block
+        admin.define_adapter_method(:sort, &block)
       end
 
       def sort_column(column, &block)
@@ -76,11 +76,11 @@ module Trestle
 
       def paginate(options={}, &block)
         admin.pagination_options = admin.pagination_options.merge(options)
-        admin.paginate_block = block
+        admin.define_adapter_method(:paginate, &block)
       end
 
       def count(&block)
-        admin.count_block = block
+        admin.define_adapter_method(:count, &block)
       end
 
       def scope(name, scope=nil, options={}, &block)

data/lib/trestle/resource/collection.rb

@@ -1,26 +1,46 @@
 module Trestle
   class Resource
     class Collection
-      delegate :initialize_collection, :paginate, :finalize_collection, :decorate_collection,
+      delegate :collection, :paginate, :finalize_collection, :decorate_collection,
                :scopes, :merge_scopes, :column_sorts, :sort, to: :@admin
 
-      def initialize(admin)
-        @admin = admin
+      def initialize(admin, options={})
+        @admin, @options = admin, options
       end
 
       def prepare(params)
-        collection = initialize_collection(params)
-        collection = apply_scopes(collection, params)
-        collection = apply_sorting(collection, params)
-        collection = paginate(collection, params)
-        collection = finalize_collection(collection)
-        collection = decorate_collection(collection)
+        collection = collection(params)
+        collection = apply_scopes(collection, params)  if scope?
+        collection = apply_sorting(collection, params) if sort?
+        collection = paginate(collection, params)      if paginate?
+        collection = finalize_collection(collection)   if finalize?
+        collection = decorate_collection(collection)   if decorate?
         collection
       end
 
+      def scope?
+        @options[:scope] != false
+      end
+
+      def sort?
+        @options[:sort] != false
+      end
+
+      def paginate?
+        @options[:paginate] != false
+      end
+
+      def finalize?
+        @options[:finalize] != false
+      end
+
+      def decorate?
+        @options[:decorate] != false
+      end
+
     private
       def apply_scopes(collection, params)
-        unscoped = initialize_collection(params)
+        unscoped = collection(params)
 
         active_scopes(params).reduce(collection) do |collection, scope|
           merge_scopes(collection, scope.apply(unscoped))

data/lib/trestle/resource/controller.rb

@@ -13,7 +13,7 @@ module Trestle
       end
 
       def new
-        self.instance = admin.build_instance(params.key?(admin.parameter_name) ? permitted_params : {}, params)
+        self.instance = admin.build_instance(params.key?(admin.parameter_name) ? admin.permitted_params(params) : {}, params)
 
         respond_to do |format|
           format.html
@@ -23,9 +23,9 @@ module Trestle
       end
 
       def create
-        self.instance = admin.build_instance(permitted_params, params)
+        self.instance = admin.build_instance(admin.permitted_params(params), params)
 
-        if admin.save_instance(instance)
+        if admin.save_instance(instance, params)
           respond_to do |format|
             format.html do
               flash[:message] = flash_message("create.success", title: "Success!", message: "The %{lowercase_model_name} was successfully created.")
@@ -66,9 +66,9 @@ module Trestle
       end
 
       def update
-        admin.update_instance(instance, permitted_params, params)
+        admin.update_instance(instance, admin.permitted_params(params), params)
 
-        if admin.save_instance(instance)
+        if admin.save_instance(instance, params)
           respond_to do |format|
             format.html do
               flash[:message] = flash_message("update.success", title: "Success!", message: "The %{lowercase_model_name} was successfully updated.")
@@ -90,7 +90,7 @@ module Trestle
       end
 
       def destroy
-        success = admin.delete_instance(instance)
+        success = admin.delete_instance(instance, params)
 
         respond_to do |format|
           format.html do
@@ -131,14 +131,6 @@ module Trestle
         }
       end
 
-      def permitted_params
-        if admin.permitted_params_block
-          instance_exec(params, &admin.permitted_params_block)
-        else
-          admin.permitted_params(params)
-        end
-      end
-
       def redirect_to_return_location(action, instance, default:)
         if admin.return_locations[action] && !dialog_request?
           location = instance_exec(instance, &admin.return_locations[action])

data/lib/trestle/table.rb

@@ -29,6 +29,10 @@ module Trestle
       options[:autolink] != false
     end
 
+    def header?
+      options[:header] != false
+    end
+
     def renderer(template)
       Renderer.new(self, template)
     end
@@ -38,7 +42,7 @@ module Trestle
     end
 
     class Renderer
-      delegate :options, to: :@table
+      delegate :options, :header?, to: :@table
 
       def initialize(table, template)
         @table, @template = table, template

data/lib/trestle/table/column.rb

@@ -49,6 +49,24 @@ module Trestle
           @template.content_tag(:td, content(instance), class: classes, data: data)
         end
 
+        def render?
+          if options.key?(:if)
+            if options[:if].respond_to?(:call)
+              @template.instance_exec(&options[:if])
+            else
+              options[:if]
+            end
+          elsif options.key?(:unless)
+            if options[:unless].respond_to?(:call)
+              !@template.instance_exec(&options[:unless])
+            else
+              !options[:unless]
+            end
+          else
+            true
+          end
+        end
+
         def header
           return if options.key?(:header) && options[:header].in?([nil, false])
 

data/lib/trestle/table/row.rb

@@ -20,7 +20,7 @@ module Trestle
         end
 
         def columns
-          table.columns.map { |column| column.renderer(@template) }
+          table.columns.map { |column| column.renderer(@template) }.select(&:render?)
         end
 
         def render(instance)

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -408,6 +408,7 @@ files:
 - lib/trestle/options.rb
 - lib/trestle/reloader.rb
 - lib/trestle/resource.rb
+- lib/trestle/resource/adapter_methods.rb
 - lib/trestle/resource/builder.rb
 - lib/trestle/resource/collection.rb
 - lib/trestle/resource/controller.rb