rails-add_ons 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0903bda7a75306ac454603360270dfb67c54f668'
-  data.tar.gz: f04bfc196cd2f0409586e1fa52383ef9c15f9175
+  metadata.gz: 8bcd8208bf74f48898936baa02d21720ba62ccf8
+  data.tar.gz: c7225749ed3871555682fa94e556394b392d6d9b
 SHA512:
-  metadata.gz: e27dea31a057e110aab9e391739160ddd5cc584f7280d72286dca7eeb5125c912c8e08a6d679338ebd935195eb6791ed374f253bc5bfca5f77b183da484af879
-  data.tar.gz: efecd44124b8ad9f8e874f6c9fa31290a9e22a89f5a05715cafcfaa5f0eae248af654d86a9d7dbe5fbcb1445a4ab06cb1b53ddbf66074f0d313ca33041a2b1cf
+  metadata.gz: 0a287305c63b7cb4bb325c91ec7daa497f29adf5a3a6ae67ab79ed7381614ae20c593616a8c1830bf0055628fe9d8f65e84fa322aead5c412523fe5339bd2769
+  data.tar.gz: 966da1755681d98edcb0ca1445a6579fa210dd3dc9f82c5e5a304184be8b864f2b31163d81340c31e84a307461dca9388ed06182801f6d7eee0a28ad184bf6a2

data/README.md

@@ -24,6 +24,10 @@ to your applications javascript include file, as it was removed.
 
 ServiceController::Base now uses the verbs new and create instead of invoke and call. Furthermore @resource is dropped in favor of @service. Please modify your controllers and views and routing accordingly.
 
+### Update path to 2.2.0
+
+Jquery and JQuery UJS are not automatically required anymore. You need to require it yourself.
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/app/assets/javascripts/rails/add_ons/application/acts-as-list.js.coffee

@@ -0,0 +1,21 @@
+$ ->
+  $('[data-acts-as-list-item]').each ->
+    $(@).draggable({
+      scope: $(@).attr('data-acts-as-list-item-scope'),
+      revert: true
+    })
+
+$ ->
+  $('[data-acts-as-list-item]').each ->
+    redirect_target = $(@).attr('data-acts-as-list-item-on-drop-target')
+    authenticity_token = $( 'meta[name="csrf-token"]' ).attr( 'content' );
+
+    $(@).droppable({
+      accept: '.acts-as-list-item',
+      scope: $(@).attr('data-acts-as-list-item-scope'),
+      activeClass: 'btn-success',
+      drop: (event, ui) ->
+        dropped_element = $(ui.draggable)
+        dropped_element_to_param = dropped_element.attr('data-acts-as-list-item-uid')
+        $.redirect(redirect_target,{ authenticity_token: authenticity_token, dropped_id: dropped_element_to_param });
+    })

data/app/assets/javascripts/rails/add_ons/application.js

@@ -10,6 +10,4 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree ./application

data/app/components/component/collection_table.rb

@@ -1,6 +1,19 @@
 module Component
+  # Example:
+  #
+  #     = collection_table(collection: @posts, resource_class: Post) do |t|
+  #       = t.column :id, sort: true
+  #       = t.column :title
+  #       = t.column :body
+  #       = t.boolean :visible
+  #       = t.timestamps format: :short
+  #
   class CollectionTable < Base
     include AwesomeNestedSetConcern
+    include ActsAsPublishedConcern
+    include ActsAsListConcern
+    include BatchActionsConcern
+    include BooleanConcern
 
     SIZE_MAP = {
       default: nil,
@@ -9,6 +22,8 @@ module Component
 
     def initialize(*args)
       super
+      @options.reverse_merge!(header: true)
+
       @columns        = {}
       @collection     = @options.delete(:collection)
       @resource_class = @options.delete(:resource_class) || @collection.first.class
@@ -20,8 +35,12 @@ module Component
       @columns[name] = options
     end
 
+    def id(options = {}, &block)
+      column(:id, options, &block)
+    end
+
     def timestamp(name, options = {}, &block)
-      options.reverse_merge!(render_as: :timestamp, format: nil)
+      options.reverse_merge!(render_as: :timestamp, format: Rails::AddOns::Configuration.table_default_timestamp_format)
       column(name, options, &block)
     end
 
@@ -46,10 +65,15 @@ module Component
         columns:           @columns,
         collection:        @collection,
         resource_class:    @resource_class,
-        table_css_classes: table_css_classes
+        table_css_classes: table_css_classes,
+        show_header:       show_header
       }
     end
 
