datagrid 0.1.0 → 0.1.1

data/Readme.md

@@ -6,7 +6,12 @@ Ruby library that helps you to build and repsend table like data with:
 * Columns
 * Sort order
 * Localization
-* Exportort to CSV
+* Export to CSV
+
+
+*NOTE:* This gem is still under heavy development. If you find a bug don't consider this a peace of shit, just report it and I'll fix it shortly. 
+
+*This is not trivial staff, so a really need your help guys.*
 
 
 ### Grid DSL
@@ -66,7 +71,7 @@ report = SimpleReport.new(:order => "group", :reverse => true, :group_id => [1,2
 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.header # => ["Group", "Name", "Activated"]
 report.rows   # => [
               #      ["Steve", "Spammers", true],
               #      [ "John", "Spoilers", true],

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datagrid}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-06-21}
+  s.date = %q{2011-06-22}
   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 = [
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/helper.rb",
     "lib/datagrid/rspec.rb",
     "spec/datagrid/columns_spec.rb",
+    "spec/datagrid/filters_spec.rb",
     "spec/datagrid/form_builder_spec.rb",
     "spec/datagrid/helper_spec.rb",
     "spec/datagrid_spec.rb",

data/lib/datagrid/core.rb

@@ -99,6 +99,10 @@ module Datagrid
       def param_name
         self.class.param_name
       end
+
+      def to_key
+        [self.class.param_name]
+      end
       
       protected
 

data/lib/datagrid/filters.rb

@@ -103,7 +103,7 @@ module Datagrid
       def filter(attribute, type = :string, options = {}, &block)
 
         klass = type.is_a?(Class) ? type : FILTER_TYPES[type]
-        raise ConfigurationError, "filter class not found" unless klass
+        raise ConfigurationError, "filter class #{type.inspect} not found" unless klass
 
         block ||= default_filter(attribute)
 

data/lib/datagrid/filters/base_filter.rb

@@ -35,7 +35,8 @@ class Datagrid::Filters::BaseFilter
   end
 
   def default
-    self.options[:default]
+    default = self.options[:default]
+    default.respond_to?(:call) ? default.call : default
   end
 
   def multiple

data/lib/datagrid/helper.rb

@@ -12,7 +12,7 @@ module Datagrid
         when :url
           link_to(column.label  ? asset.send(column.label) : I18n.t("datagrid.table.url_label", :default => "URL"), value)
         else
-          value
+          _safe(value)
         end
       end
     end
@@ -21,14 +21,11 @@ module Datagrid
       options = args.extract_options!
       html = options[:html] || {}
       html[:class] ||= "datagrid"
-      paginate = options[:paginate] || {}
-      paginate[:page] ||= params[:page]
-      assets = report.assets.paginate(paginate)
-      content_tag(:table, html) do
-        table = content_tag(:tr, datagrid_header(report, options))
-        table << datagrid_rows(report.columns, assets, options)
-        table
-      end
+      assets = report.assets
+      paginate = options[:paginate]
+      assets = assets.paginate(paginate) if paginate 
+      content = content_tag(:tr, datagrid_header(report, options)) + datagrid_rows(report.columns, assets, options)
+      content_tag(:table, content, html)
     end
 
     protected
@@ -36,7 +33,7 @@ module Datagrid
     def datagrid_header(grid, options)
       header = empty_string
       grid.columns.each do |column|
-        data = column.header.html_safe
+        data = _safe(column.header)
         if column.order
           data << datagrid_order_for(grid, column)
         end
@@ -46,32 +43,36 @@ module Datagrid
     end
 
     def datagrid_rows(columns, assets, options)
-      rows = empty_string
-      assets.each do |asset|
-        rows << content_tag(:tr, :class => cycle("odd", "even")) do
-          html = empty_string
-          columns.each do |column|
-            html << content_tag(:td, datagrid_format_value(column, asset))
-          end
-          html
-        end
-
-      end
-      rows
+      result = assets.map do |asset|
+        content = columns.map do |column|
+          content_tag(:td, datagrid_format_value(column, asset))
+        end.join(empty_string)
+        content_tag(:tr, _safe(content), :class => cycle("odd", "even"))
+      end.join(empty_string)
+      _safe(result)
     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))
