mighty_grid 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4844d991f9821e4d7f8c255c34eda1e0e162cf5b
-  data.tar.gz: fa07a1f87c95c2ac6d7fafa723d89c3d7010c7b4
+  metadata.gz: 4b86bd1ed6d0734fa6d924b5b462469828a65ee0
+  data.tar.gz: 40241a4547e70b2829b4abe1e579cb757ea44fb2
 SHA512:
-  metadata.gz: a7cfed903a2b101ce0fcf90451588fd9162ca5285720e8645c25bfa5535a452e2e37820d3a59c3b36085cbc188ce997387a61edd98bcb6a204a910684e276bf5
-  data.tar.gz: 8a26a1320f48f36084caee47be29ceeb490a03dfb170846ae2b792071f76a5ce44197354ac71b0a7ef190ae423f3cb76b77a8140f708f3359cc0e4cbf31a2a28
+  metadata.gz: 7b364645a807c3268e3f073118f30832c852e9a312f9cb21e554122579a2d5ef27f3480ad43237178c253677f5fa05fceb0336b1b9103d67e98836a98ffba7d2
+  data.tar.gz: 3c25be9911a6eb1905a455a53c08f5e4419c97d1ce2fcebe06ca04f53e976d7c9ebabd2fc51ae6a0a413f55a3fb449cb9a336222e28afaa1cd10e7299a5ff201

data/lib/mighty_grid/base.rb

@@ -77,6 +77,10 @@ module MightyGrid
       params[name] || {}
     end
 
+    def order_params(attribute)
+      {@name => {order: attribute, order_direction: order_direction}}
+    end
+
     def order_direction
       (current_grid_params.has_key?('order_direction')) ? (['asc', 'desc'] - [current_grid_params['order_direction'].to_s]).first : MightyGrid.config.order_direction
     end

data/lib/mighty_grid/column.rb

@@ -1,31 +1,30 @@
 module MightyGrid
   class Column
 
-    attr_reader :display_property, :attribute, :attrs, :th_attrs, :options, :title
+    attr_reader :attribute, :attrs, :th_attrs, :options, :title
     attr_accessor :render_value
 
     def initialize(attr_or_options=nil, options=nil, &block)
       @attrs = {}
+      @th_attrs = {}
       if block_given?
-        @options = attr_or_options
-        @display_property = :block
+        @options = attr_or_options || {}
         @render_value = block
       else
-        @options = options
+        @options = options || {}
         @attribute = attr_or_options
-        @display_property = :attr
-        @render_value = attribute
+        @render_value = @attribute
       end
-      @attrs = options[:html] if options && options.has_key?(:html)
-      @th_attrs = options[:th_html] if options && options.has_key?(:th_html)
-      @title = options[:title] || ''
+      @attrs = @options[:html] if @options.has_key?(:html)
+      @th_attrs = @options[:th_html] if @options.has_key?(:th_html)
+      @title = @options.has_key?(:title) && @options[:title] || ''
     end
 
     def render(record)
-      case @display_property
-        when :attr
+      case @render_value
+        when String, Symbol
           return record[@render_value]
-        when :block
+        when Proc
           value = @render_value.call(record)
           return ERB::Util.h(value).to_s.html_safe
         else

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -56,8 +56,8 @@ module MightyGrid
         content_tag :tr, header_tr_html do
           rendering.columns.map { |column|
             content_tag :th, column.th_attrs do
-              if column.options[:ordering]
-                link_to(column.title, "?#{MightyGrid::MgHash.rec_merge(grid.params, {grid.name => {order: column.attribute, order_direction: grid.order_direction}}).except('controller', 'action').to_query}").html_safe
+              if column.options[:ordering] && column.attribute.present?
+                link_to(column.title, "?#{MightyGrid::MgHash.rec_merge(grid.params, grid.order_params(column.attribute)).except('controller', 'action').to_query}").html_safe
               else
                 column.title.html_safe
               end
@@ -96,9 +96,9 @@ module MightyGrid
     def blank_slate_template(rendering)
       if rendering.blank_slate_handler.present?
         case rendering.blank_slate_handler
-        when Proc; return rendering.blank_slate_handler.call
-        when String; return rendering.blank_slate_handler
-        when Hash; return render(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'

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/lib/column_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe MightyGrid::Column do
+
+  describe '#new' do
+    describe 'with attribute' do
+      context 'without options' do
+        subject { MightyGrid::Column.new(:name) }
+        context 'parameters' do
+          its(:attribute) { should == :name }
+          its(:render_value) { should == :name }
+          its(:title) { should == '' }
+          its(:attrs) { should == {} }
+          its(:th_attrs) { should == {} }
+        end
+      end
+
+      context 'with html option' do
+        let(:options) { {html: {class: 'column'}} }
+        subject { MightyGrid::Column.new(:name, 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) }
+        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) }
+        its(:options) { should == options }
+        its(:th_attrs) { should == {class: 'active'} }
+      end
+    end
+
+    describe 'with block' do
+      context 'without options' do
+        subject { MightyGrid::Column.new {:test} }
+        context 'parameters' do
+          its(:attribute) { should == nil }
+          its(:title) { should == '' }
+          its(:render_value) { should be_an_instance_of Proc }
+          its(:attrs) { should == {} }
+          its(:th_attrs) { should == {} }
+        end
+      end
+    end
+  end
+
+  describe '.render' do
+    let(:product){ Product.create(name: 'product name') }
+
+    describe 'with attribute' do
+      subject(:column){ MightyGrid::Column.new(:name) }
+      it 'should return attribute value' do
+        column.render(product).should == product[:name]
+      end
+    end
+
+    describe 'with block' do
+      subject(:column){ MightyGrid::Column.new { "#{product.name} 1" } }
+      it 'should return attribute value' do
+        column.render(product).should == "#{product[:name]} 1"
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - jurrick
@@ -126,6 +126,7 @@ files:
 - spec/fake_app/models/config.rb
 - spec/fake_app/rails_app.rb
 - spec/lib/base_spec.rb
+- spec/lib/column_spec.rb
 - spec/lib/generators/config_generator_spec.rb
 - spec/requests/products_spec.rb
 - spec/spec_helper.rb
@@ -163,6 +164,7 @@ test_files:
 - spec/fake_app/models/config.rb
 - spec/fake_app/rails_app.rb
 - spec/lib/base_spec.rb
+- spec/lib/column_spec.rb
 - spec/lib/generators/config_generator_spec.rb
 - spec/requests/products_spec.rb
 - spec/spec_helper.rb