aaf-lipstick 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9c68e4deac36e4db55f6ef974766b13b677e68
-  data.tar.gz: 770684535258aa99da8e34fba2dd8e67970aae78
+  metadata.gz: 75906600a085f50a0b3d80772c1d5940ae298870
+  data.tar.gz: d6ade2c9c85ad0216b717a27b7e347ac596b4846
 SHA512:
-  metadata.gz: dbbea5205224e289e48ab3bf6c734e9b180220acc84ecf8c88d60c220443c7a21315740b243386b91d5018fcfc61919b3147c56ad9637b5edfc883b64c5c6712
-  data.tar.gz: a9f845b89206bc2d54b25d60c6e5d70adfc554c37d2612fda9bb0d7be3d4100bc33f332ffc1821860f6104bf93e962ee3d8368fe5b7ad9e5e3006782e8467afc
+  metadata.gz: 4defc3c82b44fcac690d1b148cb61a80d02ba38f2b91414b13d112de03f0c07d621cf74c5861df692bbd7afd6decfde9a71e0390dbfe5025f011b85201cc223f
+  data.tar.gz: 77cb1e383a77d6a872f1dedb8145ecee7206a83524bb406b3d337fe843f4748adc27523217411a8870c4c0717d7a7e7a2af568883389f3aa8fca97c66524170f

data/lib/lipstick.rb

@@ -12,6 +12,7 @@ require 'lipstick/helpers'
 require 'lipstick/email_message'
 require 'lipstick/images'
 require 'lipstick/filterable'
+require 'lipstick/sortable'
 require 'lipstick/auto_validation'
 require 'lipstick/engine'
 require 'lipstick/version'

data/lib/lipstick/helpers.rb

@@ -11,3 +11,4 @@ require 'lipstick/helpers/form_validation_builder'
 require 'lipstick/helpers/bootstrap_form_builder'
 require 'lipstick/helpers/form_helper'
 require 'lipstick/helpers/pagination_link_renderer'
+require 'lipstick/helpers/sortable_helper'

data/lib/lipstick/helpers/form_helper.rb

@@ -35,21 +35,24 @@ module Lipstick
         form_tag(url_for_options, options) { yield }
       end
 
-      def search_form_tag(filter, url: nil)
+      def search_form_tag(filter, url: nil,
+                          placeholder: 'Search within these entries')
         form_tag(url, method: :get) do
-          field_block { search_form_input_tag(filter) }
+          field_block { search_form_input_tag(filter, placeholder) }
         end
       end
 
-      def search_form_input_tag(filter)
+      def search_form_input_tag(filter, placeholder)
         content_tag('div', class: 'row') do
-          content_tag('div', grouped_search_field(filter), class: 'col-lg-12')
+          content_tag('div', grouped_search_field(
+                               filter, placeholder
+                             ), class: 'col-lg-12')
         end
       end
 
-      def search_filter_text_field(filter)
+      def search_filter_text_field(filter, placeholder)
         orig_text_field_tag(:filter, filter,
-                            placeholder: 'Search within these entries',
+                            placeholder: placeholder,
                             autocomplete: 'off',
                             class: 'form-control')
       end
@@ -61,9 +64,9 @@ module Lipstick
         end
       end
 
-      def grouped_search_field(filter)
+      def grouped_search_field(filter, placeholder)
         content_tag('div', class: 'input-group') do
-          concat(search_filter_text_field(filter))
+          concat(search_filter_text_field(filter, placeholder))
           concat(content_tag('span', search_button, class: 'input-group-btn'))
         end
       end

data/lib/lipstick/helpers/pagination_link_renderer.rb

@@ -121,8 +121,9 @@ module Lipstick
         li_opts = {}
         li_opts[:class] = 'active' if page == current
 
-        url_opts = template.params.permit(:page, :per_page, :filter, :direction)
-                           .merge(page: page)
+        url_opts = template.params.permit(
+          :page, :per_page, :filter, :direction, :sort_by
+        ).merge(page: page)
         opts = opts.merge(href: template.url_for(url_opts))
 
         template.content_tag('li', li_opts) do

data/lib/lipstick/helpers/sortable_helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Lipstick
+  module Helpers
+    module SortableHelper
+      include ActionView::Helpers
+
+      def sortable_link(name, param_name = nil)
+        param_name ||= name.parameterize.underscore.downcase
+        direction = Lipstick::Sortable.direction(params[:direction])
+        opposite_direction =
+          Lipstick::Sortable.opposite_direction(params[:direction])
+
+        if params[:sort_by] == param_name
+          sortable_active_link(name, param_name, direction, opposite_direction)
+        else
+          link_to name, sort_by: param_name, direction: direction
+        end
+      end
+
+      private
+
+      def sortable_active_link(name, param_name, direction, opposite_direction)
+        link_to sort_by: param_name, direction: opposite_direction do
+          concat("#{name} ")
+          concat(
+            content_tag('div', class: 'glyphicon') do
+              content_tag('div',
+                          class: "glyphicon-chevron-#{icon(direction)}") do
+              end
+            end
+          )
+        end
+      end
+
+      def icon(direction)
+        direction == 'asc' ? 'up' : 'down'
+      end
+    end
+  end
+end

data/lib/lipstick/sortable.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Lipstick
+  module Sortable
+    class << self
+      DIRECTIONS = %w[asc desc].freeze
+
+      def direction(direction)
+        direction = DIRECTIONS.find { |x| x == direction&.downcase }
+        direction ||= DIRECTIONS.first
+
+        direction
+      end
+
+      def opposite_direction(direction)
+        (DIRECTIONS - [direction(direction)]).first
+      end
+    end
+
+    module ClassMethods
+      attr_reader :sortable_by_cases, :sortable_by_else
+
+      def sortable_by(sort_cases, sort_else)
+        @sortable_by_cases = sort_cases
+        @sortable_by_else = sort_else
+      end
+
+      def sortable_sort(sort_by, direction)
+        sort_by = sort_by&.to_sym
+        direction = Lipstick::Sortable.direction(direction)
+
+        if sort_by && sortable_by_cases.key?(sort_by)
+          sortable_by_cases[sort_by].call(direction)
+        else
+          sortable_by_else.call(direction)
+        end
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+  end
+end

data/lib/lipstick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lipstick
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -321,9 +321,11 @@ files:
 - lib/lipstick/helpers/layout_helper.rb
 - lib/lipstick/helpers/nav_helper.rb
 - lib/lipstick/helpers/pagination_link_renderer.rb
+- lib/lipstick/helpers/sortable_helper.rb
 - lib/lipstick/images.rb
 - lib/lipstick/images/email_banner.rb
 - lib/lipstick/images/processor.rb
+- lib/lipstick/sortable.rb
 - lib/lipstick/version.rb
 homepage: https://github.com/ausaccessfed/aaf-lipstick
 licenses: