mighty_grid 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b8144f9e7e58cdc96ca3d0b807c64480fb1358
-  data.tar.gz: 3df768d2465fef24ef982f16b48c1f63c9835f39
+  metadata.gz: 4cee3ab6ecd36d2c2204e7e0aeedaf98815f1c0b
+  data.tar.gz: 2457d2990260bb2a78977943ff6bc620b9c09ccf
 SHA512:
-  metadata.gz: c198e16b636905e23ecdf31a2c9fc76c2275a4db88aee84df62ebf5e7532a78a1e25c925af505413c4886dafa1aff02562fb9f294a89815e2d16132765972717
-  data.tar.gz: c5425779bef23b7b99d6b7b61531cc26990c73a8e86ba9e95ed652af42433645ab2f75dd09a0db460b4dd89dc34a5cfa47d3cc29d3c21ad0d6725539d8d4c510
+  metadata.gz: 888803988c9136627192a26fa6ea7c5420b02a6bb70d993a8e0f800e231c4711e787ac97ccb7304f5c7a19c3bb03038a295f5034e1f096e4ba0fc167e44ca7e3
+  data.tar.gz: 92d5a885185a8113182ea51eafb4d67e54d4e36d98ba37bae08de8845d13d46ffeeea1a3b79edd8f8235aa9ee44541c2dc06ac2a74d707baf935dea219a35bb0

data/README.md

@@ -45,12 +45,19 @@ end
 You can configure the following default values by overriding these values using <tt>MightyGrid.configure</tt> method.
 
 ```
-per_page          # 15 by default
-order_direction   # 'asc' by default
-grid_name         # 'grid' by default
-table_class       # '' by default
-header_tr_class   # '' by default
-pagination_theme  # 'mighty_grid' by default
+per_page                # 15 by default
+order_direction         # 'asc' by default
+order_type              # 'single' by default
+order_asc               # '&uarr;' by default
+order_desc              # '&darr;' by default
+order_asc_link_class    # '' by default
+order_desc_link_class   # '' by default
+order_active_link_class # 'mg-order-active' by default
+order_wrapper_class     # '' by default
+grid_name               # 'grid' by default
+table_class             # '' by default
+header_tr_class         # '' by default
+pagination_theme        # 'mighty_grid' by default
 ```
 
 There's a handy generator that generates the default configuration file into config/initializers directory.
@@ -58,6 +65,17 @@ Run the following generator command, then edit the generated file.
 
     $ rails g mighty_grid:install
 
+## Running tests
+
+To run the tests you need specify database and Rails version.
+
+* List of available Rails versions: 3.2, 4.0, 4.1.
+* List of DB: sqlite, postgresql, mysql.
+
+Example run:
+
+    $ DB=postgresql appraisal rails_32 rake spec cucumber
+
 ## Contributing
 
 1. Fork it ( http://github.com/jurrick/mighty_grid/fork )

data/config/locales/en.yml

@@ -1,5 +1,6 @@
 en:
   mighty_grid:
+    display_entries: "<strong>%{first} &ndash; %{last} of %{total}</strong>"
     filters:
       submit: Apply changes
-      reset: Reset changes
+      reset: Reset changes

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

@@ -11,5 +11,5 @@ MightyGrid.configure do |config|
   # config.grid_name = 'grid'
   # config.table_class = ''
   # config.header_tr_class = ''
-  # config.pagination_template = 'mighty_grid'
+  # config.pagination_theme = 'mighty_grid'
 end

data/lib/mighty_grid/base.rb

@@ -15,7 +15,8 @@ module MightyGrid
         include:    nil,
         joins:      nil,
         conditions: nil,
-        group:      nil
+        group:      nil,
+        order:      nil
       }
 
       opts.assert_valid_keys(@options.keys)
@@ -32,7 +33,12 @@ module MightyGrid
 
     def read
       apply_filters
-      @relation = @relation.order("#{@mg_params[:order]} #{current_order_direction.to_sym}") if @mg_params[:order].present? && current_order_direction.present?
+      if @mg_params[:order].present? && current_order_direction.present?
+        @relation = @relation.order("#{@mg_params[:order]} #{current_order_direction.to_sym}")
+      else
+        @relation = @relation.order(@mg_params[:order])
+      end
+
       @relation = @relation
                     .page(@mg_params[:page])
                     .per(@mg_params[:per_page])
@@ -81,6 +87,7 @@ module MightyGrid
     # Load grid parameters
     def load_grid_params
       @mg_params = {}
+      @mg_params[filter_param_name.to_sym] = {}
       @mg_params.merge!(@options)
       if current_grid_params
         @mg_params.merge!(current_grid_params.symbolize_keys)
@@ -97,7 +104,7 @@ module MightyGrid
 
     # Get filter parameters
     def filter_params
-      get_current_grid_param(filter_param_name) || {}
+      @mg_params[filter_param_name.to_sym] || {}
     end
 
     # Get filter parameter name
@@ -105,6 +112,11 @@ module MightyGrid
       'f'
     end
 
+    # Add param in filters
+    def add_filter_param(param, value)
+      @mg_params[filter_param_name.to_sym][param] = value unless @mg_params[filter_param_name.to_sym].key?(param)
+    end
+
     # Get filter name by field
     def get_filter_name(field, model = nil)
       field_name = model.present? ? "#{model.table_name}.#{field}" : field

data/lib/mighty_grid/column.rb

@@ -29,9 +29,10 @@ module MightyGrid
       case @render_value
       when String, Symbol
         rec = @model ? record.send(@model.to_s.underscore) : record