+    def show_header
+      !!@options[:header]
+    end
+
     def striped?
       !!@options[:striped]
     end

data/app/components/component/resource_table.rb

@@ -1,5 +1,7 @@
 module Component
   class ResourceTable < Base
+    include BooleanConcern
+
     attr_reader :resource
 
     def initialize(*args)
@@ -15,8 +17,12 @@ module Component
       @rows[name] = options
     end
 
+    def id(options = {}, &block)
+      row(:id, options, &block)
+    end
+
     def timestamp(name, options = {}, &block)
-      options.reverse_merge!(render_as: :timestamp, format: nil)
+      options.reverse_merge!(render_as: :timestamp, format: Rails::AddOns::Configuration.table_default_timestamp_format)
       row(name, options, &block)
     end
 

data/app/concerns/component/collection_table/acts_as_list_concern.rb

@@ -0,0 +1,16 @@
+module Component
+  module CollectionTable::ActsAsListConcern
+    extend ActiveSupport::Concern
+
+    def acts_as_list_actions(options = {}, &block)
+      options.reverse_merge!(render_as: :acts_as_list, title: t('.column_titles.acts_as_list'), scope: nil)
+
+      scope = options.delete(:scope)
+      scope = "#{scope}_id".intern if scope.is_a?(Symbol) && scope.to_s !~ /_id$/
+
+      options.merge(scope: scope)
+
+      column(:acts_as_list_actions, options, &block)
+    end
+  end
+end

data/app/concerns/component/collection_table/acts_as_published_concern.rb

@@ -0,0 +1,10 @@
+module Component
+  module CollectionTable::ActsAsPublishedConcern
+    extend ActiveSupport::Concern
+
+    def acts_as_published_actions(options = {}, &block)
+      options.reverse_merge!(render_as: :acts_as_published, title: t('.column_titles.acts_as_published'))
+      column(:acts_as_published_actions, options, &block)
+    end
+  end
+end

data/app/concerns/component/collection_table/batch_actions_concern.rb

@@ -0,0 +1,12 @@
+module Component
+  module CollectionTable::BatchActionsConcern
+    extend ActiveSupport::Concern
+
+    def batch_actions(options = {}, &block)
+      @wrap_in_form = true
+      title = @view.render partial: 'component/table/header_cells/batch_actions', locals: { options: options }
+      options.reverse_merge!(render_as: :batch_actions, title: title)
+      column(:batch_actions, options, &block)
+    end
+  end
+end

data/app/concerns/component/collection_table/boolean_concern.rb

@@ -0,0 +1,10 @@
+module Component
+  module CollectionTable::BooleanConcern
+    extend ActiveSupport::Concern
+
+    def boolean(name, options = {}, &block)
+      options.reverse_merge!(render_as: :boolean)
+      column(name, options, &block)
+    end
+  end
+end

data/app/concerns/component/resource_table/boolean_concern.rb

@@ -0,0 +1,10 @@
+module Component
+  module ResourceTable::BooleanConcern
+    extend ActiveSupport::Concern
+
+    def boolean(name, options = {}, &block)
+      options.reverse_merge!(render_as: :boolean)
+      row(name, options, &block)
+    end
+  end
+end

data/app/concerns/resources_controller/acts_as_list_concern.rb

@@ -0,0 +1,32 @@
+module ResourcesController
+  module ActsAsListConcern
+    extend ActiveSupport::Concern
+
+    def reposition
+      @resource = load_resource
+      @dropped_resource = load_resource_scope.find(params[:dropped_id])
+      @dropped_resource.set_list_position(@resource.position)
+      position = @dropped_resource.position < @resource.position ? :before : :after
+
+      label_methods = [:human, :name, :title, :email, :to_s]
+
+      target_resource_label = nil
+      label_methods.each do |method_name|
+        if @resource.respond_to?(method_name)
+          target_resource_label = @resource.send(method_name)
+          break
+        end
+      end
+
+      inserted_resource_label = nil
+      label_methods.each do |method_name|
+        if @dropped_resource.respond_to?(method_name)
+          inserted_resource_label = @dropped_resource.send(method_name)
+          break
+        end
+      end
+
+      redirect_to collection_path, notice: I18n.t("acts_as_list.flash.actions.reposition.inserted_#{position}", target_resource: target_resource_label, inserted_resource: inserted_resource_label)
+    end
+  end
+end

