jqgrid_for_rails 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmIyYjQyZjRjOWQ4MmRmMzJlODVjOTQ3OGExZDQzNTI4NTVhNDViOQ==
+  data.tar.gz: !binary |-
+    NTFhODFhYzgwZjkwZTVmYzU0YjQ0MzlhMTg4MzlmYWM4MDcyY2JlNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YjM5NjhmZDA5MjEwMDM4MjI3MzU0NmE4Y2U3NmM5MmE1MWRmYmIxMWM1Nzhh
+    MDI3YzczNzM3ZDMxZTBmN2MwMjM5MmJlYTNjNDJlNTk3M2Q4MjhhMmIwNjM1
+    MzNmOGU2ZGNkZGM1ODM4NDAxNWYyOWQyYjg1Mjk2ZTcxODNhMTQ=
+  data.tar.gz: !binary |-
+    MjFkYzQ2YTk1MzY4NWIxNTQ3NDFlNzYzYWRhZjQ5NTA1ZjFiNmI2NWRjMTgy
+    ZGU5NTY3YzlhMjViZDAzMTNkZGUyZDk5Yjk3ODQ5ZjRhZjBjNWE5Mzc1ZTA0
+    NzBmN2RlYmRjNTY0MTkwOTdiNmZjYTExYjQ5NTY4YjY3MDUxMDM=

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+== 1.0.2
+
+* enhancements
+  * Support joins and includes in column names.
+  * A proc is now accepted by id_column option in json_for_jqgrid method.
+  * Allow the column name in the 'order_by' helper to be quoted.
+  * View helpers are now tested using ActionView::TestCase.
+  * col_model_for_jqgrid is moved from controller helpers to view helpers.
+  * :format option added to json_for_jqgrid helper.
+
+* bug fixes
+  * Fixes issue when using id_column in json_for_jqgrid method.
+
 == 1.0.1
 
 * enhancements

data/README.rdoc

@@ -111,39 +111,23 @@ You can do it better using +content_for+ in the view:
 
 Don't forget to include the jquery and jqgrid javascript and stylesheet files!
 
-== Controllers
-
-There are convenient methods available in the controllers
-
 === col_model_for_jqgrid
 
-This method easily creates an array to be used as col_model.
+This helper easily creates an array to be used as col_model.
 
   col_model_for_jqgrid(['inv_date', 'total' ], {:width => 100})
 
     #=> [{:name=>"inv_date", :index=>"inv_date", :width=>100}, {:name=>"total", :index=>"total", :width=>100}]
 
 
