trestle 0.8.6 → 0.8.7

data/lib/trestle/resource/collection.rb

@@ -0,0 +1,48 @@
+module Trestle
+  class Resource
+    class Collection
+      delegate :initialize_collection, :paginate, :finalize_collection, :decorate_collection,
+               :scopes, :merge_scopes, :column_sorts, :sort, to: :@admin
+
+      def initialize(admin)
+        @admin = admin
+      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
+      end
+
+    private
+      def apply_scopes(collection, params)
+        unscoped = initialize_collection(params)
+
+        active_scopes(params).reduce(collection) do |collection, scope|
+          merge_scopes(collection, scope.apply(unscoped))
+        end
+      end
+
+      def active_scopes(params)
+        scopes.values.select { |s| s.active?(params) }
+      end
+
+      def apply_sorting(collection, params)
+        return collection unless params[:sort]
+
+        field = params[:sort].to_sym
+        order = params[:order].to_s.downcase == "desc" ? :desc : :asc
+
+        if column_sorts.has_key?(field)
+          @admin.instance_exec(collection, order, &column_sorts[field])
+        else
+          sort(collection, field, order)
+        end
+      end
+    end
+  end
+end

data/lib/trestle/resource/controller.rb

@@ -1,11 +1,7 @@
 module Trestle
   class Resource
     class Controller < Admin::Controller
-      after_action :set_trestle_location_header
-
       def index
-        self.collection = admin.prepare_collection(params)
-
         respond_to do |format|
           format.html
           format.json { render json: collection }
@@ -24,13 +20,13 @@ module Trestle
       end
 
       def create
-        self.instance = admin.build_instance(admin.permitted_params(params), params)
+        self.instance = admin.build_instance(permitted_params, params)
 
         if admin.save_instance(instance)
           respond_to do |format|
             format.html do
               flash[:message] = flash_message("success.create", default: "The %{lowercase_model_name} was successfully created.")
-              redirect_to(admin.return_location(:create, instance), turbolinks: false)
+              redirect_to_return_location(:create, instance, default: admin.path(:show, id: admin.to_param(instance)))
             end
             format.json { render json: instance, status: :created, location: { action: :show, id: admin.to_param(instance) } }
             format.js
@@ -48,8 +44,6 @@ module Trestle
       end
 
       def show
-        self.instance = admin.find_instance(params)
-
         respond_to do |format|
           format.html
           format.json { render json: instance }
@@ -58,18 +52,16 @@ module Trestle
       end
 
       def edit
-        self.instance = admin.find_instance(params)
       end
 
       def update
-        self.instance = admin.find_instance(params)
-        admin.update_instance(instance, admin.permitted_params(params), params)
+        admin.update_instance(instance, permitted_params, params)
 
         if admin.save_instance(instance)
           respond_to do |format|
             format.html do
               flash[:message] = flash_message("success.update", default: "The %{lowercase_model_name} was successfully updated.")
-              redirect_to(admin.return_location(:update, instance), turbolinks: false)
+              redirect_to_return_location(:update, instance, default: admin.path(:show, id: admin.to_param(instance)))
             end
             format.json { render json: instance, status: :ok }
             format.js
@@ -87,21 +79,20 @@ module Trestle
       end
 
       def destroy
-        self.instance = admin.find_instance(params)
         success = admin.delete_instance(instance)
 
         respond_to do |format|
           format.html do
             if success
               flash[:message] = flash_message("success.destroy", default: "The %{lowercase_model_name} was successfully deleted.")
-              redirect_to admin.return_location(:destroy)
+              redirect_to_return_location(:destroy, instance, default: admin.path(:index))
             else
               flash[:error] = flash_message("failure.destroy", default: "Could not delete %{lowercase_model_name}.")
 
               if self.instance = admin.find_instance(params)
-                redirect_to action: :show, id: admin.to_param(instance)
+                redirect_to_return_location(:update, instance, default: admin.path(:show, id: admin.to_param(instance)))
               else
-                redirect_to admin.return_location(:destroy)
+                redirect_to_return_location(:destroy, instance, default: admin.path(:index))
               end
             end
           end
@@ -111,19 +102,41 @@ module Trestle
       end
 
     protected
-      attr_accessor :collection
-      helper_method :collection
+      def instance
+        @instance ||= admin.find_instance(params)
+      end
 
-      attr_accessor :instance
-      helper_method :instance
+      def collection
+        @collection ||= admin.prepare_collection(params)
+      end
+
+      attr_writer :instance, :collection
+      helper_method :instance, :collection
 
       def flash_message(type, options={})
         t("trestle.flash.#{type}", options.merge(model_name: admin.model_name, lowercase_model_name: admin.model_name.downcase))
       end
 
-      def set_trestle_location_header
-        unless request.headers["X-Trestle-Dialog"]
-          headers["X-Trestle-Location"] = request.path
+      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])
+
+          case location
+          when :back
+            redirect_back fallback_location: default, turbolinks: false
+          else
+            redirect_to location, turbolinks: false
+          end
+        else
+          redirect_to default, turbolinks: false
         end
       end
     end

data/lib/trestle/scope.rb

@@ -20,18 +20,28 @@ module Trestle
 
     def apply(collection)
       if @block
-        @admin.instance_exec(&@block)
+        if @block.arity == 1
+          @admin.instance_exec(collection, &@block)
+        else
+          @admin.instance_exec(&@block)
+        end
       else
         collection.public_send(name)
       end
     end
 
     def count(collection)
-      @admin.count(@admin.merge_scopes(collection, apply(@admin.unscope(collection))))
+      @admin.count(@admin.merge_scopes(collection, apply(collection)))
     end
 
     def active?(params)
