datagrid 0.4.1 → 0.5.0

data/Gemfile.lock

@@ -1,91 +1,105 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
     accept_values_for (0.4.3)
       activemodel (>= 3.0.0)
       rspec
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.10)
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
     bson (1.4.0)
     bson_ext (1.4.0)
-    builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fastercsv (1.5.3)
+    builder (3.0.0)
+    columnize (0.3.5)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    fastercsv (1.5.4)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.6.1)
-      bundler (~> 1.0.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linecache (0.43)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    json (1.6.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.12)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
     mongo (1.4.0)
       bson (= 1.4.0)
     mongoid (2.2.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    multi_json (1.0.4)
+    nokogiri (1.5.0)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
     rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.0)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
@@ -94,13 +108,19 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sqlite3 (1.3.3)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.31)
     will_paginate (2.3.15)
 
 PLATFORMS

data/Readme.markdown

@@ -67,8 +67,6 @@ Basic grid api:
 
 ``` ruby
 report = SimpleReport.new(
-        :order => "group", 
-        :descending => true, 
         :group_id => [1,2], :from_logins_count => 1, 
         :category => "first",
         :order => :group,

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/app/views/datagrid/_head.html.erb

@@ -0,0 +1,8 @@
+<tr>
+  <% grid.columns.each do |column| %>
+    <th class="<%= datagrid_column_classes(grid, column) %>">
+      <%= column.header %>
+      <%= datagrid_order_for(grid, column) if column.order && options[:order]%>
+    </th>
+  <% end %>
+</tr>

data/app/views/datagrid/_row.html.erb

@@ -0,0 +1,7 @@
+<tr class="<%= options[:cycle] && cycle(*options[:cycle]) %>">
+  <% grid.columns.each do |column| %>
+    <td class="<%= datagrid_column_classes(grid, column) %>">
+      <%= datagrid_format_value(grid, column, asset) %>
+    </td>
+  <% end %>
+</tr>

data/app/views/datagrid/_table.html.erb

@@ -0,0 +1,10 @@
+<!--
+Local variables:
+* grid - instance of Datagrid
+* assets - Array of database Entities
+* options - passed options Hash
+-->
+<%= content_tag :table, options[:html] do %>
+  <%= datagrid_header(grid, options) %>
+  <%= datagrid_rows(grid, assets, options) %>
+<% end %>

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2011-12-06"
+  s.date = "2012-01-03"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [
@@ -24,6 +24,9 @@ Gem::Specification.new do |s|
     "Rakefile",
     "Readme.markdown",
     "VERSION",
+    "app/views/datagrid/_head.html.erb",
+    "app/views/datagrid/_row.html.erb",
+    "app/views/datagrid/_table.html.erb",
     "datagrid.gemspec",
     "lib/datagrid.rb",
     "lib/datagrid/active_model.rb",
@@ -34,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/drivers/abstract_driver.rb",
     "lib/datagrid/drivers/active_record.rb",
     "lib/datagrid/drivers/mongoid.rb",
+    "lib/datagrid/engine.rb",
     "lib/datagrid/filters.rb",
     "lib/datagrid/filters/base_filter.rb",
     "lib/datagrid/filters/boolean_enum_filter.rb",
@@ -48,8 +52,10 @@ Gem::Specification.new do |s|
     "lib/datagrid/form_builder.rb",
     "lib/datagrid/helper.rb",
     "lib/datagrid/ordering.rb",
+    "lib/datagrid/renderer.rb",
     "lib/datagrid/rspec.rb",
     "lib/datagrid/utils.rb",
+    "lib/tasks/datagrid_tasks.rake",
     "spec/datagrid/active_model_spec.rb",
     "spec/datagrid/columns_spec.rb",
     "spec/datagrid/drivers/active_record_spec.rb",
@@ -61,12 +67,14 @@ Gem::Specification.new do |s|
     "spec/datagrid/form_builder_spec.rb",
     "spec/datagrid/helper_spec.rb",
     "spec/datagrid/ordering_spec.rb",
+    "spec/datagrid/utils_spec.rb",
     "spec/datagrid_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/equal_to_dom.rb",
+    "spec/support/active_record.rb",
+    "spec/support/matchers.rb",
     "spec/support/mongoid.rb",
-    "spec/support/schema.rb",
-    "spec/support/simple_report.rb"
+    "spec/support/simple_report.rb",
+    "spec/support/test_partials/_actions.html.erb"
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]

data/lib/datagrid.rb

@@ -6,6 +6,9 @@ require "datagrid/ordering"
 
 require "datagrid/helper"
 require "datagrid/form_builder"
+require "datagrid/renderer"
+
+require "datagrid/engine"
 
 module Datagrid
 

data/lib/datagrid/columns.rb

@@ -12,15 +12,16 @@ module Datagrid
 
         include Datagrid::Core
 
-
       end
       base.send :include, InstanceMethods
     end # self.included
 
     module ClassMethods
 
-      def columns
-        @columns ||= []
+      def columns(options = {})
+        (@columns ||= []).reject do |column|
+          options[:data] && column.html?
+        end
       end
 
       def column(name, options = {}, &block)
@@ -28,7 +29,8 @@ module Datagrid
         block ||= lambda do |model|
           model.send(name)
         end
-        self.columns << Datagrid::Columns::Column.new(self, name, options, &block)
+        @columns ||= []
+        @columns << Datagrid::Columns::Column.new(self, name, options, &block)
       end
 
       def column_by_name(name)
@@ -42,12 +44,12 @@ module Datagrid
 
       # Returns <tt>Array</tt> of human readable column names. See also "Localization" section
       def header
-        self.class.columns.map(&:header)
+        self.data_columns.map(&:header)
       end
 
       # Returns <tt>Array</tt> column values for given asset
       def row_for(asset)
-        self.class.columns.map do |column|
+        self.data_columns.map do |column|
           column.value(asset, self)
         end
       end
@@ -55,7 +57,7 @@ module Datagrid
       # Returns <tt>Hash</tt> where keys are column names and values are column values for the given asset
       def hash_for(asset)
         result = {}
-        self.class.columns.each do |column|
+        self.data_columns.each do |column|
           result[column.name] = column.value(asset, self)
         end
         result
@@ -94,8 +96,12 @@ module Datagrid
         end
       end
 
-      def columns
-        self.class.columns
+      def columns(options ={})
+        self.class.columns(options)
+      end
+
+      def data_columns
+        self.columns(:data => true)
       end
 
       def column_by_name(name)

data/lib/datagrid/columns/column.rb

@@ -7,17 +7,20 @@ class Datagrid::Columns::Column
     self.name = name.to_sym
     self.options = options
     self.block = block
+    if format
+      ::Datagrid::Utils.warn_once(":format column option is deprecated. Use :url or :html option instead.")
+    end
   end
 
-  def value(model, report)
-    value_for(model, report)
+  def value(model, grid)
+    value_for(model, grid)
   end
 
-  def value_for(model, report)
+  def value_for(model, grid)
     if self.block.arity == 1
       self.block.call(model)
     elsif self.block.arity == 2
-      self.block.call(model, report)
+      self.block.call(model, grid)
     else
       model.instance_eval(&self.block)
     end
@@ -49,4 +52,10 @@ class Datagrid::Columns::Column
     self.options[:order_desc]  
   end
 
+
+  def html?
+    !! self.options[:html]
+  end
+  
+
 end

data/lib/datagrid/drivers/active_record.rb

@@ -3,6 +3,7 @@ module Datagrid
     class ActiveRecord < AbstractDriver
 
       def self.match?(scope)
+        return false unless defined?(::ActiveRecord)
         if scope.is_a?(Class) 
           scope.ancestors.include?(::ActiveRecord::Base)
         else

data/lib/datagrid/drivers/mongoid.rb

@@ -3,6 +3,7 @@ module Datagrid
     class Mongoid < AbstractDriver
 
       def self.match?(scope)
+        return false unless defined?(::Mongoid)
         if scope.is_a?(Class) 
           scope.ancestors.include?(::Mongoid::Document)
         else

data/lib/datagrid/engine.rb

@@ -0,0 +1,12 @@
+require "rails/engine"
+
+module Datagrid
+  class Engine < ::Rails::Engine
+    initializer "datagrid.helpers" do
+      #TODO: check why it doesn't work
+      ActiveSupport.on_load :action_view do
+        include Datagrid::Helper
+      end 
+    end 
+  end
+end

data/lib/datagrid/form_builder.rb

@@ -7,7 +7,7 @@ module Datagrid
       filter = get_filter(filter_or_attribute)
       options[:class] ||= ""
       options[:class] += " " unless options[:class].blank?
-      options[:class] += "#{filter.name} #{datagrid_html_class(filter.class)}"
+      options[:class] += "#{filter.name} #{datagrid_filter_html_class(filter)}"
       self.send(datagrid_filter_method(filter), filter, options)
     end
 
@@ -67,12 +67,12 @@ module Datagrid
       end
     end
 
-    def datagrid_html_class(klass)
-      klass.to_s.split("::").last.underscore
+    def datagrid_filter_html_class(filter)
+      filter.class.to_s.demodulize.underscore
     end
 
     def datagrid_filter_method(filter)
-      :"datagrid_#{filter.class.to_s.underscore.split('/').last}"
+      :"datagrid_#{filter.class.to_s.demodulize.underscore}"
     end
 
     class Error < StandardError

data/lib/datagrid/helper.rb

@@ -1,83 +1,39 @@
+require "datagrid/engine"
 require "action_view"
 
 module Datagrid
   module Helper
 
     def datagrid_format_value(report, column, asset)
-      value = column.value(asset, report)
-      url = column.options[:url] && column.options[:url].call(asset)
-      if url
-        link_to(value, url)
-      else
-        case column.format
-        when :url
-          link_to(column.label  ? asset.send(column.label) : I18n.t("datagrid.table.url_label", :default => "URL"), value)
-        else
-          _safe(value)
-        end
-      end
+      datagrid_renderer.format_value(report, column, asset)
     end
 
     def datagrid_table(report, *args)
-      options = args.extract_options!
-      html = options[:html] || {}
-      html[:class] ||= "datagrid"
-      assets = args.any? ? args.shift : report.assets
-      paginate = options[:paginate]
-      assets = assets.paginate(paginate) if paginate 
-      content = content_tag(:tr, datagrid_header(report, options)) + datagrid_rows(report, assets, options)
-      content_tag(:table, content, html)
+      datagrid_renderer.table(report, *args)
     end
 
-
     def datagrid_header(grid, options = {})
-      header = empty_string
-      options[:order] = true unless options.has_key?(:order)
-      grid.columns.each do |column|
-        data = _safe(column.header)
-        if options[:order] && column.order
-          data << datagrid_order_for(grid, column)
-        end
-        header << content_tag(:th, data, :class => column.name)
-      end
-      header
+      datagrid_renderer.header(grid, options)
     end
 
-    def datagrid_rows(report, assets, options)
-      columns = report.columns
-      result = assets.map do |asset|
-        content = columns.map do |column|
-          content_tag(:td, datagrid_format_value(report, column, asset), :class => column.name)
-        end.join(empty_string)
-        content_tag(:tr, _safe(content), :class => options[:cycle] && cycle(*options[:cycle]))
-      end.join(empty_string)
-      _safe(result)
+    def datagrid_rows(report, assets, options = {})
+      datagrid_renderer.rows(report, assets, options)
     end
 
     def datagrid_order_for(grid, column)
-      content_tag(:div, :class => "order") do
-        link_to(
-          I18n.t("datagrid.table.order.asc", :default => "ASC"), 
-          url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => false)),
-          :class => "order asc"
-        ) + " " + link_to(
-          I18n.t("datagrid.table.order.desc", :default => "DESC"),
-          url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => true )),
-          :class => "order desc"
-        )
-      end
+      datagrid_renderer.order_for(grid, column)
     end
 
     protected
-    def empty_string
-      _safe("")
+
+    def datagrid_renderer
+      Renderer.for(self)
     end
 
-    def _safe(string)
-      string.respond_to?(:html_safe) ? string.html_safe : string
+    def datagrid_column_classes(grid, column)
+        order_class = grid.order == column.name ? ["ordered", grid.descending ? "desc" : "asc"] : nil
+      [column.name, order_class].compact.join(" ")
     end
   end
-
-  ::ActionView::Base.send(:include, ::Datagrid::Helper)
-
 end
+ActionView::Base.send(:include, Datagrid::Helper)

data/lib/datagrid/renderer.rb

@@ -0,0 +1,73 @@
+require "action_view"
+
+module Datagrid
+  class Renderer
+
+    def self.for(template)
+      new(template)
+    end
+
+    def initialize(template)
+      @template = template
+    end
+
+    def format_value(grid, column, asset)
+      value = column.html? ? @template.instance_exec(asset, &column.block) : column.value(asset, grid)
+      url = column.options[:url] && column.options[:url].call(asset)
+      if url
+        @template.link_to(value, url)
+      else
+        case column.format
+        when :url
+          @template.link_to(column.label  ? asset.send(column.label) : I18n.t("datagrid.table.url_label", :default => "URL"), value)
+        else
+          _safe(value)
+        end
+      end
+    end
+
+    def table(grid, *args)
+      options = args.extract_options!
+      options[:html] ||= {}
+      options[:html][:class] ||= "datagrid #{grid.class.to_s.underscore.demodulize}"
+      assets = args.any? ? args.shift : grid.assets
+      paginate = options[:paginate]
+      assets = assets.paginate(paginate) if paginate 
+
+      @template.render :partial => "datagrid/table", :locals => {:grid => grid, :options => options, :assets => assets}
+    end
+
+    def header(grid, options = {})
+      options[:order] = true unless options.has_key?(:order)
+
+      @template.render :partial => "datagrid/head", :locals => {:grid => grid, :options => options}
+    end
+
+    def rows(grid, assets, options = {})
+      result = assets.map do |asset|
+        @template.render :partial => "datagrid/row", :locals => {:grid => grid, :options => options, :asset => asset}
+      end.join
+
+      _safe(result)
+    end
+
+    def order_for(grid, column)
+      @template.content_tag(:div, :class => "order") do
+        @template.link_to(
+          I18n.t("datagrid.table.order.asc", :default => "ASC"), 
+          @template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => false)),
+          :class => "order asc"
+        ) + " " + @template.link_to(
+          I18n.t("datagrid.table.order.desc", :default => "DESC"),
+          @template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => true )),
+          :class => "order desc"
+        )
+      end
+    end
+
+
+    def _safe(string)
+      string.respond_to?(:html_safe) ? string.html_safe : string
+    end
+  end
+end

data/lib/datagrid/rspec.rb

@@ -1,5 +1,6 @@
 require "datagrid"
 
+#TODO: refactor this experimental shit
 shared_examples_for "Datagrid" do
   describe "as Datagrid" do
 
@@ -9,7 +10,7 @@ shared_examples_for "Datagrid" do
 
     its(:data) {should_not be_empty}
 
-    described_class.columns.each do |column|
+    described_class.columns(:data => true).each do |column|
       describe "column ##{column.name}" do
 
         it "should has value in #data_hash" do

data/lib/datagrid/utils.rb

@@ -7,6 +7,16 @@ module Datagrid
       def booleanize(value)
         TRUTH.include?(value)
       end
+
+      def warn_once(message)
+        @warnings ||= {}
+        if @warnings[message] 
+          false
+        else
+          warn message
+          @warnings[message] = true
+        end
+      end
     end
   end
 end

data/lib/tasks/datagrid_tasks.rake

@@ -0,0 +1,19 @@
+namespace :datagrid do
+
+  desc "Copy table partials into rails application"
+  task :copy_partials do
+    require "fileutils"
+    def copy_template(path)
+      gem_app   = File.expand_path("../../../app", __FILE__)
+      rails_app = (Rails.root + "app").to_s
+      full_path = "#{rails_app}/#{File.dirname path}"
+      puts "* copy #{full_path}"
+      FileUtils.mkdir_p full_path
+      FileUtils.cp "#{gem_app}/#{path}", full_path
+    end
+    copy_template "views/datagrid/_table.html.erb"
+    copy_template "views/datagrid/_head.html.erb"
+    copy_template "views/datagrid/_row.html.erb"
+  end
+
+end

data/spec/datagrid/columns_spec.rb

@@ -13,6 +13,10 @@ describe Datagrid::Columns do
     let!(:entry) {  Entry.create!(
       :group => group, :name => "Star", :disabled => false, :confirmed => false, :category => "first"
     ) }
+
+    it "should have data columns without html columns" do
+      subject.data_columns.size.should == subject.columns.size - 1
+    end
     it "should build rows of data" do
       subject.rows.should == [["Pop", "Star"]]
     end
@@ -34,9 +38,9 @@ describe Datagrid::Columns do
       }
     end
 
-  it "should support csv export" do
-    subject.to_csv.should == "Group,Name\nPop,Star\n"
-  end
+    it "should support csv export" do
+      subject.to_csv.should == "Group,Name\nPop,Star\n"
+    end
   end
 
   it "should support columns with model and report arguments" do

data/spec/datagrid/filters/enum_filter_spec.rb

@@ -16,13 +16,4 @@ describe Datagrid::Filters::EnumFilter do
     end.class.filter_by_name(:group_id).select.should == [1,2]
   end
   
-  it "should stack with other filters" do
-    Entry.create(:name => "ZZ", :category => "first")
-    report = test_report(:name => "Pop", :category => "first") do
-      scope  { Entry }
-      filter(:name)
-      filter(:category, :enum, :select => ["first", "second"])
-    end
-    report.assets.should be_empty
-  end
 end

data/spec/datagrid/filters_spec.rb

@@ -9,6 +9,16 @@ describe Datagrid::Filters do
     end.created_at.should == Date.today
   end
 
+  it "should stack with other filters" do
+    Entry.create(:name => "ZZ", :category => "first")
+    report = test_report(:name => "Pop", :category => "first") do
+      scope  { Entry }
+      filter(:name)
+      filter(:category, :enum, :select => ["first", "second"])
+    end
+    report.assets.should be_empty
+  end
+
   it "should not support array argument for not multiple filter" do
     report = test_report do
       scope {Entry}
@@ -20,7 +30,7 @@ describe Datagrid::Filters do
   end
 
 
-  it "should initialize report Scope table not exists" do
+  it "should initialize when report Scope table not exists" do
     class ModelWithoutTable < ActiveRecord::Base; end
     ModelWithoutTable.should_not be_table_exists
     class TheReport

data/spec/datagrid/helper_spec.rb

@@ -3,15 +3,22 @@ require "will_paginate"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 
+require 'datagrid/renderer'
+
 describe Datagrid::Helper do
-  subject {ActionView::Base.new}
+  subject do
+    template = ActionView::Base.new
+    template.view_paths << File.expand_path("../../../app/views", __FILE__)
+    template.view_paths << File.expand_path("../../support/test_partials", __FILE__)
+    template
+  end
 
   before(:each) do
     subject.stub!(:params).and_return({})
     subject.stub(:url_for) do |options|
       options.to_param
     end
-    
+
   end
 
   let(:group) { Group.create!(:name => "Pop") }
@@ -21,108 +28,119 @@ describe Datagrid::Helper do
   let(:grid) { SimpleReport.new }
 
   describe ".datagrid_table" do
-    before(:each) do
-      subject.stub!(:datagrid_order_for).and_return(subject.content_tag(:div, "", :class => "order"))
+    it "should have grid class as html class on table" do
+      subject.datagrid_table(grid).should match_css_pattern(
+        "table.datagrid.simple_report" => 1
+      )
     end
     it "should return data table html" do
-      subject.datagrid_table(grid).should equal_to_dom(<<-HTML)
-<table class="datagrid">
-<tr>
-<th class="group">Group<div class="order"></div>
-</th>
-<th class="name">Name<div class="order"></div>
-</th>
-</tr>
-
-<tr>
-<td class="group">Pop</td>
-<td class="name">Star</td>
-</tr>
-</table>
-HTML
+      datagrid_table = subject.datagrid_table(grid)
+
+      datagrid_table.should match_css_pattern({
+        "table.datagrid tr th.group div.order" => 1,
+        "table.datagrid tr th.group" => /Group.*/,
+        "table.datagrid tr th.name div.order" => 1,
+        "table.datagrid tr th.name" => /Name.*/,
+        "table.datagrid tr td.group" => "Pop",
+        "table.datagrid tr td.name" => "Star"
+      })
     end
+
     it "should support giving assets explicitly" do
       other_entry = Entry.create!(entry.attributes)
-      subject.datagrid_table(grid, [entry]).should equal_to_dom(<<-HTML)
-<table class="datagrid">
-<tr>
-<th class="group">Group<div class="order"></div>
-</th>
-<th class="name">Name<div class="order"></div>
-</th>
-</tr>
-
-<tr>
-<td class="group">Pop</td>
-<td class="name">Star</td>
-</tr>
-</table>
-HTML
-    end
-    it "should support giving assets implicitly" do
-      other_entry = Entry.create!(entry.attributes)
-      subject.datagrid_table(grid, [entry]).should equal_to_dom(<<-HTML)
-<table class="datagrid">
-<tr>
-<th class="group">Group<div class="order"></div>
-</th>
-<th class="name">Name<div class="order"></div>
-</th>
-</tr>
-
-<tr>
-<td class="group">Pop</td>
-<td class="name">Star</td>
-</tr>
-</table>
-HTML
+      datagrid_table = subject.datagrid_table(grid, [entry])
+
+      datagrid_table.should match_css_pattern({
+        "table.datagrid tr th.group div.order" => 1,
+        "table.datagrid tr th.group" => /Group.*/,
+        "table.datagrid tr th.name div.order" => 1,
+        "table.datagrid tr th.name" => /Name.*/,
+        "table.datagrid tr td.group" => "Pop",
+        "table.datagrid tr td.name" => "Star"
+      })
     end
 
     it "should support cycle option" do
-      subject.datagrid_rows(grid, [entry], :cycle => ["odd", "even"]).should equal_to_dom(<<-HTML)
-<tr class="odd">
-<td class="group">Pop</td>
-<td class="name">Star</td>
-</tr>
-HTML
+      subject.datagrid_rows(grid, [entry], :cycle => ["odd", "even"]).should match_css_pattern({
+        "tr.odd td.group" => "Pop",
+        "tr.odd td.name" => "Star"
+      })
+
     end
 
-    it "should support urls" do
-      rp = test_report do
-        scope { Entry }
-        column(:name, :url => lambda {|model| model.name})
-      end
-      subject.datagrid_rows(rp, [entry], {}).should equal_to_dom(<<-HTML)
-<tr><td class="name"><a href="Star">Star</a></td></tr>
-HTML
+    it "should support no order given" do
+      subject.datagrid_table(grid, [entry], :order => false).should match_css_pattern("table.datagrid th .order" => 0)
     end
-    it "should support conditional urls" do
-      rp = test_report do
-        scope { Entry }
-        column(:name, :url => lambda {false})
+
+    describe ".datagrid_rows" do
+
+      it "should support urls" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :url => lambda {|model| model.name})
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name a[href=Star]" => "Star"
+        )
+      end
+      it "should support conditional urls" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :url => lambda {|model| false})
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name" => "Star"
+        )
+        
+      end
+      it "should add ordering classes to column" do
+        rp = test_report(:order => :name) do
+          scope { Entry }
+          column(:name)
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name.ordered.asc" => "Star"
+        )
+        
+      end
+      it "should add ordering classes to column" do
+        rp = test_report(:order => :name, :descending => true) do
+          scope { Entry }
+          column(:name)
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name.ordered.desc" => "Star"
+        )
       end
-      subject.datagrid_rows(rp, [entry], {}).should equal_to_dom(<<-HTML)
-<tr><td class="name">Star</td></tr>
-HTML
-    end
-  end
 
-  describe ".datagrid_order_for" do
-    it "should render ordreing layout" do
-      class OrderedGrid
-        include Datagrid
-        scope { Entry }
-        column(:category)
+      it "should render html columns" do
+
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => true) do |model|
+            content_tag(:span, model.name)
+          end
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name span" => "Star"
+        )
       end
-      report = OrderedGrid.new(:descending => true, :order => :category)
-      subject.datagrid_order_for(report, report.column_by_name(:category)).should equal_to_dom(<<-HTML)
+    end
+
+    describe ".datagrid_order_for" do
+      it "should render ordreing layout" do
+        class OrderedGrid
+          include Datagrid
+          scope { Entry }
+          column(:category)
+        end
+        grid = OrderedGrid.new(:descending => true, :order => :category)
+        subject.datagrid_order_for(grid, grid.column_by_name(:category)).should equal_to_dom(<<-HTML)
 <div class="order">
 <a href="ordered_grid%5Bdescending%5D=false&amp;ordered_grid%5Border%5D=category" class="order asc">ASC</a> <a href="ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="order desc">DESC</a>
 </div>
-HTML
+        HTML
+      end
     end
-      
   end
-  
-
 end

data/spec/datagrid/utils_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Datagrid::Utils do
+  
+
+  describe ".warn_once" do
+    it "should work" do
+      silence_warnings do
+        Datagrid::Utils.warn_once("hello").should be_true
+      end
+      Datagrid::Utils.warn_once("hello").should be_false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ require 'datagrid'
 require "discover"
 begin
   require 'ruby-debug'
-rescue
+rescue LoadError
 end
 require 'rspec'
 require "logger"
@@ -27,6 +27,7 @@ require "logger"
 File.open('spec.log', "w").close
 TEST_LOGGER = Logger.new('spec.log')
 
+
 RSpec.configure do |config|
 
 

data/spec/support/matchers.rb

@@ -0,0 +1,93 @@
+require "nokogiri"
+
+def equal_to_dom(text)
+  EqualToDom.new(text)
+end
+
+
+def include_dom(text)
+  IncludeDom.new(text)
+end
+
+def match_css_pattern(pattern)
+  CssPattern.new(pattern)
+end
+
+
+class IncludeDom
+  def initialize(expectation)
+    @expectation = Nokogiri::HTML::DocumentFragment.parse(expectation.strip).to_s
+  end
+
+  def matches?(text)
+    @matcher = Nokogiri::HTML::DocumentFragment.parse(text.strip).to_s
+    @matcher == @expectation
+  end
+
+  def failure_message
+    "Expected dom \n#{@matcher.inspect}\n to include \n#{@expectation.inspect}\n, but it wasn't"
+  end
+end
+
+
+class EqualToDom
+
+  def initialize(expectation)
+    @expectation = Nokogiri::HTML::DocumentFragment.parse(expectation.strip).to_s
+  end
+
+  def matches?(text)
+    @matcher = Nokogiri::HTML::DocumentFragment.parse(text.strip).to_s
+    @matcher == @expectation
+  end
+
+  def failure_message
+    "Expected dom #{@matcher} to match #{@expectation}, but it wasn't"
+  end
+end
+
+
+class CssPattern
+  def initialize(pattern)
+    @css_pattern = pattern
+  end
+
+  def error!(message)
+    @error_message = message
+    false
+  end
+
+  def failure_message
+    @error_message || ""
+  end
+
+  def matches?(text)
+    text = text.clone.force_encoding("UTF-8") if "1.9.3".respond_to? :force_encoding
+
+    @matcher = Nokogiri::HTML::DocumentFragment.parse(text)
+    @css_pattern.each do |css, amount_or_pattern_or_string_or_proc|
+      path = @matcher.css(css)
+      if amount_or_pattern_or_string_or_proc.is_a?(String) or amount_or_pattern_or_string_or_proc.is_a?(Regexp)
+        pattern_or_string = amount_or_pattern_or_string_or_proc 
+        html = path.inner_html
+        if !html.match(pattern_or_string)
+          return error!("#{css.inspect} did not match #{pattern_or_string.inspect}. It was \n:#{html.inspect}")
+        end
+      elsif amount_or_pattern_or_string_or_proc.is_a? Fixnum
+        expected_amount = amount_or_pattern_or_string_or_proc
+        amount = path.size
+        if amount != expected_amount
+          return error!("did not find #{css.inspect} #{expected_amount.inspect} times. It was #{amount.inspect}")
+        end
+      elsif amount_or_pattern_or_string_or_proc.is_a? Proc
+        if !amount_or_pattern_or_string_or_proc.call(path)
+          return error!("#{css.inspect} did not validate (proc must not return a falsy value)")
+        end
+      else
+        raise "Instance of String, Rexexp, Proc or Fixnum required"
+      end
+      true
+    end 
+  end
+
+end

data/spec/support/simple_report.rb

@@ -36,6 +36,10 @@ class SimpleReport
     user.name
   end
 
+  column(:actions, :html => true) do |model|
+    render :partial => "actions", :locals => {:model => model}
+  end
+
   def param_name
     :report
   end

data/spec/support/test_partials/_actions.html.erb

@@ -0,0 +1 @@
+<%= "No action for #{model.name}" -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 Z
+date: 2012-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -259,6 +259,9 @@ files:
 - Rakefile
 - Readme.markdown
 - VERSION
+- app/views/datagrid/_head.html.erb
+- app/views/datagrid/_row.html.erb
+- app/views/datagrid/_table.html.erb
 - datagrid.gemspec
 - lib/datagrid.rb
 - lib/datagrid/active_model.rb
@@ -269,6 +272,7 @@ files:
 - lib/datagrid/drivers/abstract_driver.rb
 - lib/datagrid/drivers/active_record.rb
 - lib/datagrid/drivers/mongoid.rb
+- lib/datagrid/engine.rb
 - lib/datagrid/filters.rb
 - lib/datagrid/filters/base_filter.rb
 - lib/datagrid/filters/boolean_enum_filter.rb
@@ -283,8 +287,10 @@ files:
 - lib/datagrid/form_builder.rb
 - lib/datagrid/helper.rb
 - lib/datagrid/ordering.rb
+- lib/datagrid/renderer.rb
 - lib/datagrid/rspec.rb
 - lib/datagrid/utils.rb
+- lib/tasks/datagrid_tasks.rake
 - spec/datagrid/active_model_spec.rb
 - spec/datagrid/columns_spec.rb
 - spec/datagrid/drivers/active_record_spec.rb
@@ -296,12 +302,14 @@ files:
 - spec/datagrid/form_builder_spec.rb
 - spec/datagrid/helper_spec.rb
 - spec/datagrid/ordering_spec.rb
+- spec/datagrid/utils_spec.rb
 - spec/datagrid_spec.rb
 - spec/spec_helper.rb
-- spec/support/equal_to_dom.rb
+- spec/support/active_record.rb
+- spec/support/matchers.rb
 - spec/support/mongoid.rb
-- spec/support/schema.rb
 - spec/support/simple_report.rb
+- spec/support/test_partials/_actions.html.erb
 homepage: http://github.com/bogdan/datagrid
 licenses: 
 - MIT

data/spec/support/equal_to_dom.rb

@@ -1,42 +0,0 @@
-require "nokogiri"
-
-def equal_to_dom(text)
-  EqualToDom.new(text)
-end
-
-
-def include_dom(text)
-  IncludeDom.new(text)
-end
-
-class IncludeDom
-  def initialize(expectation)
-    @expectation = Nokogiri::HTML::DocumentFragment.parse(expectation).to_s
-  end
-
-  def matches?(text)
-    @matcher = Nokogiri::HTML::DocumentFragment.parse(text).to_s
-    @matcher == @expectation
-  end
-
-  def failure_message
-    "Expected dom \n#{@matcher.inspect}\n to include \n#{@expectation.inspect}\n, but it wasn't"
-  end
-end
-
-
-class EqualToDom
-
-  def initialize(expectation)
-    @expectation = Nokogiri::HTML::DocumentFragment.parse(expectation).to_s
-  end
-
-  def matches?(text)
-    @matcher = Nokogiri::HTML::DocumentFragment.parse(text).to_s
-    @matcher == @expectation
-  end
-
-  def failure_message
-    "Expected dom #{@matcher} to match #{@expectation}, but it wasn't"
-  end
-end