-So, in the controller:
-
-  # app/controllers/invoices_controller.rb
-
-  class InvoicesController < ApplicationController
-
-    def show
-      @col_model = col_model_for_jqgrid(['inv_date', 'total' ], {:width => 180})
-    end
-  end
-
-
-And then you can use it when creating the grid in the helper:
+So you you can use it when creating the grid in the helper:
 
   grid = [{
     :url => '/invoices',
     :datatype => 'json',
     :mtype => 'GET',
     :colNames => ['Inv No','Date'],
-    :colModel  => @col_model,
+    :colModel  => col_model_for_jqgrid(['Inv No','Date']),
     :pager => '#invoices_pager',
     :rowNum => 10,
     :rowList => [10, 20, 30],
@@ -153,6 +137,10 @@ And then you can use it when creating the grid in the helper:
 
   jqgrid_api 'invoices_list', grid
 
+== Controllers
+
+There are convenient methods available in the controllers
+
 === json_for_jqgrid
 
 This method generates the json response for the grid. It takes the records found by the +paginate+ method offered by will_paginate[https://github.com/mislav/will_paginate].

data/lib/app/helpers/jqgrids_helper.rb

@@ -107,6 +107,47 @@ module JqgridsHelper
     end
   end
 
+  # Returns an array to be used as col_model for the grid where each item
+  # is a hash for each column. Each hash will have at least two keys by
+  # default, the +name+ and the +index+, whose values will be the name of
+  # the column. Other keys will be included if present in the +options+
+  # hash.
+  #
+  # * +columns+ - Array with the name of the columns to include in the
+  #   col_model.
+  #
+  # ==== Options
+  #
+  # Every item in the options hash will be a property in the col_model for
+  # every column, unless the item is also a hash, where only will be included
+  # in the specified columns. An item can be also a Proc, that will be called
+  # passing +columns+ as parameter.
+  #
+  # ==== Examples
+  #
+  #   col_model_for_jqgrid(['inv_date', 'total' ])
+  #
+  #     #=> [{:name=>"inv_date", :index=>"inv_date"}, {:name=>"total", :index=>"total"}]
+  #
+  #   col_model_for_jqgrid(['inv_date', 'total' ], {:width => 100})
+  #
+  #     #=> [{:name=>"inv_date", :index=>"inv_date", :width=>100}, {:name=>"total", :index=>"total", :width=>100}]
+  #
+  #   col_model_for_jqgrid(['inv_date', 'total'], {:width => {'inv_date' => 100}})
+  #
+  #     #=> [{:name => 'inv_date', :index => 'inv_date', :width => 100}, {:name => 'total', :index => 'total'}]
+  #
+  #   col_model_for_jqgrid(['inv_date'], {:prop => Proc.new {|c| c.camelize}})
+  #
+  #     #=> [{:name => 'inv_date', :index => 'inv_date', :prop => 'InvDate'}]
+  #
+  def col_model_for_jqgrid columns, options = {}
+    columns.map do |c|
+      h = {:name => c, :index => c}
+      h.merge property_from_options(c, options)
+    end
+  end
+
 private
 
   def wrap_with_document_ready! str
@@ -117,5 +158,20 @@ private
     str.replace("<script>\n#{str}\n</script>")
   end
 
+  def property_from_options col_name, options
+    h = {}
+    options.each do |k, v|
+      case v.class.to_s
+      when "Proc"
+        h[k] = v.call(col_name)
+      when "Hash"
+        h[k] = v[col_name] if v.has_key?(col_name)
+      else
+        h[k] = v
+      end
+    end
+    h
+  end
+
 end
 

data/lib/jqgrid_for_rails/controllers/helpers.rb

@@ -3,46 +3,12 @@ module JqgridForRails
     # Those helpers are convenience methods added to ApplicationController.
     module Helpers
 
-      # Returns an array to be used as col_model for the grid where each item
-      # is a hash for each column. Each hash will have at least two keys by
-      # default, the +name+ and the +index+, whose values will be the name of
-      # the column. Other keys will be included if present in the +options+
-      # hash.
-      #
-      # * +columns+ - Array with the name of the columns to include in the
-      #   col_model.
-      #
-      # ==== Options
-      #
-      # Every item in the options hash will be a property in the col_model for
-      # every column, unless the item is also a hash, where only will be included
-      # in the specified columns. An item can be also a Proc, that will be called
-      # passing +columns+ as parameter.
-      #
-      # ==== Examples
-      #
-      #   col_model_for_jqgrid(['inv_date', 'total' ])
-      #
-      #     #=> [{:name=>"inv_date", :index=>"inv_date"}, {:name=>"total", :index=>"total"}]
-      #
-      #   col_model_for_jqgrid(['inv_date', 'total' ], {:width => 100})
-      #
-      #     #=> [{:name=>"inv_date", :index=>"inv_date", :width=>100}, {:name=>"total", :index=>"total", :width=>100}]
-      #
-      #   col_model_for_jqgrid(['inv_date', 'total'], {:width => {'inv_date' => 100}})
-      #
-      #     #=> [{:name => 'inv_date', :index => 'inv_date', :width => 100}, {:name => 'total', :index => 'total'}]
-      #
-      #   col_model_for_jqgrid(['inv_date'], {:prop => Proc.new {|c| c.camelize}})
-      #
-      #     #=> [{:name => 'inv_date', :index => 'inv_date', :prop => 'InvDate'}]
-      #
+      # DEPRECATED! Moved to jqgrids_helper.rb
       def col_model_for_jqgrid columns, options = {}
         columns.map do |c|
           h = {:name => c, :index => c}
           h.merge property_from_options(c, options)
         end
-
       end
 
       # Returns a json string ready to be sent to a jqgrid component.
@@ -55,7 +21,9 @@ module JqgridForRails
       # ==== Options
       #
       # * <tt>:id_column</tt> - Says which is the column that should be used as
-      #   the row id.
+      #   the row id. This should a be the column name, but it can also be a
+      #   Proc, in which case the record will be passed to the proc. See examples
+      #   for more info.
       #
       # * <tt>:id_prefix</tt> - If specified, the +column_id+ option will be
       #   concatenated to this prefix. This helps to keep the html id unique in
@@ -65,9 +33,29 @@ module JqgridForRails
       #   localized with the <tt>I18n.l</tt> method. The field content must be
       #   of any class accepted by the method. I.e. Time, DateTime, Date.
       #
+      # * <tt>:format</tt> - Says the proc and the columns where to apply it. It
+      #   can be used to change the format of the field as well as to run any other
+      #   code on it. If the key of the hash is not a column name but an array of
+      #   column names, the proc is applied to all of them.
+      #
       # * <tt>:page</tt> - Says the page number (Deprecated. The page number is
       #   now inferred from +records+.
       #
+      # ==== Examples
+      #
+      #   records = Invoice.paginate(:page => 1)
+      #   my_proc = Proc.new {|r| "invid_#{r.invid}" }
+      #   json_for_jqgrid(records, ['invdate', 'amount', 'total' ], {:id_column => my_proc })
+      #
+      #   # => {"rows":[{"cell":["2011-01-01T00:00:00Z",10.0,11.0],"id":"invid_1"}],"total":1,"page":1,"records":1}
+      #
+      #   records   = Invoice.paginate(:page => 1)
+      #   my_format = Proc.new {|val| val + 100 }
+      #   json_for_jqgrid(records, ['invdate', 'amount', 'total' ], {:format => { 'total' => my_format })
+      #
+      #   # Because of the :format option, 100 is added to 'total' field.
+      #   # => {"rows":[{"cell":["2011-01-01T00:00:00Z",10.0,111.0],"id":"invid_1"}],"total":2,"page":1,"records":1}
+      #
       def json_for_jqgrid records, columns = nil, options = {}
 
         columns ||= (records.first.attributes.keys rescue [])
@@ -83,34 +71,51 @@ module JqgridForRails
       end
 
       # Returns the 'order by' string created using the params received from the jqgrid.
+      # If +quote_char+ is specified, the column name used in the 'order by' clause will
+      # be quoted.
       #
       # ==== Example
       #
       #   order_by_from_params({'sidx' => 'updated_at', 'sord' => 'asc'})
       #   #=> 'updated_at asc'
       #
-      def order_by_from_params params
-        order_by = params['sidx'] unless params['sidx'].blank?
+      #   order_by_from_params({'sidx' => 'updated_at', 'sord' => 'desc'}, '`')
+      #   #=> '`updated_at` desc'
+      #
+      def order_by_from_params params, quote_char = nil
+        order_by = quote(params['sidx'], quote_char) unless params['sidx'].blank?
         order_by << " #{params['sord']}" if params['sord'] && order_by
         order_by
       end
 
     private
 
+      def quote value, quote_char
+        "#{quote_char}#{value}#{quote_char}"
+      end
+
       # Returns a hash with the values for a jqgrid json row.
       def row_from_record(r, columns, options)
-        attribs = r.attributes
+        localize(attribs, options[:translate]) if options[:translate]
 
-        # Localize Date, Time or DateTime fields
-        locale_classes = [Time, Date, DateTime]
-        if options[:translate].is_a?(Array) && I18n
-          options[:translate].each do |col|
-            attribs[col.to_s] = I18n.l(attribs[col.to_s]) if locale_classes.include?(attribs[col.to_s].class)
-          end
+        format(attribs, options[:format]) if options[:format]
+
+        values = columns.map do |column|
+          column.split('.').inject(r) { |o, a| o.public_send(a) }
         end
 
-        {:id => "#{options[:id_prefix]}#{attribs[options[:id_column]]}",
-         :cell => attribs.values_at(*columns) }
+        {
+          :id   => "#{options[:id_prefix]}#{id_column_from_options(r, options)}",
+          :cell => values
+        }
+      end
+
+      def id_column_from_options record, options
+        if options[:id_column].class.to_s == 'Proc'
+          options[:id_column].call(record)
+        else
+          record.attributes[options[:id_column]]
+        end
       end
 
       def property_from_options col_name, options
@@ -127,6 +132,30 @@ module JqgridForRails
         end
         h
       end
+
+      # Localize Date, Time or DateTime fields
+      def localize attribs, translate
+        locale_classes = [Time, Date, DateTime]
+        if translate.is_a?(Array) && I18n
+          translate.each do |col|
+            attribs[col.to_s] = I18n.l(attribs[col.to_s]) if locale_classes.include?(attribs[col.to_s].class)
+          end
+        end
+      end
+
+      # Format fields
+      def format attribs, format
+        if format.is_a?(Hash)
+          format.each do |col, pr|
+            if col.is_a?(Array)
+              col.each {|c| attribs[c] = pr.call(attribs[c])}
+            else
+              attribs[col] = pr.call(attribs[col])
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/jqgrid_for_rails/version.rb

@@ -1,4 +1,4 @@
 module JqgridForRails
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end
 

data/test/controllers/helpers_test.rb

@@ -1,4 +1,4 @@
-require 'test/test_helper' 
+require 'test/test_helper'
 
 class MockController < ApplicationController
 end
@@ -31,6 +31,11 @@ class ControllerHelpersTest < ActionController::TestCase
     assert_nil @controller.order_by_from_params(params)
   end
 
+  test "order_by_from with quoting char" do
+    params = {'sidx' => 'updated_at', 'sord' => 'desc'}
+    assert_equal '`updated_at` desc', @controller.order_by_from_params(params, '`')
+  end
+
   test "json_for_grid with empty records result" do
     records = Invoice.paginate(:page => 1)
     json    = @controller.json_for_jqgrid(records)
@@ -44,64 +49,49 @@ class ControllerHelpersTest < ActionController::TestCase
   test "json_for_grid with one record and id prefix" do
     tmp_record  = Invoice.create({:invid => 1, :invdate => '2011-01-01 00:00:00', :amount => 10, :tax => 1, :total => 11, :note => '' })
     records     = Invoice.paginate(:page => 1)
-    json        = @controller.json_for_jqgrid(records, ['invdate', 'amount', 'total' ], {:id_column => 'invid', :id_prefix => 'mygrid_row_'})
+    json        = @controller.json_for_jqgrid(records, ['amount', 'total' ], {:id_column => 'invid', :id_prefix => 'mygrid_row_'})
     hash        = ActiveSupport::JSON.decode(json)
     Invoice.delete(tmp_record.id)
-    assert_equal hash["total"], 1
-    assert_equal hash["page"], 1
-    assert_equal hash["records"], 1
-    assert_equal hash["rows"][0]["cell"], [Time.utc('2011-01-01 00:00:00'), 10.0, 11.0]
-    assert_equal hash["rows"][0]["id"], "mygrid_row_1"
+    assert_equal 1, hash["total"]
+    assert_equal 1, hash["page"]
+    assert_equal 1, hash["records"]
+    assert_equal [10.0, 11.0], hash["rows"][0]["cell"]
+    assert_equal "mygrid_row_1", hash["rows"][0]["id"]
   end
 
-  test "col_model_for_jqgrid should return a valid model for the grid" do
-    columns = ['inv_date', 'amount', 'total' ]
-    result  = @controller.col_model_for_jqgrid(columns)
-    assert_equal [
-      {:name => 'inv_date', :index => 'inv_date'},
-      {:name => 'amount', :index => 'amount'},
-      {:name => 'total', :index => 'total'}
-      ], result
-  end
+  test "json_for_jqgrid with proc for id_column" do
+    tmp_record  = Invoice.create({:invid => 1, :invdate => '2011-01-01 00:00:00', :amount => 10, :tax => 1, :total => 11, :note => '' })
+    records     = Invoice.paginate(:page => 1)
+    my_proc     = Proc.new { |r| "invid_#{r.invid}" }
+    json        = @controller.json_for_jqgrid(records, ['invdate', 'amount', 'total' ], {:id_column => my_proc })
+    hash        = ActiveSupport::JSON.decode(json)
+    Invoice.delete(tmp_record.id)
 
-  test "col_model_for_jqgrid with default width for every column" do
-    columns = ['inv_date', 'amount', 'total' ]
-    result  = @controller.col_model_for_jqgrid(columns, {:width => 100})
-    assert_equal [
-      {:name => 'inv_date', :index => 'inv_date', :width => 100},
-      {:name => 'amount', :index => 'amount', :width => 100},
-      {:name => 'total', :index => 'total', :width => 100}
-      ], result
+    assert_equal 'invid_1', hash["rows"].first["id"]
   end
 
-  test "col_model_for_jqgrid with explicity width for some columns" do
-    columns = ['inv_date', 'amount', 'total' ]
-    result  = @controller.col_model_for_jqgrid(columns, {:width => {'inv_date' => 100, 'total' => 150}})
-    assert_equal [
-      {:name => 'inv_date', :index => 'inv_date', :width => 100},
-      {:name => 'amount', :index => 'amount'},
-      {:name => 'total', :index => 'total', :width => 150}
-      ], result
-  end
+  test "json_for_jqgrid should allow to format field with a proc" do
+    tmp_record  = Invoice.create({:invid => 1, :invdate => '2011-01-01 00:00:00', :amount => 10, :tax => 1, :total => 11, :note => '123,456.123' })
+    records     = Invoice.paginate(:page => 1)
+    my_proc     = Proc.new { |r| (r.gsub(/,/, '').to_f) }
+    json        = @controller.json_for_jqgrid(records, ['invdate', 'amount', 'total', 'note' ], {:format => {'note' => my_proc }})
+    hash        = ActiveSupport::JSON.decode(json)
+    Invoice.delete(tmp_record.id)
 
-  test "col_model_for_jqgrid with explicity property for some columns" do
-    columns = ['inv_date', 'amount', 'total' ]
-    result  = @controller.col_model_for_jqgrid(columns, {:property_1 => {'inv_date' => 'high', 'total' => 'low'}, :property_2 => true})
-    assert_equal [
-      {:name => 'inv_date', :index => 'inv_date', :property_1 => 'high', :property_2 => true},
-      {:name => 'amount', :index => 'amount', :property_2 => true},
-      {:name => 'total', :index => 'total', :property_1 => 'low', :property_2 => true}
-      ], result
+    assert_equal 123456.123, hash["rows"].first["cell"].last
   end
 
-  test "col_model_for_jqgrid with proc as property" do
-    columns = ['inv_date', 'amount', 'total' ]
-    result  = @controller.col_model_for_jqgrid(columns, {:property_1 => Proc.new {|c| c.camelize}})
-    assert_equal [
-      {:name => 'inv_date', :property_1 => 'InvDate', :index => 'inv_date'},
-      {:name => 'amount', :property_1 => 'Amount', :index => 'amount'},
-      {:name => 'total', :property_1 => 'Total', :index => 'total'}
-      ], result
+  test "json_for_jqgrid should allow to format many fields with a proc" do
+    tmp_record  = Invoice.create({:invid => 1, :invdate => '2011-01-01 00:00:00', :amount => 10, :tax => 1, :total => 11, :note => '123,456.123' })
+    records     = Invoice.paginate(:page => 1)
+    my_proc     = Proc.new { |r| (r * 2) }
+    json        = @controller.json_for_jqgrid(records, ['invdate', 'amount', 'total', 'note' ], {:format => {['amount', 'total'] => my_proc }})
+    hash        = ActiveSupport::JSON.decode(json)
+    Invoice.delete(tmp_record.id)
+
+    assert_equal 20, hash["rows"].first["cell"][1]
+    assert_equal 22, hash["rows"].first["cell"][2]
   end
 
+
 end

data/test/jqgrids_helper_test.rb

@@ -1,14 +1,17 @@
+require "action_view/test_case"
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class MockView < ActionView::Base
   include JqgridsHelper
 end
 
-class JqgridsHelperTest < Test::Unit::TestCase
-
-  def test_jqgrid_small
+class JqgridsHelperTest < ActionView::TestCase
 
+  def setup
     @template = MockView.new
+  end
+
+  test "jqgrid small" do
 
     grid_id = 'grid_id'
     grid_options = [{:url => "/jqGridModel?model=Wine" }]
@@ -18,12 +21,9 @@ class JqgridsHelperTest < Test::Unit::TestCase
     expected << '</script>'
 
     assert_equal(expected, @template.jqgrid_api(grid_id, grid_options, {:script_tags => true}))
-
   end
 
-  def test_jqgrid_medium
-
-    @template = MockView.new
+  test "jqgrid_medium" do
 
     grid_id       = 'grid_id'
     pager_id      = 'gridpager'
@@ -38,23 +38,7 @@ class JqgridsHelperTest < Test::Unit::TestCase
     assert_equal(expected, @template.jqgrid_api(grid_id, grid_options, options))
   end
 
-  def expected_grid grid_id, pager_id, options
-
-    options[:script_tags] ||= true
-
-    js =  'jQuery(document).ready(function() {
-            jQuery("#' + grid_id + '").jqGrid({
-              "pager":jQuery(\'#' + pager_id + '\')
-            });
-          });'
-    js.gsub!(/\n\s+/, '')
-    js = "<script>\n#{js}\n</script>" if options[:script_tags]
-    js
-
-  end
-
-  def test_jqgrid_nav_options
-    @template = MockView.new
+  test "jqgrid nav_options" do
 
     grid_id       = 'grid_id'
     pager_id      = 'pager_id'
@@ -69,17 +53,14 @@ class JqgridsHelperTest < Test::Unit::TestCase
     assert_equal(expected, @template.jqgrid_api(grid_id, [grid_options], [:navGrid, "##{pager_id}", {:del => true }, {}, {}, {:closeOnEscape => true}], options))
   end
 
-  def test_pager_id_from_options
-    @template = MockView.new
-
+  test "pager_id_from_options" do
     assert_equal 'my_pager_div', @template.send(:pager_id_from_options, {:pager => "jQuery('#my_pager_div')"})
     assert_equal 'my_pager_div', @template.send(:pager_id_from_options, {:pager => 'jQuery("#my_pager_div")'})
     assert_equal 'my_pager_div', @template.send(:pager_id_from_options, {:pager => "#my_pager_div"})
     assert_equal 'my_pager_div', @template.send(:pager_id_from_options, {:pager => "my_pager_div"})
   end
 
-  def test_chained_functions
-    @template = MockView.new
+  test "chained_functions" do
     div_id = 'my_grid'
     nav_button =  [:navButtonAdd, '#pager', { :caption => 'Add'}]
     nav_separator =  [:navSeparatorAdd, '#pager']
@@ -90,4 +71,71 @@ class JqgridsHelperTest < Test::Unit::TestCase
 
   end
 
+  test "col_model_for_jqgrid should return a valid model for the grid" do
+    columns = ['inv_date', 'amount', 'total' ]
+    result  = @template.col_model_for_jqgrid(columns)
+    assert_equal [
+      {:name => 'inv_date', :index => 'inv_date'},
+      {:name => 'amount', :index => 'amount'},
+      {:name => 'total', :index => 'total'}
+      ], result
+  end
+
+  test "col_model_for_jqgrid with default width for every column" do
+    columns = ['inv_date', 'amount', 'total' ]
+    result  = @template.col_model_for_jqgrid(columns, {:width => 100})
+    assert_equal [
+      {:name => 'inv_date', :index => 'inv_date', :width => 100},
+      {:name => 'amount', :index => 'amount', :width => 100},
+      {:name => 'total', :index => 'total', :width => 100}
+      ], result
+  end
+
+  test "col_model_for_jqgrid with explicity width for some columns" do
+    columns = ['inv_date', 'amount', 'total' ]
+    result  = @template.col_model_for_jqgrid(columns, {:width => {'inv_date' => 100, 'total' => 150}})
+    assert_equal [
+      {:name => 'inv_date', :index => 'inv_date', :width => 100},
+      {:name => 'amount', :index => 'amount'},
+      {:name => 'total', :index => 'total', :width => 150}
+      ], result
+  end
+
+  test "col_model_for_jqgrid with explicity property for some columns" do
+    columns = ['inv_date', 'amount', 'total' ]
+    result  = @template.col_model_for_jqgrid(columns, {:property_1 => {'inv_date' => 'high', 'total' => 'low'}, :property_2 => true})
+    assert_equal [
+      {:name => 'inv_date', :index => 'inv_date', :property_1 => 'high', :property_2 => true},
+      {:name => 'amount', :index => 'amount', :property_2 => true},
+      {:name => 'total', :index => 'total', :property_1 => 'low', :property_2 => true}
+      ], result
+  end
+
+  test "col_model_for_jqgrid with proc as property" do
+    columns = ['inv_date', 'amount', 'total' ]
+    result  = @template.col_model_for_jqgrid(columns, {:property_1 => Proc.new {|c| c.camelize}})
+    assert_equal [
+      {:name => 'inv_date', :property_1 => 'InvDate', :index => 'inv_date'},
+      {:name => 'amount', :property_1 => 'Amount', :index => 'amount'},
+      {:name => 'total', :property_1 => 'Total', :index => 'total'}
+      ], result
+  end
+
+private
+
+  def expected_grid grid_id, pager_id, options
+
+    options[:script_tags] ||= true
+
+    js =  'jQuery(document).ready(function() {
+            jQuery("#' + grid_id + '").jqGrid({
+              "pager":jQuery(\'#' + pager_id + '\')
+            });
+          });'
+    js.gsub!(/\n\s+/, '')
+    js = "<script>\n#{js}\n</script>" if options[:script_tags]
+    js
+
+  end
+
 end

metadata

@@ -1,44 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jqgrid_for_rails
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Juan Manuel Cuello
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-13 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple solution to create jqgrids easily using Rails
 email: juanmacuello@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.rdoc
 - MIT-LICENSE
@@ -62,37 +53,27 @@ files:
 - test/schema.rb
 - test/test_helper.rb
 - uninstall.rb
-has_rdoc: true
 homepage: http://github.com/Juanmcuello/jqgrid_for_rails
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple solution to create jqgrids easily using Rails
 test_files: []
-