tabulatr2 0.9.32 → 0.9.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8925e114b7d2dc500bb27471320b8c81ad86773c
-  data.tar.gz: ca9a67f02bd9d69763d502fd9c5fd1ecaa321ae9
+  metadata.gz: 62d761945606d57007db863163a4674d08d41bb6
+  data.tar.gz: d4ab3323e85d5b46cb5595d1d712b3fadb1b672e
 SHA512:
-  metadata.gz: 96a7faf7a4ad05a24433a3e67355775fa0340919c6d7a325bc82fea6a155c5514aeb0f7cbe4523506cb28a332b0cf2b1daecbf6ec867f0cbfb08c0f7c0795d16
-  data.tar.gz: 53c823ee7b120e983cd9281245b9b4118953c9aa595c0a4807e960c4b0014a655613abb6a170779e8e51598ba1a12bbdd9c2a13d2050ae68d5aab26670d5fce5
+  metadata.gz: 13ec315f26b5ca9f02b904ae5ddbcb25acd4a96043a3354135f4b37e43fff755714701f3b1fbaff91973c0decfe8ecee4718ada6a85c1c5eddb48c4d76aaa806
+  data.tar.gz: 3a2f82c463b13993a5e6de5fbec54a83164dde8d9a698ab457d7745d952de7e7d9a11422b3a999b87cd54480b4f1e9cec6d7b825c4110c23a056b60c400cd8ef

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## UNRELEASED
+## 0.9.33
+
+  * allow batch actions to return files, data or redirects
+
+## 0.9.32
+
+   * define default order by giving `default_order: '<sql order>'` option to `tabulatr_for`
+
+## 0.9.21?
   * Rename `filter` option of `table_for` to `filters` to not conceal the
     `table_option` also named `filter`.
 

data/app/views/tabulatr/_tabulatr_batch_actions_menu.html.slim

@@ -26,9 +26,16 @@
       i.icon-cog.glyphicon.glyphicon-cog.fa.fa-cog>
       i.icon-caret-down.glyphicon.glyphicon-chevron-down.fa.fa-caret-down
     ul.dropdown-menu role="menu" aria-labelledby="dLabel" data-confirm-text=t('tabulatr.batch_confirm_text')
-      - table_options[:batch_actions].each do |key, label|
+      - table_options[:batch_actions].each do |key, data|
+        - if data.is_a?(String)
+          - label    = data
+          - download = false
+        - else
+          - label    = data[:text]
+          - download = !!data[:download]
         li
           = link_to label, '#', class: "batch-action-inputs", data: { \
               "do-batch-action-name" => iname, \
               "do-batch-action" => key, \
-              "table-id" => table_id }
+              "table-id" => table_id, \
+              "download" => download }

data/lib/tabulatr/data/data.rb

@@ -55,7 +55,8 @@ class Tabulatr::Data
     apply_sorting(sort_params params)
     join_required_tables(params)
 
-    execute_batch_actions(batch_params(params), check_params(params))
+    batch_result = execute_batch_actions(batch_params(params), check_params(params))
+    return batch_result if batch_result.is_a? Tabulatr::Responses::DirectResponse
 
     pagination = compute_pagination(params[:page], params[:pagesize])
     apply_pagination(pagination.slice(:offset, :pagesize))

data/lib/tabulatr/data/invoker.rb

@@ -25,11 +25,21 @@ class Tabulatr::Data::Invoker
   def initialize(batch_action, ids)
     @batch_action = batch_action.to_sym
     @ids = ids
+    @result = nil
   end
 
   def method_missing(name, *args, &block)
-    if @batch_action == name
-      yield(@ids)
+    @result ||= if @batch_action == name
+      s = yield(@ids)
+      if s.is_a?(Hash) && s[:data]
+        Tabulatr::Responses::RawResponse.new(s[:data])
+      elsif s.is_a?(Hash) && s[:file]
+        Tabulatr::Responses::FileResponse.new(s[:file], filename: s[:filename])
+      elsif s.is_a?(Hash) && s[:url]
+        Tabulatr::Responses::RedirectResponse.new(s[:url], ids: @ids)
+      else
+        s
+      end
     end
   end
 end