-        return rec[@render_value]
+        return rec[@render_value.to_sym]
       when Proc
-        value = @render_value.call(record)
+        value, attrs = @render_value.call(record)
+        @attrs.merge!(attrs || {})
         return ERB::Util.h(value).to_s.html_safe
       else
         # raise

data/lib/mighty_grid/filter_renderer.rb

@@ -25,11 +25,14 @@ module MightyGrid
     # Get <tt>select</tt> HTML tag
     def select(name, option_tags = nil, options = {})
       @grid.filters[name] = option_tags
-      selected = nil
-      selected = options.delete(:selected) if options.key?(:selected)
-
       f_options = filter_options(name, options)
 
+      selected = nil
+      if options.key?(:selected)
+        selected = options.delete(:selected)
+        @grid.add_filter_param(get_filter_param_name(name, f_options[:model]), selected)
+      end
+
       selected = get_filter_param(name, f_options[:model]) if get_filter_param(name, f_options[:model])
       opts = options_for_select(option_tags, selected)
 
@@ -61,8 +64,12 @@ module MightyGrid
 
     private
 
+    def get_filter_param_name(name, model = nil)
+      model ? "#{model.table_name}.#{name}" : name.to_s
+    end
+
     def get_filter_param(name, model = nil)
-      filter_name = model ? "#{model.table_name}.#{name}" : name
+      filter_name = get_filter_param_name(name, model)
       @grid.filter_params.key?(filter_name) ? @grid.filter_params[filter_name] : nil
     end
 

data/lib/mighty_grid/grid_renderer.rb

@@ -1,12 +1,13 @@
 module MightyGrid
   class GridRenderer
-    attr_reader :columns, :th_columns, :blank_slate_handler
+    attr_reader :columns, :th_columns, :blank_slate_handler, :row_attributes_handler
 
     def initialize(grid, view)
       @grid = grid
       @columns = []
       @th_columns = []
       @blank_slate_handler = nil
+      @row_attributes_handler = proc {}
     end
 
     def column(attr_or_options = {}, options = nil, &block)
@@ -44,6 +45,10 @@ module MightyGrid
       @columns << MightyGrid::Column.new(title: 'Actions') { |object| @grid.controller.render_to_string(partial: options[:partial], locals: { actions: options[:only], object: object }) }
     end
 
+    def row_attributes(&block)
+      @row_attributes_handler = block if block_given?
+    end
+
     def blank_slate(html_or_opts = nil, &block)
       if (html_or_opts.is_a?(Hash) && html_or_opts.key?(:partial) || html_or_opts.is_a?(String)) && !block_given?
         @blank_slate_handler = html_or_opts

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -8,7 +8,7 @@ module MightyGrid
     def define_grid(grid, opts = {}, &block)
       rendering = GridRenderer.new(grid, self)
 
-      block.call(rendering)
+      yield rendering
 
       options = {
         html: {},
@@ -137,7 +137,8 @@ module MightyGrid
       content_tag :tbody do
         html_record = ''
         grid.relation.each do |rel|
-          html_record += content_tag :tr do
+          row_attributes = rendering.row_attributes_handler.call(rel) || {}
+          html_record += content_tag :tr, row_attributes do
             rendering.columns.map { |column| content_tag :td, column.render(rel), column.attrs }.join.html_safe
           end
         end
@@ -150,13 +151,18 @@ module MightyGrid
         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 += display_entries(grid)
             html_pag.html_safe
           end
         end.html_safe
       end
     end
+
+    def display_entries(grid)
+      first = grid.relation.offset_value + 1
+      last = grid.relation.offset_value + grid.relation.length
+      total = grid.relation.total_count
+      I18n.t("models.#{grid.klass.table_name}.display_entries", default: :'display_entries', scope: 'mighty_grid', first: first, last: last, total: total).html_safe
+    end
   end
 end

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/mighty_grid.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-rails', '~> 2.14.2'
   spec.add_development_dependency 'appraisal'
 
-  spec.add_dependency 'kaminari', '~> 0.15.0'
+  spec.add_dependency 'kaminari', '~> 0.15'
 end

data/spec/lib/base_spec.rb

@@ -13,8 +13,10 @@ describe MightyGrid::Base do
       include: nil,
       joins: nil,
       conditions: nil,
-      group: nil
+      group: nil,
+      order: nil
     }
+    @mg_params = @default_options.merge(f: {})
   end
 
   describe '#new' do
@@ -22,7 +24,7 @@ describe MightyGrid::Base do
       subject { MightyGrid::Base.new(User, @controller) }
       its(:params) { should == {} }
       its(:options) { should == @default_options }
-      its(:mg_params) { should == @default_options }
+      its(:mg_params) { should == @mg_params }
       its(:filters) { should == {} }
       its(:name) { should == 'grid' }
       its(:relation) { should == User }
@@ -45,7 +47,7 @@ describe MightyGrid::Base do
       before(:all) { @controller.params = { 'grid' => { page: 5, per_page: 30, name: 'grid2' } } }
       subject { MightyGrid::Base.new(User, @controller) }
       its(:params) { should == @controller.params }
-      its(:mg_params) { should == @default_options.merge(page: 5, per_page: 30, name: 'grid2') }
+      its(:mg_params) { should == @mg_params.merge(page: 5, per_page: 30, name: 'grid2') }
       after(:all) { @controller.params = {} }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0.15'
 description: Flexible grid for Rails
 email:
 - jurianp@gmail.com