datagrid 0.0.3 → 0.1.0

data/Readme.md

@@ -1,9 +1,11 @@
-## Datagrid
+# Datagrid
 
 Ruby library that helps you to build and repsend table like data with:
 
-* Filtering
+* Customizable filtering
+* Columns
 * Sort order
+* Localization
 * Exportort to CSV
 
 
@@ -16,6 +18,10 @@ In order to create a report You need to define:
 * columns that should be displayed and sortable(if possible)
 
 
+### Working grid example
+
+In order to create a grid:
+
 ``` ruby
 
 class SimpleReport
@@ -30,27 +36,45 @@ class SimpleReport
   filter(:category, :enum, :select => ["first", "second"])
   filter(:disabled, :eboolean)
   filter(:confirmed, :boolean)
+  filter(:group_id, :multiple => true)
   integer_range_filter(:logins_count, :integer)
-  filter(:group_name) do |value|
+  filter(:group_name, :header => "Group") do |value|
     self.joins(:group).where(:groups => {:name => value})
   end
 
-  column(:group, :order => "groups.name") do |model|
-    group.name
-  end
 
   column(:name)
+  column(:group, :order => "groups.name") do |user|
+    user.name
+  end
+  column(:active, :header => "Activated") do |user|
+    !user.disabled
+  end
+
 
 
 end
 
 
-report = SimpleReport.new(:group_id => 5, :from_logins_count => 1, :category => "first")
-report.assets # => Array of User: SELECT * FROM users WHERE users.group_id = 5 AND users.logins_count >= 1 AND users.category = 'first'
-report.header
-report.rows
-report.data
+```
 
+Basic grid api:
+
+``` ruby
+report = SimpleReport.new(:order => "group", :reverse => true, :group_id => [1,2], :from_logins_count => 1, :category => "first")
+
+report.assets # => Array of User instances: 
+              # SELECT * FROM users WHERE users.group_id in (1,2) AND users.logins_count >= 1 AND users.category = 'first' ORDER BY groups.name DESC
+
+report.header # => ["Group", "Name", "Disabled"]
+report.rows   # => [
+              #      ["Steve", "Spammers", true],
+              #      [ "John", "Spoilers", true],
+              #      ["Berry", "Good people", false]
+              #    ]
+report.data   # => [ header, *rows]
+
+report.to_csv # => Yes, it is
 ```
 
 ### Scope
@@ -63,8 +87,8 @@ In common case it is `ActiveRecord::Base` subclass with some generic scopes like
 Each filter definition consists of:
 
 * name of the filter
-* type that will be used for value conversion
-* conditions block that cegerates `ActiveRecord` scope
+* type that will be used for value typecast
+* conditions block that applies to defined scope
 * additional options
 
 Datagrid supports different type of filters including:
@@ -82,7 +106,9 @@ Read more about filters here:
 ### Columns
 
 Each column is represented by name and code block to calculate the value.
-If no block given the value will be the result of column name method call on object defined in Scope.
+Grids are sortable by it's columns. Ordering is controller by `#order` and `#reverse` attributes.
+
+More information about columns here:
 
 
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/datagrid.gemspec

