mighty_grid 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11eef1b69fe270d7e786eadf6f0758d085980ae
-  data.tar.gz: 54957782d3271cb70a00f0fc482cfc98052275aa
+  metadata.gz: b9fb8a05f406c93425c49c6bc860276ab6d7140b
+  data.tar.gz: 6245a2f298bf5db56c004e3fb81d13413993dfcb
 SHA512:
-  metadata.gz: 90b83e534bea92905baa622567bfac8218d3e469d3596029f869958f747377fccec7e80dac99653712aa100e8e26815238a2ec1becae65259a2faaa65781a3c2
-  data.tar.gz: 2c586fccd7d33ae48fa9d00b628524497d785507ed9944d0b6d8d1e3d50c08b6069645cbba368a6e4fa731db6ccca61665f5e244c3ee72cc43a8583ba465c774
+  metadata.gz: a4867e8238ab8c79d6c525bc5d1b325c6d57c7ab010e0a547bd66583e69cc17f87ee7de682b961e6adb9b9f7bcae40e0fb2f87d6a5a8585bd78a4984f6214880
+  data.tar.gz: 12f58aca2256556dca79d1932f9008a62212206b2d80fdbe4e0f0e0d7001bf9b17d137f6737522c7725b295e1d47a7f99723d34fba228ca1ad19e40dc9a3fe5d

data/README.md

@@ -1,4 +1,4 @@
-# MightyGrid [![Gem Version](http://img.shields.io/gem/v/mighty_grid.svg)](http://badge.fury.io/rb/mighty_grid) [![Build Status](https://travis-ci.org/jurrick/mighty_grid.svg?branch=master)](https://travis-ci.org/jurrick/mighty_grid) [![Code Climate](https://codeclimate.com/github/jurrick/mighty_grid.png)](https://codeclimate.com/github/jurrick/mighty_grid) [![Inline docs](http://inch-pages.github.io/github/jurrick/mighty_grid.png)](http://inch-pages.github.io/github/jurrick/mighty_grid)
+# MightyGrid [![Gem Version](http://img.shields.io/gem/v/mighty_grid.svg)](http://badge.fury.io/rb/mighty_grid) [![Build Status](https://travis-ci.org/jurrick/mighty_grid.svg?branch=master)](https://travis-ci.org/jurrick/mighty_grid) [![Code Climate](https://codeclimate.com/github/jurrick/mighty_grid.png)](https://codeclimate.com/github/jurrick/mighty_grid) [![Inline docs](http://inch-ci.org/github/jurrick/mighty_grid.png)](http://inch-ci.org/github/jurrick/mighty_grid)
 
 MightyGrid is a flexible grid solution for Ruby On Rails.
 

data/app/views/mighty_grid/_actions.html.erb

@@ -0,0 +1,11 @@
+<% if actions.include? :show %>
+  <%= link_to 'Просмотреть', url_for(object) %>
+  <br/>
+<% end %>
+<% if actions.include? :edit %>
+  <%= link_to 'Редактировать', url_for([:edit, object]) %>
+  <br/>
+<% end %>
+<% if actions.include? :destroy %>
+  <%= link_to 'Удалить', url_for(object), method: :delete, data: {confirm: 'Are you sure?'} %>
+<% end %>

data/lib/mighty_grid/base.rb

@@ -2,7 +2,7 @@ module MightyGrid
 
   class Base
 
-    attr_reader :klass, :name, :relation, :options, :mg_params
+    attr_reader :klass, :name, :relation, :options, :mg_params, :controller
     attr_accessor :output_buffer, :filters
 
     def initialize(klass_or_relation, controller, opts = {})  #:nodoc:

data/lib/mighty_grid/column.rb

@@ -1,24 +1,20 @@
 module MightyGrid
   class Column
 
-    attr_reader :attribute, :attrs, :th_attrs, :options, :title, :model
+    attr_reader :attribute, :attrs, :th_attrs, :options, :title, :model, :partial
     attr_accessor :render_value
 
-    def initialize(attr_or_options=nil, options=nil, &block)
+    def initialize(options={}, &block)
       @attrs = {}
       @th_attrs = {}
+
+      @attribute = options.delete(:attribute) if options.has_key?(:attribute)
+
+      @options ||= options
+
       if block_given?