data/lib/tabulatr/rails/action_controller.rb

@@ -28,17 +28,33 @@ class ActionController::Base
 
   def tabulatr_for(relation, tabulatr_data_class: nil, serializer: nil, render_action: nil, default_order: nil, locals: {}, &block)
     klass = relation.respond_to?(:klass) ? relation.klass : relation
+    locals[:current_user] ||= current_user if respond_to?(:current_user)
+    if batch_params(klass, params).present?
+      response = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, &block)
+      case response
+      when Tabulatr::Responses::RawResponse
+        return send_data response.data, response.options
+      when Tabulatr::Responses::FileResponse
+        return send_file response.file, response.options
+      when Tabulatr::Responses::RedirectResponse
+        return redirect_to response.url, ids: response.ids
+      else records = response
+      end
+    end
+
     respond_to do |format|
       format.json {
-        locals[:current_user] ||= current_user if respond_to?(:current_user)
-        records = klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, default_order: default_order, &block)
+        records ||= klass.tabulatr(relation, tabulatr_data_class).data_for_table(params, locals: locals, controller: self, &block)
         render json: records.to_tabulatr_json(serializer)
-        records
       }
       format.html {
         render action: render_action || action_name
-        nil
       }
     end
   end
+
+  def batch_params(klass, params)
+    params["#{Tabulatr::Utility.formatted_name(klass.name)}_batch"]
+  end
+
 end

data/lib/tabulatr/responses/direct_response.rb

@@ -0,0 +1,2 @@
+class Tabulatr::Responses::DirectResponse
+end

data/lib/tabulatr/responses/file_response.rb

@@ -0,0 +1,8 @@
+class Tabulatr::Responses::FileResponse < Tabulatr::Responses::DirectResponse
+  attr_accessor :file, :options
+
+  def initialize(file, options={})
+    @file = file
+    @options = options
+  end
+end

data/lib/tabulatr/responses/raw_response.rb

@@ -0,0 +1,8 @@
+class Tabulatr::Responses::RawResponse < Tabulatr::Responses::DirectResponse
+  attr_accessor :data, :options
+
+  def initialize(data, options={})
+    @data = data
+    @options = options
+  end
+end

data/lib/tabulatr/responses/redirect_response.rb

@@ -0,0 +1,8 @@
+class Tabulatr::Responses::RedirectResponse < Tabulatr::Responses::DirectResponse
+  attr_accessor :url, :ids
+
+  def initialize(url, ids: nil)
+    @url = url
+    @ids = ids
+  end
+end

data/lib/tabulatr/responses/responses.rb

@@ -0,0 +1,7 @@
+module Tabulatr::Responses
+end
+
+require_relative './direct_response'
+require_relative './file_response'
+require_relative './raw_response'
+require_relative './redirect_response'

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.32"
+  VERSION = "0.9.33"
 end

data/lib/tabulatr.rb

@@ -55,6 +55,7 @@ require 'tabulatr/data/data'
 require 'tabulatr/json_builder'
 require 'tabulatr/params_builder'
 require 'tabulatr/generators/railtie' if defined?(Rails)
+require 'tabulatr/responses/responses'
 
 #--
 # Mainly Monkey Patching...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.32
+  version: 0.9.33
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,11 @@ files:
 - lib/tabulatr/renderer/columns_from_block.rb
 - lib/tabulatr/renderer/filter.rb
 - lib/tabulatr/renderer/renderer.rb
+- lib/tabulatr/responses/direct_response.rb
+- lib/tabulatr/responses/file_response.rb
+- lib/tabulatr/responses/raw_response.rb
+- lib/tabulatr/responses/redirect_response.rb
+- lib/tabulatr/responses/responses.rb
 - lib/tabulatr/utility/request_data_not_included_error.rb
 - lib/tabulatr/utility/unexpected_search_result_error.rb
 - lib/tabulatr/utility/utility.rb