@@ -5,16 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datagrid}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-06-02}
+  s.date = %q{2011-06-21}
   s.description = %q{This allows you to easily build datagrid aka data tables with sortable columns and filters}
   s.email = %q{agresso@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
+    "LICENSE.txt"
   ]
   s.files = [
     ".document",
@@ -22,8 +21,8 @@ Gem::Specification.new do |s|
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
-    "README.rdoc",
     "Rakefile",
+    "Readme.md",
     "VERSION",
     "datagrid.gemspec",
     "lib/datagrid.rb",
@@ -43,10 +42,14 @@ Gem::Specification.new do |s|
     "lib/datagrid/form_builder.rb",
     "lib/datagrid/helper.rb",
     "lib/datagrid/rspec.rb",
+    "spec/datagrid/columns_spec.rb",
+    "spec/datagrid/form_builder_spec.rb",
+    "spec/datagrid/helper_spec.rb",
     "spec/datagrid_spec.rb",
-    "spec/simple_report_spec.rb",
     "spec/spec_helper.rb",
-    "tags"
+    "spec/support/equal_to_dom.rb",
+    "spec/support/schema.rb",
+    "spec/support/simple_report.rb"
   ]
   s.homepage = %q{http://github.com/bogdan/datagrid}
   s.licenses = ["MIT"]
@@ -62,7 +65,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, [">= 0"])
       s.add_development_dependency(%q<rake>, ["= 0.8.7"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<rspec-rails>, ["= 2.6.0"])
       s.add_development_dependency(%q<rspec>, ["= 2.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
@@ -76,7 +78,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<rspec-rails>, ["= 2.6.0"])
       s.add_dependency(%q<rspec>, ["= 2.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
@@ -91,7 +92,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<rspec-rails>, ["= 2.6.0"])
     s.add_dependency(%q<rspec>, ["= 2.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])

data/lib/datagrid/columns.rb

@@ -26,9 +26,67 @@ module Datagrid
         @columns ||= []
       end
 
+      # Defines column that will be used to display data.
+      # 
+      # Example:
+      #     
+      #   class UserGrid 
+      #     include Datagrid
+      #
+      #     scope do
+      #       User.order("users.created_at desc").includes(:group)
+      #     end
+      #
+      #     column(:name)
+      #     column(:group, :order => "groups.name")
+      #       self.group.name
+      #     end
+      #     column(:active, :header => "Activated") do |user|
+      #       !user.disabled
+      #     end
+      #
+      #   end
+      #
+      # Each column will be used to generate data.
+      # In order to create grid that display all users:
+      #
+      #   grid = UserGrid.new
+      #   grid.rows 
+      #   grid.header # => ["Group", "Name", "Disabled"]
+      #   grid.rows   # => [
+      #               #      ["Steve", "Spammers", true],
+      #               #      [ "John", "Spoilers", true],
+      #               #      ["Berry", "Good people", false]
+      #               #    ]
+      #   grid.data   # => Header & Rows
+      #
+      # = Column value
+      #
+      # Column value can be defined by passing a block to <tt>#column</tt> method.
+      # If no block given column is generated automatically by sending column name method to model.
+      # The block could have zero arguments(<tt>instance_eval</tt>) or one argument that is model object.
+      #
+      # = Columns order
+      #
+      # Each column supports <tt>:order</tt> option that is used to specify SQL to sort data by the given column.
+      # In order to specify order for the given grid the following attributes are used:
+      #
+      # * <tt>:order</tt> - column name to use order. Default: nil.
+      # * <tt>:reverse</tt> - if true descending suffix is added to specified order. Default: false.
+      #
+      # 
+      # Example:
+      #
+      #   grid = UserGrid.new(:order => :group, :reverse => true)
+      #   grid.assets # => Return assets ordered by :group column descending
+      #
+      # = Options
+      #
+      # TODO
       def column(name, options = {}, &block)
-        block ||= lambda do
-          self.send(name)
+        check_scope_defined!("Scope should be defined before columns")
+        block ||= lambda do |model|
+          model.send(name)
         end
         self.columns << Datagrid::Columns::Column.new(self, name, options, &block)
       end
@@ -56,12 +114,16 @@ module Datagrid
         result
       end
 
-      def data
+      def rows
         self.assets.map do |asset|
           self.row_for(asset)
         end
       end
 
+      def data
+        self.rows.unshift(self.header)
+      end
+
       def data_hash
         self.assets.map do |asset|
           hash_for(asset)
@@ -73,7 +135,7 @@ module Datagrid
         if self.order
           column = column_by_name(self.order)
           raise Datagrid::OrderUnsupported, "Can not sort #{self.inspect} by #{name.inspect}" unless column
-          result = result.order(self.reverse ? column.order : column.desc_order)
+          result = result.order(self.reverse ? column.desc_order : column.order)
         end
         result
       end
@@ -83,7 +145,7 @@ module Datagrid
         FasterCSV.generate(
           {:headers => self.header, :write_headers => true}.merge(options)
         ) do |csv|
-          self.data.each do |row|
+          self.rows.each do |row|
             csv << row
           end
         end

data/lib/datagrid/columns/column.rb

@@ -15,7 +15,11 @@ class Datagrid::Columns::Column
   end
 
   def value_for(object)
-    object.instance_eval(&self.block)
+    if self.block.arity == 1
+      self.block.call(object)
+    else
+      object.instance_eval(&self.block)
+    end
   end
 
   def format
@@ -40,7 +44,7 @@ class Datagrid::Columns::Column
   end
 
   def desc_order
-    order ? order.to_s + " DESC" : nil
+    self.options[:desc_order]  || (order ? order.to_s + " DESC" : nil)
   end
 
 end

data/lib/datagrid/core.rb

@@ -35,7 +35,7 @@ module Datagrid
         if block
           @scope = block
         else
-          raise(Datagrid::ConfigurationError, "Scope not defined") unless @scope
+          check_scope_defined!
           @scope.call
         end
       end
@@ -44,6 +44,11 @@ module Datagrid
         self.to_s.underscore.split('/').last
       end
 
+      protected
+      def check_scope_defined!(message = "Scope not defined")
+        raise(Datagrid::ConfigurationError, message) unless @scope
+      end
+
     end # ClassMethods
 
     module InstanceMethods
@@ -90,10 +95,17 @@ module Datagrid
         self.class.scope
       end
 
+
       def param_name
         self.class.param_name
       end
       
+      protected
+
+      def check_scope_defined!(message)
+        self.class.check_scope_defined!(message)
+      end
+
     end # InstanceMethods
   end
 end

data/lib/datagrid/filters.rb

@@ -53,17 +53,18 @@ module Datagrid
       #   class UserGrid 
       #     include Datagrid
       #
+      #     scope do
+      #       User.order("users.created_at desc")
+      #     end
+      #
       #     filter(:name)
       #     filter(:posts_count, :integer) do |value|
       #       self.where(["posts_count >= ?", value])
       #     end
       #
-      #     scope do
-      #       User.order("users.created_at desc")
-      #     end
       #   end
       #
-      # Each filter becomes grid atttribute.
+      # Each filter becomes grid attribute.
       # In order to create grid that display all users with name 'John' that have more than zero posts:
       #
       #   grid = UserGrid.new(:posts_count => 1, :name => "John")
@@ -81,14 +82,23 @@ module Datagrid
       # Filter does types conversion automatically.
       # The following filter types are supported:
       #
-      # * <tt>:string</tt> (default) - converts value to string
+      # * <tt>:default</tt> (default) - leave value as is
       # * <tt>:date</tt> - converts value to date using date parser
       # * <tt>:enum</tt> - designed to be collection select. Additional options for easy form generation:
-      #   * <tt>:select</tt> (required) - collection of values to match agains.
-      #   * <tt>:multiple</tt> - if true multiple values can be assigned to this filter. Default: false.
-      # * <tt>:eboolean</tt> - subtype of enum filter that provides select of "Yes", "No" and "Any". Could be useful.
+      #   * <tt>:select</tt> (required) - collection of values to match against.
+      # * <tt>:boolean</tt> - converts value to true or false depending on whether it looks truly or not
       # * <tt>:integer</tt> - converts given value to integer.
+      # * <tt>:eboolean</tt> - subtype of enum filter that provides select of "Yes", "No" and "Any". Could be useful.
       #   
+      # = Default filter options
+      #
+      # Options that could be passed to any filter type:
+      #
+      # * <tt>:header</tt> - human readable name of the filter. Default: generated from the filter name.
+      # * <tt>:default</tt> - default value of the filter. Default: nil.
+      # * <tt>:multiple</tt> - if true multiple values can be assigned to this filter. Default: false.
+      # * <tt>:allow_nil</tt> - determines if filter should be called if filter value is nil. Default: false.
+      # * <tt>:allow_blank</tt> - determines if filter should be called if filter value is #blank?. Default: false.
       #
       def filter(attribute, type = :string, options = {}, &block)
 
@@ -101,13 +111,14 @@ module Datagrid
         self.filters << filter
 
         datagrid_attribute(attribute) do |value|
-          filter.format(value)
+          filter.format_values(value)
         end
 
       end
 
       protected
       def default_filter(attribute)
+        check_scope_defined!("Scope should be defined before filters")
         if self.scope.column_names.include?(attribute.to_s)
           lambda do |value|
             self.scoped(:conditions => {attribute => value})

data/lib/datagrid/filters/base_filter.rb

@@ -11,23 +11,35 @@ class Datagrid::Filters::BaseFilter
     self.block = block
   end
 
+  def format(value)
+    raise NotImplementedError, "#format(value) suppose to be overwritten"
+  end
+
   def apply(scope, value)
     return scope if value.nil? && !options[:allow_nil]
     return scope if value.blank? && !options[:allow_blank]
     ::Datagrid::Filters::FilterEval.new(self, scope, value).run
   end
 
-  def format(value)
-    raise NotImplementedError, "#format(value) suppose to be overwritten"
+  def format_values(value)
+    values = Array(value)
+    values.map! do |value|
+      self.format(value)
+    end
+    self.multiple ? values : values.first
   end
 
   def header
-    I18n.translate(self.name, :scope => "datagrid.#{grid.class.to_s.underscore.split("/").last}.filters", :default => self.name.to_s.humanize)
+    options[:header] || 
+      I18n.translate(self.name, :scope => "datagrid.#{grid.class.to_s.underscore.split("/").last}.filters", :default => self.name.to_s.humanize)
   end
 
   def default
     self.options[:default]
   end
 
+  def multiple
+    self.options[:multiple]
+  end
 end
 

data/lib/datagrid/filters/date_filter.rb

@@ -1,8 +1,10 @@
 class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
   #TODO: more smart date normalizer
   def format(value)
+    return nil if value.blank?
+    return value.to_date if value.respond_to?(:to_date)
     return value unless value.is_a?(String)
-    value.blank? ? nil : Date.parse(value)
+    Date.parse(value)
   rescue ArgumentError
     nil
   end

data/lib/datagrid/filters/enum_filter.rb

@@ -4,13 +4,10 @@ class Datagrid::Filters::EnumFilter < Datagrid::Filters::BaseFilter
     super(*args)
     raise Datagrid::ConfigurationError, ":select option not specified" unless select
   end
+
   def format(value)
-    values = Array.new([*value])
-    values.reject do |value|
-      #TODO: really impelement #strict option
-      self.strict && !select.include?(value)
-    end
-    self.multiple ? values : values.first
+    return nil if self.strict && !select.include?(value)
+    value
   end
 
   def select
@@ -26,7 +23,4 @@ class Datagrid::Filters::EnumFilter < Datagrid::Filters::BaseFilter
     self.options[:strict]
   end
 
-  def multiple
-    self.options[:multiple]
-  end
 end

data/lib/datagrid/rspec.rb

@@ -1,3 +1,5 @@
+require "datagrid"
+
 shared_examples_for "Datagrid" do
   describe "as Datagrid" do
 

data/spec/datagrid/columns_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Datagrid::Columns do
+  
+  let(:group) { Group.create!(:name => "Pop") }
+  let!(:entry) {  Entry.create!(
+    :group => group, :name => "Star", :disabled => false, :confirmed => false, :category => "first"
+  ) }
+  
+  subject do
+    SimpleReport.new
+  end
+  it "should build rows of data" do
+    subject.rows.should == [["Pop", "Star"]]
+  end
+  it  "should generate header" do
+    subject.header.should == ["Group", "Name"]
+  end
+
+  it "should generate data" do
+    subject.data.should == [
+      subject.header,
+      subject.row_for(entry)
+    ]
+  end
+
+  it "should support csv export" do
+    subject.to_csv.should == "Group,Name\nPop,Star\n"
+  end
+end

data/spec/datagrid/form_builder_spec.rb

@@ -30,7 +30,7 @@ describe Datagrid::FormBuilder do
     context "with integer filter type" do
       let(:_filter) { :group_id }
       it { should equal_to_dom(
-        '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
+        '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text" value=""/>'
       )}
     end
     context "with enum filter type" do

data/spec/datagrid_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
+require "datagrid/rspec"
 
 
-describe SimpleReport do
+describe Datagrid do
   
-  it_should_behave_like 'Datagrid'
+  #it_should_behave_like 'Datagrid'
   
   let(:group) { Group.create!(:name => "Pop") }
   
@@ -40,17 +41,23 @@ describe SimpleReport do
 
     context "when not defined on class level" do
       before(:each) do
+        @scope = SimpleReport.instance_variable_get("@scope")
         SimpleReport.instance_variable_set("@scope", nil)
       end
 
+      after(:each) do
+        SimpleReport.instance_variable_set("@scope", @scope)
+      end
+
       it "should raise ConfigurationError" do
         lambda {
           subject.scope
         }.should raise_error(Datagrid::ConfigurationError)
         
       end
-      
     end
   end
 
+
+
 end

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require 'rspec'
 require "active_record"
 require "will_paginate"
 require 'datagrid'
-require "datagrid/rspec"
 require 'ruby-debug'
 
 

data/spec/support/schema.rb

@@ -19,10 +19,12 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :category
     t.boolean :disabled, :null => false, :default => nil
     t.boolean :confirmed, :null => false, :default => nil
+    t.timestamps
   end
 
   create_table :groups do |t|
     t.string :name
+    t.timestamps
   end
 
   class ::Entry < ActiveRecord::Base

data/spec/support/simple_report.rb

@@ -4,10 +4,10 @@ class SimpleReport
 
 
   scope do
-    ::Entry.includes(:group)
+    ::Entry.includes(:group).order("entries.created_at")
   end
 
-  filter(:group_id, :integer)
+  filter(:group_id, :integer, :multiple => true)
   filter(:category, :enum, :select => ["first", "second"])
   filter(:disabled, :eboolean)
   filter(:confirmed, :boolean)
@@ -15,11 +15,13 @@ class SimpleReport
     self.scoped(:conditions => {:name => value})
   end
 
-  column(:group, :order => "groups.name") do |model|
-    group.name
+  column(:group, :order => "groups.name") do
+    self.group.name
   end
 
-  column(:name)
+  column(:name) do |user|
+    user.name
+  end
 
   def param_name
     :report

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,14 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 +03:00
+date: 2011-06-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  prerelease: false
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -47,12 +45,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id002
+  prerelease: false
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  prerelease: false
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -77,12 +75,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id004
+  prerelease: false
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  type: :development
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +91,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
+  prerelease: false
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +107,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  requirement: *id006
+  prerelease: false
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
-  prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,12 +121,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  prerelease: false
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
-  type: :development
-  prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,12 +135,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  prerelease: false
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :development
-  prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +149,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  prerelease: false
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: fastercsv
-  type: :development
-  prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -165,12 +163,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  prerelease: false
+  type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :development
-  prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -179,12 +177,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  prerelease: false
+  type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  type: :development
-  prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -195,7 +193,9 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  requirement: *id012
+  prerelease: false
+  type: :development
+  version_requirements: *id012
 description: This allows you to easily build datagrid aka data tables with sortable columns and filters
 email: agresso@gmail.com
 executables: []
@@ -204,14 +204,12 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE.txt
-- README.rdoc
 files: 
 - .document
 - .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
 - Rakefile
 - Readme.md
 - VERSION
@@ -233,6 +231,7 @@ files:
 - lib/datagrid/form_builder.rb
 - lib/datagrid/helper.rb
 - lib/datagrid/rspec.rb
+- spec/datagrid/columns_spec.rb
 - spec/datagrid/form_builder_spec.rb
 - spec/datagrid/helper_spec.rb
 - spec/datagrid_spec.rb

data/README.rdoc

@@ -1,19 +0,0 @@
-= datagrid
-
-Description goes here.
-
-== Contributing to datagrid
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Bogdan Gusiev. See LICENSE.txt for
-further details.
-