-        ) + " " +
-          link_to(I18n.t("datagrid.table.order.desc", :default => "DESC"), url_for(grid.param_name => grid.attributes.merge(:order => column.name, :reverse => true )))
+          I18n.t("datagrid.table.order.asc", :default => "ASC"), 
+          url_for(grid.param_name => grid.attributes.merge(:order => column.name)),
+          :class => "order asc"
+        ) + " " + link_to(
+          I18n.t("datagrid.table.order.desc", :default => "DESC"),
+          url_for(grid.param_name => grid.attributes.merge(:order => column.name, :reverse => true )),
+          :class => "order desc"
+        )
       end
     end
 
+    protected
     def empty_string
-      res = ""
-      res.respond_to?(:html_safe) ? res.html_safe : res
+      _safe("")
+    end
+
+    def _safe(string)
+      string.respond_to?(:html_safe) ? string.html_safe : string
     end
   end
 

data/spec/datagrid/filters_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Datagrid::Filters do
+
+  it "should support default option as proc" do
+    test_report do
+      scope {Entry}
+      filter(:created_at, :date, :default => proc { Date.today } )
+    end.created_at.should == Date.today
+  end
+  
+end

data/spec/support/simple_report.rb

@@ -1,8 +1,18 @@
+
+
+def test_report(&block)
+  klass = Class.new
+  klass.class_eval do
+    include Datagrid
+  end
+  klass.class_eval(&block)
+  klass.new
+end
+
 class SimpleReport
 
   include Datagrid
 
-
   scope do
     ::Entry.includes(:group).order("entries.created_at")
   end
@@ -11,6 +21,7 @@ class SimpleReport
   filter(:category, :enum, :select => ["first", "second"])
   filter(:disabled, :eboolean)
   filter(:confirmed, :boolean)
+
   filter(:name) do |value|
     self.scoped(:conditions => {:name => value})
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 +03:00
+date: 2011-06-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
+  name: rails
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -45,12 +44,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  prerelease: false
+  requirement: *id002
   type: :development
-  version_requirements: *id002
+  name: rake
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id003
   type: :development
-  version_requirements: *id003
+  name: mocha
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -75,12 +74,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  prerelease: false
+  requirement: *id004
   type: :development
-  version_requirements: *id004
+  name: rspec
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,12 +90,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
+  requirement: *id005
   type: :development
-  version_requirements: *id005
+  name: bundler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,12 +106,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  prerelease: false
+  requirement: *id006
   type: :development
-  version_requirements: *id006
+  name: jeweler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,12 +120,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id007
   type: :development
-  version_requirements: *id007
+  name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +134,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id008
   type: :development
-  version_requirements: *id008
+  name: ruby-debug
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,12 +148,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id009
   type: :development
-  version_requirements: *id009
+  name: sqlite3-ruby
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,12 +162,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id010
   type: :development
-  version_requirements: *id010
+  name: fastercsv
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,12 +176,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
+  requirement: *id011
   type: :development
-  version_requirements: *id011
+  name: nokogiri
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -193,9 +192,10 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  prerelease: false
+  requirement: *id012
   type: :development
-  version_requirements: *id012
+  name: will_paginate
+  prerelease: false
 description: This allows you to easily build datagrid aka data tables with sortable columns and filters
 email: agresso@gmail.com
 executables: []
@@ -232,6 +232,7 @@ files:
 - lib/datagrid/helper.rb
 - lib/datagrid/rspec.rb
 - spec/datagrid/columns_spec.rb
+- spec/datagrid/filters_spec.rb
 - spec/datagrid/form_builder_spec.rb
 - spec/datagrid/helper_spec.rb
 - spec/datagrid_spec.rb