-        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 || {}
-        @attribute = attr_or_options
         @render_value = @attribute
       end
 

data/lib/mighty_grid/grid_renderer.rb

@@ -1,6 +1,6 @@
 module MightyGrid
   class GridRenderer
-    attr_reader :columns, :th_columns, :total_columns, :blank_slate_handler
+    attr_reader :columns, :th_columns, :blank_slate_handler
 
     def initialize(grid, view)
       @grid = grid
@@ -26,15 +26,22 @@ module MightyGrid
       end
 
       if block_given?
-        if attribute.present?
-          @columns << MightyGrid::Column.new(attribute, options, &block)
-        else
-          @columns << MightyGrid::Column.new(options, &block)
-        end
+        @columns << MightyGrid::Column.new(options, &block)
       else
-        @columns << MightyGrid::Column.new(attribute, options)
+        @columns << MightyGrid::Column.new(options)
       end
-      @total_columns = @columns.count
+    end
+
+    def actions(opts = {})
+      options = {
+        partial: 'mighty_grid/actions',
+        only: [:show, :edit, :destroy]
+      }
+
+      opts.assert_valid_keys(options.keys)
+      options.merge!(opts)
+
+      @columns << MightyGrid::Column.new({title: 'Actions'}){ |object| @grid.controller.render_to_string(partial: options[:partial], locals: {actions: options[:only], object: object})}
     end
 
     def blank_slate(html_or_opts = nil, &block)
@@ -46,5 +53,7 @@ module MightyGrid
         raise MightyGridArgumentError.new("blank_slate accepts only a string, a block, or :partial => 'path_to_partial' ")
       end
     end
+
+    def total_columns; @columns.count end
   end
 end

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -78,6 +78,10 @@ module MightyGrid
       end
     end
 
+    def actions_template(rendering)
+      render(partial: 'mighty_grid/actions')
+    end
+
     private
 
       def header_grid_html(rendering, grid, options)
@@ -96,13 +100,12 @@ module MightyGrid
         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]
+          order_active = grid.get_active_order_direction(grid_order_params(grid, column))
 
           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)

data/lib/mighty_grid/version.rb

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

data/spec/lib/column_spec.rb

@@ -5,7 +5,7 @@ describe MightyGrid::Column do
   describe '#new' do
     describe 'with attribute' do
       context 'without options' do
-        subject { MightyGrid::Column.new(:name) }
+        subject { MightyGrid::Column.new({attribute: :name}) }
         context 'parameters' do
           its(:attribute) { should == :name }
           its(:render_value) { should == :name }
@@ -17,21 +17,21 @@ describe MightyGrid::Column do
 
       context 'with html option' do
         let(:options) { {html: {class: 'column'}} }
-        subject { MightyGrid::Column.new(:name, options) }
+        subject { MightyGrid::Column.new({attribute: :name}.merge(options)) }
         its(:options) { should == options }
         its(:attrs) { should == options[:html] }
       end
 
       context 'with title option' do
         let(:options) { {title: 'Name'} }
-        subject { MightyGrid::Column.new(:name, options) }
+        subject { MightyGrid::Column.new({attribute: :name}.merge(options)) }
         its(:options) { should == options }
         its(:title) { should == options[:title] }
       end
 
       context 'with th_html option' do
         let(:options) { {th_html: {class: 'active'}} }
-        subject { MightyGrid::Column.new(:name, options) }
+        subject { MightyGrid::Column.new({attribute: :name}.merge(options)) }
         its(:options) { should == options }
         its(:th_attrs) { should == {class: 'active'} }
       end
@@ -55,7 +55,7 @@ describe MightyGrid::Column do
     let(:user){ User.create(name: 'user name') }
 
     describe 'with attribute' do
-      subject(:column){ MightyGrid::Column.new(:name) }
+      subject(:column){ MightyGrid::Column.new({attribute: :name}) }
       it 'should return attribute value' do
         column.render(user).should == user[:name]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - app/views/kaminari/mighty_grid/_page.html.erb
 - app/views/kaminari/mighty_grid/_paginator.html.erb
 - app/views/kaminari/mighty_grid/_prev_page.html.erb
+- app/views/mighty_grid/_actions.html.erb
 - config/locales/en.yml
 - features/filtering.feature
 - features/step_definitions/steps.rb