data/app/concerns/resources_controller/acts_as_published_concern.rb

@@ -0,0 +1,73 @@
+module ResourcesController
+  module ActsAsPublishedConcern
+    extend ActiveSupport::Concern
+
+    def publish_many
+      @collection = load_collection_scope.find(params[:ids])
+      @collection.map(&:publish!)
+
+      resource_labels = []
+      @collection.each do |resource|
+        [:human, :name, :title, :email, :to_s].each do |method_name|
+          if resource.respond_to?(method_name)
+            resource_labels << resource.send(method_name)
+            break
+          end
+        end
+      end
+
+      notice = I18n.t("acts_as_published.notices.published_many", names: resource_labels.to_sentence)
+      if Rails.version < '5.0.0'
+        redirect_to :back, notice: notice
+      else
+        flash[:notice] = notice
+        redirect_back(fallback_location: main_app.root_path)
+      end
+    end
+
+    def unpublish_many
+      @collection = load_collection_scope.find(params[:ids])
+      @collection.map(&:unpublish!)
+
+      resource_labels = []
+      @collection.each do |resource|
+        [:human, :name, :title, :email, :to_s].each do |method_name|
+          if resource.respond_to?(method_name)
+            resource_labels << resource.send(method_name)
+            break
+          end
+        end
+      end
+
+      notice = I18n.t("acts_as_published.notices.unpublished_many", names: resource_labels.to_sentence)
+      if Rails.version < '5.0.0'
+        redirect_to :back, notice: notice
+      else
+        flash[:notice] = notice
+        redirect_back(fallback_location: main_app.root_path)
+      end
+    end
+
+    def toggle_published
+      @resource = load_resource
+      @resource.toggle_published!
+
+      action_taken = @resource.published? ? 'published' : 'unpublished'
+      
+      resource_label = nil
+      [:human, :name, :title, :email, :to_s].each do |method_name|
+        if @resource.respond_to?(method_name)
+          resource_label = @resource.send(method_name)
+          break
+        end
+      end
+
+      if Rails.version < '5.0.0'
+        redirect_to :back, notice: I18n.t("acts_as_published.notices.#{action_taken}", name: resource_label)
+      else
+        flash[:notice] = I18n.t("acts_as_published.notices.#{action_taken}", name: resource_label)
+        redirect_back(fallback_location: main_app.root_path)
+      end
+    end
+  end
+end

data/app/concerns/resources_controller/awesome_nested_set_concern.rb

@@ -0,0 +1,31 @@
+module ResourcesController
+  module AwesomeNestedSetConcern
+    extend ActiveSupport::Concern
+
+    def reposition
+      @resource = load_resource
+      @dropped_resource = resource_class.find(params[:dropped_id])
+      @dropped_resource.move_to_right_of(@resource)
+
+      label_methods = [:human, :name, :email, :to_s]
+
+      target_resource_label = nil
+      label_methods.each do |method_name|
+        if @resource.respond_to?(method_name)
+          target_resource_label = @resource.send(method_name)
+          break
+        end
+      end
+
+      inserted_resource_label = nil
+      label_methods.each do |method_name|
+        if @dropped_resource.respond_to?(method_name)
+          inserted_resource_label = @dropped_resource.send(method_name)
+          break
+        end
+      end
+
+      redirect_to collection_path, notice: I18n.t("awesome_nested_set.flash.actions.reposition.notice", target_resource: target_resource_label, inserted_resource: inserted_resource_label)
+    end
+  end
+end

data/app/concerns/resources_controller/batch_actions_concern.rb

@@ -0,0 +1,16 @@
+module ResourcesController
+  module BatchActionsConcern
+    def destroy_many
+      @collection = load_collection_scope.where(id: params[:ids])
+      @collection.destroy_all
+
+      respond_with @collection, location: after_destroy_many_location, noticse: t('.success')
+    end
+
+    private
+
+    def after_destroy_many_location
+      collection_path
+    end
+  end
+end

data/app/concerns/resources_controller/friendly_id_concern.rb

@@ -0,0 +1,15 @@
+module ResourcesController
+  module FriendlyIdConcern
+    extend ActiveSupport::Concern
+
+    private
+
+    def load_collection_scope
+      super.friendly
+    end
+
+    def load_resource_scope
+      super.friendly
+    end
+  end
+end

