mighty_grid 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db143f79e6b1f6002945861e8da4884867dda3b8
-  data.tar.gz: c2164ac042c84c00515e03dd41dcb5ddddd3c2f3
+  metadata.gz: b11eef1b69fe270d7e786eadf6f0758d085980ae
+  data.tar.gz: 54957782d3271cb70a00f0fc482cfc98052275aa
 SHA512:
-  metadata.gz: 8a36b57f6971bb4e3437555f56cccfe0dde9349d5cf5ef809ebcb29dd6db09899ab85e23b78d1fc4ecc7c5aa21bb20f3e2540318de0b78b52db2eb9b8c00ee18
-  data.tar.gz: 753d836d4737f542a101362b177c6d0762e260a9851b868ecc04bc830c22594e70d3df890428ffe1c8683b65ee2f3d83eb02ba33ab64a67cbc9b8bb364e14430
+  metadata.gz: 90b83e534bea92905baa622567bfac8218d3e469d3596029f869958f747377fccec7e80dac99653712aa100e8e26815238a2ec1becae65259a2faaa65781a3c2
+  data.tar.gz: 2c586fccd7d33ae48fa9d00b628524497d785507ed9944d0b6d8d1e3d50c08b6069645cbba368a6e4fa731db6ccca61665f5e244c3ee72cc43a8583ba465c774

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
 

data/lib/generators/mighty_grid/templates/mighty_grid_config.rb

@@ -1,6 +1,13 @@
 MightyGrid.configure do |config|
   # config.per_page = 15
   # config.order_direction = 'asc'
+  # config.order_type = 'single'
+  # config.order_asc = '↑'
+  # config.order_desc = '↓'
+  # config.order_asc_link_class = ''
+  # config.order_desc_link_class = ''
+  # config.order_active_link_class = ''
+  # config.order_wrapper_class = ''
   # config.grid_name = 'grid'
   # config.table_class = ''
   # config.header_tr_class = ''

data/lib/mighty_grid/base.rb

@@ -56,7 +56,7 @@ module MightyGrid
         end
 
         next if filter_value.blank? || !model.column_names.include?(name)
-        
+
         if model && model.superclass == ActiveRecord::Base
           filter_type = model.columns_hash[name].type
         else
@@ -119,12 +119,17 @@ module MightyGrid
     end
 
     # Get order parameters
-    def order_params(attribute, model = nil)
+    def order_params(attribute, model = nil, direction = nil)
       order = model.present? ? "#{model.table_name}.#{attribute}" : attribute.to_s
-      direction = order == current_grid_params['order'] ? another_order_direction : 'asc'
+      direction ||= order == current_grid_params['order'] ? another_order_direction : 'asc'
       {@name => {order: order, order_direction: direction}}
     end
 
+    # Get current order direction if current order parameter coincides with the received parameter
+    def get_active_order_direction(parameters)
+      (parameters[@name]['order'] == current_grid_params['order']) ? current_order_direction : nil
+    end
+
     # Get current order direction
     def current_order_direction
       direction = nil

data/lib/mighty_grid/column.rb

@@ -8,7 +8,13 @@ module MightyGrid
       @attrs = {}
       @th_attrs = {}
       if block_given?
-        @options = attr_or_options || {}
+        if attr_or_options.is_a?(Hash)
+          @options = attr_or_options || {}
+        else
+          @options = options || {}
+          @attribute = attr_or_options if attr_or_options.present?
+        end
+        
         @render_value = block
       else
         @options = options || {}

data/lib/mighty_grid/config.rb

@@ -18,6 +18,13 @@ module MightyGrid
     include ActiveSupport::Configurable
     config_accessor :per_page
     config_accessor :order_direction
+    config_accessor :order_type
+    config_accessor :order_asc
+    config_accessor :order_desc
+    config_accessor :order_asc_link_class
+    config_accessor :order_desc_link_class
+    config_accessor :order_active_link_class
+    config_accessor :order_wrapper_class
     config_accessor :grid_name
     config_accessor :header_tr_class
     config_accessor :table_class