-      @admin.scopes_for(params).include?(self)
+      active_scopes = Array(params[:scope])
+
+      if active_scopes.any?
+        active_scopes.include?(to_param.to_s)
+      else
+        default?
+      end
     end
   end
 end

data/lib/trestle/table.rb

@@ -9,16 +9,18 @@ module Trestle
     autoload :SelectColumn
     autoload :Row
 
-    attr_reader :columns, :options, :admin
+    attr_reader :columns, :options
     attr_writer :row
 
     def initialize(options={})
       @options = options
-      @admin = Trestle.lookup(options[:admin]) if options.key?(:admin)
-
       @columns = []
     end
 
+    def admin
+      Trestle.lookup(options[:admin]) if options.key?(:admin)
+    end
+
     def sortable?
       options[:sortable] == true
     end
@@ -47,7 +49,11 @@ module Trestle
       end
 
       def columns
-        @columns ||= @table.columns.map { |column| column.renderer(@template) }
+        @columns ||= row.columns
+      end
+
+      def id
+        options[:id]
       end
 
       def classes

data/lib/trestle/table/column.rb

@@ -45,6 +45,10 @@ module Trestle
           @column, @template = column, template
         end
 
+        def render(instance)
+          @template.content_tag(:td, content(instance), class: classes, data: data)
+        end
+
         def header
           return if options.has_key?(:header) && options[:header].in?([nil, false])
 
@@ -87,10 +91,17 @@ module Trestle
               # 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 }
+                value = nil
+                buffer = @template.capture { value = @template.instance_exec(instance, &@column.block) }
+                value.is_a?(String) ? buffer : value
               }.call
             else
-              @template.capture { @template.instance_exec(instance, &@column.block).to_s }
+              # Capture both the immediate value and captured output of the block.
+              # If the result of the block is a string, then use the contents of the buffer.
+              # Otherwise return the result of the block as a raw value (for auto-formatting).
+              value = nil
+              buffer = @template.capture { value = @template.instance_exec(instance, &@column.block) }
+              value.is_a?(String) ? buffer : value
             end
           else
             instance.send(@column.field)

data/lib/trestle/table/row.rb

@@ -19,6 +19,16 @@ module Trestle
           @row, @template = row, template
         end
 
+        def columns
+          table.columns.map { |column| column.renderer(@template) }
+        end
+
+        def render(instance)
+          @template.content_tag(:tr, options(instance)) do
+            @template.safe_join(columns.map { |column| column.render(instance) }, "\n")
+          end
+        end
+
         def options(instance)
           options = Trestle::Options.new
 

data/lib/trestle/version.rb

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

data/trestle.gemspec

@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake",        "~> 10.0"
   spec.add_development_dependency "rspec-rails", "~> 3.5"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.7.1"
+  spec.add_development_dependency "database_cleaner",    "~> 1.6.2"
 
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "turbolinks"

data/vendor/assets/stylesheets/trestle/magnific-popup.scss

@@ -1 +1,13 @@
-@import "trestle/magnific-popup/dist/magnific-popup"
+@import "trestle/magnific-popup/dist/magnific-popup";
+
+$mfp-z-index-base: 1140;
+
+.mfp-bg { z-index: $mfp-z-index-base + 2; }
+.mfp-wrap { z-index: $mfp-z-index-base + 3; }
+.mfp-content { z-index: $mfp-z-index-base + 5; }
+.mfp-preloader { z-index: $mfp-z-index-base + 4; }
+
+button.mfp-close,
+button.mfp-arrow {
+  z-index: $mfp-z-index-base + 6;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -233,19 +247,27 @@ files:
 - app/assets/stylesheets/trestle/core/_layout.scss
 - app/assets/stylesheets/trestle/core/_mixins.scss
 - app/assets/stylesheets/trestle/core/_typography.scss
+- app/controllers/concerns/trestle/controller/breadcrumbs.rb
+- app/controllers/concerns/trestle/controller/callbacks.rb
+- app/controllers/concerns/trestle/controller/dialog.rb
+- app/controllers/concerns/trestle/controller/helpers.rb
+- app/controllers/concerns/trestle/controller/layout.rb
+- app/controllers/concerns/trestle/controller/location.rb
 - app/controllers/trestle/application_controller.rb
 - app/controllers/trestle/dashboard_controller.rb
 - app/helpers/trestle/avatar_helper.rb
 - app/helpers/trestle/container_helper.rb
-- app/helpers/trestle/dialog_helper.rb
+- app/helpers/trestle/debug_helper.rb
 - app/helpers/trestle/display_helper.rb
 - app/helpers/trestle/form_helper.rb
 - app/helpers/trestle/format_helper.rb
 - app/helpers/trestle/grid_helper.rb
+- app/helpers/trestle/headings_helper.rb
 - app/helpers/trestle/hook_helper.rb
 - app/helpers/trestle/icon_helper.rb
 - app/helpers/trestle/navigation_helper.rb
 - app/helpers/trestle/pagination_helper.rb
+- app/helpers/trestle/panel_helper.rb
 - app/helpers/trestle/params_helper.rb
 - app/helpers/trestle/sort_helper.rb
 - app/helpers/trestle/status_helper.rb
@@ -372,6 +394,7 @@ files:
 - lib/trestle/reloader.rb
 - lib/trestle/resource.rb
 - lib/trestle/resource/builder.rb
+- lib/trestle/resource/collection.rb
 - lib/trestle/resource/controller.rb
 - lib/trestle/scope.rb
 - lib/trestle/tab.rb
@@ -595,7 +618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A modern, responsive admin framework for Ruby on Rails

data/app/helpers/trestle/dialog_helper.rb

@@ -1,7 +0,0 @@
-module Trestle
-  module DialogHelper
-    def dialog_request?
-      request.headers["X-Trestle-Dialog"]
-    end
-  end
-end