data/app/concerns/resources_controller/kaminari.rb

@@ -1,15 +1,17 @@
-module ResourcesController::Kaminari
-  def self.included(base)
-    base.helper_method :paginate?
-  end
+module ResourcesController
+  module Kaminari
+    def self.included(base)
+      base.helper_method :paginate?
+    end
 
-  def paginate?
-    true
-  end
+    def paginate?
+      true
+    end
 
-  private
+    private
 
-  def load_collection
-    @collection = load_collection_scope.page(params[:page])
+    def load_collection
+      @collection = load_collection_scope.page(params[:page])
+    end
   end
-end
+end

data/app/concerns/resources_controller/location_history.rb

@@ -1,36 +1,41 @@
-module ResourcesController::LocationHistory
-  extend ActiveSupport::Concern
+module ResourcesController
+  module LocationHistory
+    extend ActiveSupport::Concern
 
-  included do
-    if respond_to?(:before_action)
-      before_action :store_location
-    else
-      before_filter :store_location
+    included do
+      if respond_to?(:before_action)
+        before_action :store_location
+      else
+        before_filter :store_location
+      end
+
+      helper_method :last_location
     end
-  end
 
-  private
+    private
 
-  def store_location
-    truncate_location_history(9)
-    location_history[Time.zone.now] = request.referer
-  end
+    def store_location
+      return if request.referer.nil?
+      truncate_location_history(9)
+      location_history[Time.zone.now] = request.referer
+    end
 
-  def location_history
-    session[:location_history] ||= {}
-  end
+    def location_history
+      session[:location_history] ||= {}
+    end
 
-  def last_location
-    location_history.sort.last.try(:last)
-  end
+    def last_location
+      location_history.sort.last.try(:last)
+    end
 
-  def truncate_location_history(count = 0)
-    return if location_history.size <= count
-    truncated = session[:location_history].sort.last(count)
-    session[:location_history] = if truncated.respond_to?(:to_h)
-      truncated.to_h
-    else
-      truncated.each_with_object({}) { |a, hash| hash[a.first] = a.last }
+    def truncate_location_history(count = 0)
+      return if location_history.size <= count
+      truncated = session[:location_history].sort.last(count)
+      session[:location_history] = if truncated.respond_to?(:to_h)
+        truncated.to_h
+      else
+        truncated.each_with_object({}) { |a, hash| hash[a.first] = a.last }
+      end
     end
   end
 end

data/app/concerns/resources_controller/pagination.rb

@@ -1,15 +1,17 @@
-module ResourcesController::Pagination
-  def self.included(base)
-    base.helper_method :paginate?
-  end
+module ResourcesController
+  module Pagination
+    def self.included(base)
+      base.helper_method :paginate?
+    end
 
-  def paginate?
-    true
-  end
+    def paginate?
+      true
+    end
 
-  private
+    private
 
-  def load_collection
-    @collection = load_collection_scope.page(params[:page])
+    def load_collection
+      @collection = load_collection_scope.page(params[:page])
+    end
   end
-end
+end

data/app/concerns/resources_controller/resource_inflections.rb

@@ -1,16 +1,18 @@
-module ResourcesController::ResourceInflections
-  extend ActiveSupport::Concern
+module ResourcesController
+  module ResourceInflections
+    extend ActiveSupport::Concern
 
-  included do
-    helper_method :inflections
-  end
+    included do
+      helper_method :inflections
+    end
 
-  private
+    private
 
-  def inflections
-    {
-      resource_name: resource_class.model_name.human(count: 1),
-      collection_name: resource_class.model_name.human(count: 2)
-    }
+    def inflections
+      {
+        resource_name: resource_class.model_name.human(count: 1),
+        collection_name: resource_class.model_name.human(count: 2)
+      }
+    end
   end
 end

data/app/concerns/resources_controller/resources.rb

@@ -1,11 +1,13 @@
-module ResourcesController::Resources
-  extend ActiveSupport::Concern
+module ResourcesController
+  module Resources
+    extend ActiveSupport::Concern
 
-  included do
-    helper_method :resource_class
-  end
+    included do
+      helper_method :resource_class
+    end
 
-  def resource_class
-    self.class.resource_class
+    def resource_class
+      self.class.resource_class
+    end
   end
 end