@@ -27,6 +34,13 @@ module MightyGrid
   configure do |config|
     config.per_page = 15
     config.order_direction = 'asc'
+    config.order_type = 'single'
+    config.order_asc = '↑'
+    config.order_desc = '↓'
+    config.order_asc_link_class = ''
+    config.order_desc_link_class = ''
+    config.order_active_link_class = 'mg-order-active'
+    config.order_wrapper_class = ''
     config.grid_name = 'grid'
     config.table_class = ''
     config.header_tr_class = ''

data/lib/mighty_grid/grid_renderer.rb

@@ -10,18 +10,29 @@ module MightyGrid
     end
 
     def column(attr_or_options = {}, options=nil, &block)
-      if block_given?
+      if attr_or_options.is_a?(Hash)
         options = attr_or_options.symbolize_keys
-        @columns << MightyGrid::Column.new(options, &block)
       else
         attribute = attr_or_options.to_sym
         options = {} unless options.is_a?(Hash)
-        opts = {
-          title: @grid.klass.human_attribute_name(attribute),
+      end
+
+      if attribute.present?
+        options = {
           ordering: true,
-          attribute: attribute
+          attribute: attribute,
+          title: @grid.klass.human_attribute_name(attribute)
         }.merge!(options)
-        @columns << MightyGrid::Column.new(attribute, opts)
+      end
+
+      if block_given?
+        if attribute.present?
+          @columns << MightyGrid::Column.new(attribute, options, &block)
+        else
+          @columns << MightyGrid::Column.new(options, &block)
+        end
+      else
+        @columns << MightyGrid::Column.new(attribute, options)
       end
       @total_columns = @columns.count
     end

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -5,14 +5,31 @@ module MightyGrid
       render_grid(grid)
     end
 
-    def define_grid(grid, options={}, &block)
+    def define_grid(grid, opts={}, &block)
 
       rendering = GridRenderer.new(grid, self)
 
       block.call(rendering)
 
-      table_html_attrs = options[:html] || {}
-      table_html_attrs = MightyGrid::MgHTML.join_html_classes(table_html_attrs, 'mighty-grid', MightyGrid.config.table_class)
+      options = {
+        html: {},
+        header_tr_html: {},
+        order_type: MightyGrid.config.order_type,
+        order_asc: MightyGrid.config.order_asc,
+        order_desc: MightyGrid.config.order_desc,
+        order_asc_link_class: MightyGrid.config.order_asc_link_class,
+        order_desc_link_class: MightyGrid.config.order_desc_link_class,
+        order_active_link_class: MightyGrid.config.order_active_link_class,
+        order_wrapper_class: MightyGrid.config.order_wrapper_class
+      }
+
+      opts.assert_valid_keys(options.keys)
+
+      options.merge!(opts)
+
+      options[:order_wrapper_class] = MightyGrid::MgHTML.join_html_classes({}, 'mg-order-wrapper', options[:order_wrapper_class])[:class]
+
+      table_html_attrs = MightyGrid::MgHTML.join_html_classes(options[:html], 'mighty-grid', MightyGrid.config.table_class)
 
       grid.read
 
@@ -49,62 +66,97 @@ module MightyGrid
       form_tag(options[:url] || {}, html_options){ output }
     end
 
-    def header_grid_html(rendering, grid, options)
-      header_tr_html = options[:header_tr_html] || {}
-      header_tr_html = MightyGrid::MgHTML.join_html_classes(header_tr_html, MightyGrid.config.header_tr_class)
-
-      content_tag :thead do
-        content_tag :tr, header_tr_html do
-          rendering.columns.map { |column|
-            content_tag :th, column.th_attrs do
-              if column.options[:ordering] && column.attribute.present?
-                link_to(column.title, "?#{MightyGrid::MgHash.rec_merge(grid.params, grid.order_params(column.attribute, column.model)).except('controller', 'action').to_query}").html_safe
-              else
-                column.title.html_safe
-              end
-            end
-          }.join.html_safe
+    def blank_slate_template(rendering)
+      if rendering.blank_slate_handler.present?
+        case rendering.blank_slate_handler
+        when Proc; rendering.blank_slate_handler.call
+        when String; rendering.blank_slate_handler
+        when Hash; render(rendering.blank_slate_handler)
         end
+      else
+        content_tag :div, 'No records found'
       end
     end
 
-    def body_grid_html(rendering, grid)
-      content_tag :tbody do
-        html_record = ''
-        grid.relation.each do |rel|
-          html_record += content_tag :tr do
-            rendering.columns.map{|column| content_tag :td, column.render(rel), column.attrs}.join.html_safe
+    private
+
+      def header_grid_html(rendering, grid, options)
+        header_tr_html = MightyGrid::MgHTML.join_html_classes(options[:header_tr_html], MightyGrid.config.header_tr_class)
+
+        content_tag :thead do
+          content_tag :tr, header_tr_html do
+            rendering.columns.map { |column|
+              content_tag(:th, column.th_attrs){ grid_title_html(grid, column, options) }
+            }.join.html_safe
           end
         end
-        html_record.html_safe
       end
-    end
 
-    def footer_grid_html(rendering, grid)
-      content_tag :tfoot do
-        content_tag :tr do
-          content_tag :td, colspan: rendering.total_columns do
-            html_pag = paginate(grid.relation, theme: MightyGrid.config.pagination_theme, param_name: "#{grid.name}[page]")
-            html_pag += content_tag :strong do
-              "#{grid.relation.offset_value + 1} – #{grid.relation.offset_value + grid.relation.size} of #{grid.relation.total_count}".html_safe
+      def grid_title_html(grid, column, options)
+        if column.options[:ordering] && column.attribute.present?
+          order_asc = column.options[:order_asc] || options[:order_asc]
+          order_desc = column.options[:order_desc] || options[:order_desc]
+
+          case options[:order_type]
+          when 'pair'
+            order_active = grid.get_active_order_direction(grid_order_params(grid, column))
+            order_asc_class = MightyGrid::MgHTML.join_html_classes({}, (order_active == 'asc' ? options[:order_active_link_class] : nil), options[:order_asc_link_class])[:class]
+            order_desc_class = MightyGrid::MgHTML.join_html_classes({}, (order_active == 'desc' ? options[:order_active_link_class] : nil), options[:order_desc_link_class])[:class]
+
+            html_title = column.title
+            html_title += content_tag :div, class: options[:order_wrapper_class] do
+              html_order = get_order_html(grid, column, order_active, order_asc, 'asc', class: order_asc_class)
+              html_order += ' '
+              html_order += get_order_html(grid, column, order_active, order_desc, 'desc', class: order_desc_class)
+              html_order.html_safe
             end
-            html_pag.html_safe
+          else
+            html_title = link_to(column.title.html_safe, "?#{grid_order_params(grid, column).to_query}")
           end
-        end.html_safe
+          html_title.html_safe
+        else
+          column.title.html_safe
+        end
       end
-    end
 
-    def blank_slate_template(rendering)
-      if rendering.blank_slate_handler.present?
-        case rendering.blank_slate_handler
-        when Proc; rendering.blank_slate_handler.call
-        when String; rendering.blank_slate_handler
-        when Hash; render(rendering.blank_slate_handler)
+      def get_order_html(grid, column, order_active, order_html, direction = nil, html_options = {})
+        if order_active == direction
+          html = content_tag :span, order_html.html_safe, html_options
+        else
+          html = link_to(order_html.html_safe, "?#{grid_order_params(grid, column, direction).to_query}", html_options)
+        end
+        html.html_safe
+      end
+
+      def grid_order_params(grid, column, direction = nil)
+        MightyGrid::MgHash.rec_merge(grid.params, grid.order_params(column.attribute, column.model, direction)).except('controller', 'action')
+      end
+
+      def body_grid_html(rendering, grid)
+        content_tag :tbody do
+          html_record = ''
+          grid.relation.each do |rel|
+            html_record += content_tag :tr do
+              rendering.columns.map{|column| content_tag :td, column.render(rel), column.attrs}.join.html_safe
+            end
+          end
+          html_record.html_safe
+        end
+      end
+
+      def footer_grid_html(rendering, grid)
+        content_tag :tfoot do
+          content_tag :tr do
+            content_tag :td, colspan: rendering.total_columns do
+              html_pag = paginate(grid.relation, theme: MightyGrid.config.pagination_theme, param_name: "#{grid.name}[page]")
+              html_pag += content_tag :strong do
+                "#{grid.relation.offset_value + 1} – #{grid.relation.offset_value + grid.relation.size} of #{grid.relation.total_count}".html_safe
+              end
+              html_pag.html_safe
+            end
+          end.html_safe
         end
-      else
-        content_tag :div, 'No records found'
       end
-    end
 
   end
 end

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/mighty_grid.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "rspec-rails", "~> 2.14.2"
   spec.add_development_dependency 'appraisal'
 
   spec.add_dependency 'kaminari', '~> 0.15.0'

data/spec/config_spec.rb

@@ -25,6 +25,83 @@ describe MightyGrid::Configuration do
     end
   end
 
+  describe 'order_type' do
+    context 'by default' do
+      its(:order_type) { should == 'single' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_type = 'pair'} }
+      its(:order_type) { should == 'pair' }
+      after { MightyGrid.configure {|c| c.order_type = 'single'} }
+    end
+  end
+
+  describe 'order_asc' do
+    context 'by default' do
+      its(:order_asc) { should == '↑' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_asc = '∧'} }
+      its(:order_asc) { should == '∧' }
+      after { MightyGrid.configure {|c| c.order_asc = '↑'} }
+    end
+  end
+
+  describe 'order_desc' do
+    context 'by default' do
+      its(:order_desc) { should == '↓' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_desc = '∨'} }
+      its(:order_desc) { should == '∨' }
+      after { MightyGrid.configure {|c| c.order_desc = '↓'} }
+    end
+  end
+
+  describe 'order_asc_link_class' do
+    context 'by default' do
+      its(:order_asc_link_class) { should == '' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_asc_link_class = 'btn'} }
+      its(:order_asc_link_class) { should == 'btn' }
+      after { MightyGrid.configure {|c| c.order_asc_link_class = ''} }
+    end
+  end
+
+  describe 'order_active_link_class' do
+    context 'by default' do
+      its(:order_active_link_class) { should == 'mg-order-active' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_active_link_class = 'btn-primary'} }
+      its(:order_active_link_class) { should == 'btn-primary' }
+      after { MightyGrid.configure {|c| c.order_active_link_class = ''} }
+    end
+  end
+
+  describe 'order_desc_link_class' do
+    context 'by default' do
+      its(:order_desc_link_class) { should == '' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_desc_link_class = 'btn'} }
+      its(:order_desc_link_class) { should == 'btn' }
+      after { MightyGrid.configure {|c| c.order_desc_link_class = ''} }
+    end
+  end
+
+  describe 'order_wrapper_class' do
+    context 'by default' do
+      its(:order_wrapper_class) { should == '' }
+    end
+    context 'configured via config block' do
+      before { MightyGrid.configure {|c| c.order_wrapper_class = 'btn-group'} }
+      its(:order_wrapper_class) { should == 'btn-group' }
+      after { MightyGrid.configure {|c| c.order_wrapper_class = ''} }
+    end
+  end
+
   describe 'grid_name' do
     context 'by default' do
       its(:grid_name) { should == 'grid' }

data/vendor/assets/stylesheets/mighty_grid.css

@@ -1,3 +1,13 @@
 .mighty-grid .pagination {
   margin: 0;
+}
+
+.mighty-grid .mg-order-wrapper {
+  float: right !important;
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+.mighty-grid .mg-order-active {
+  color: #000;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement