datagrid 0.8.1 → 0.8.2

data/Readme.markdown

@@ -158,55 +158,20 @@ create  app/views/skills/index.html.erb
 route  resources :skills
 ```
 
-### Manually
 
-If you want to be a true ninja you can build everything from scratch on your own.
+### Customize Built-in partials
 
-In order to create form for your report you can use all set of rails built-in tools.
-More over Datagrid provides you two additional form helpers:
+In order to get a control on datagrid built-in partials run:
 
-* datagrid\_label
-* datagrid\_filter
-
-
-The easiest way to create a report form (haml for readablity):
-
-``` haml
-# Method `GET` is recommended for all report forms by default.
-- form_for @report, :html => {:method => :get} do |f|
-  - @report.filters.each do |filter|
-    %div
-      = f.datagrid_label filter
-      = f.datagrid_filter filter
-  = f.submit
+``` sh
+rake datagrid:copy_partials
 ```
 
-Your controller:
-
-``` ruby
-map.resources :simple_reports, :only => [:index]
-
-class SimpleReportsController < ApplicationController
-  def index
-    @report = SimpleReport.new(params[:simple_report])
-  end
-end
-```
-
-There is a simple helper set of helpers that allows you display report:
-(require any pagination gem, will\_paginate is used as an example)
-
-``` haml
-- assets = @report.assets.paginate(:page => params[:page])
-
-%div== Total #{assets.total_entries}
-= datagrid_table(@report, assets)
-= will_paginate assets
-```
+### Advanced frontend
 
-If you need a custom interface for your report you should probably build it yourself with datagrid helpers.
+All advanced frontend things are described in:
 
-[More about frontend](https://github.com/bogdan/datagrid/wiki/Frontend)
+[Frontend section on wiki](https://github.com/bogdan/datagrid/wiki/Frontend)
 
 ## Self-Promotion
 

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

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

@@ -0,0 +1,9 @@
+<%= form_for grid, options do |f| -%>
+  <% grid.filters.each do |filter| %>
+    <div class="filter">
+      <%= f.datagrid_label filter %>
+      <%= f.datagrid_filter filter %>
+    </div>
+  <% end %>
+  <%= f.submit I18n.t("datgrid.form.submit", :default => "Search").html_safe %>
+<% end -%>

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

@@ -2,9 +2,9 @@
   <%= link_to(
       I18n.t("datagrid.table.order.asc", :default => "&uarr;".html_safe).html_safe,
       url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => false)),
-      :class => "order asc") %>
+      :class => "asc") %>
   <%= link_to(
       I18n.t("datagrid.table.order.desc", :default => "&darr;".html_safe).html_safe,
       url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => true )),
-      :class => "order desc") %>
+      :class => "desc") %>
 </div>

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2013-04-28"
+  s.date = "2013-05-15"
   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 = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "Readme.markdown",
     "VERSION",
+    "app/views/datagrid/_form.html.erb",
     "app/views/datagrid/_head.html.erb",
     "app/views/datagrid/_order_for.html.erb",
     "app/views/datagrid/_row.html.erb",
@@ -32,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/active_model.rb",
     "lib/datagrid/columns.rb",
     "lib/datagrid/columns/column.rb",
+    "lib/datagrid/configuration.rb",
     "lib/datagrid/core.rb",
     "lib/datagrid/drivers.rb",
     "lib/datagrid/drivers/abstract_driver.rb",
@@ -94,7 +96,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid.rb

@@ -1,4 +1,5 @@
 require "action_view"
+require "datagrid/configuration"
 
 module Datagrid
 
@@ -9,6 +10,7 @@ module Datagrid
   autoload :Filters
   autoload :Columns
   autoload :Ordering
+  autoload :Configuration
 
   autoload :Helper
   ActionView::Base.send(:include, Datagrid::Helper)

data/lib/datagrid/configuration.rb

@@ -0,0 +1,13 @@
+module Datagrid
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  class Configuration < Struct.new(:date_formats)
+  end
+end

data/lib/datagrid/filters/date_filter.rb

@@ -14,9 +14,16 @@ class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
   def format(value)
     return nil if value.blank?
     return value if value.is_a?(Range)
+    if formats = Datagrid.configuration.date_formats
+      Array(formats).each do |format|
+        begin
+          return Date.strptime(value, format)
+        rescue ArgumentError
+        end
+      end
+    end
     return value.to_date if value.respond_to?(:to_date)
     return value unless value.is_a?(String)
-    #TODO: more smart date normalizer
     Date.parse(value)
   rescue ArgumentError
     nil

data/lib/datagrid/helper.rb

@@ -24,6 +24,10 @@ module Datagrid
       datagrid_renderer.order_for(grid, column)
     end
 
+    def datagrid_form_for(grid, options = {})
+      datagrid_renderer.form_for(grid, options)
+    end
+
     protected
 
     def datagrid_renderer

data/lib/datagrid/renderer.rb

@@ -43,10 +43,17 @@ module Datagrid
       end
     end
 
+    def form_for(grid, options = {})
+      options[:method] ||= :get
+      options[:html] ||= {}
+      options[:html][:class] ||= "datagrid-form #{html_class(grid)}"
+      @template.render :partial => "datagrid/form", :locals => {:grid => grid, :options => options}
+    end
+
     def table(grid, *args)
       options = args.extract_options!
       options[:html] ||= {}
-      options[:html][:class] ||= "datagrid #{grid.class.to_s.underscore.demodulize}"
+      options[:html][:class] ||= "datagrid #{html_class(grid)}"
       assets = args.any? ? args.shift : grid.assets
       paginate = options[:paginate]
       if paginate
@@ -75,6 +82,9 @@ module Datagrid
       @template.render :partial => "datagrid/order_for", :locals => { :grid => grid, :column => column }
     end
 
+    def html_class(grid)
+      grid.class.to_s.underscore.demodulize
+    end
 
     def _safe(string)
       string.respond_to?(:html_safe) ? string.html_safe : string

data/lib/tasks/datagrid_tasks.rake

@@ -3,18 +3,13 @@ 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
+    views_path = "app/views/datagrid"
+    destination_dir = (Rails.root + views_path).to_s
+    pattern = File.expand_path(File.dirname(__FILE__) + "/../../#{views_path}") + "/*"
+    Dir[pattern].each do |template|
+      puts "* copy #{template} => #{destination_dir}"
+      FileUtils.mkdir_p destination_dir
+      FileUtils.cp template, destination_dir
     end
-    copy_template "views/datagrid/_table.html.erb"
-    copy_template "views/datagrid/_head.html.erb"
-    copy_template "views/datagrid/_order_for.html.erb"
-    copy_template "views/datagrid/_row.html.erb"
   end
-
 end

data/spec/datagrid/filters/date_filter_spec.rb

@@ -93,4 +93,20 @@ describe Datagrid::Filters::DateFilter do
     report.assets.should include(Entry.create!(:created_at => DateTime.now))
   end
   
+  it "should have configurable date format" do
+    begin
+      Datagrid.configure do |config|
+        config.date_formats = "%m/%d/%Y"
+      end
+      report = test_report(:created_at => "10/01/2013") do
+        scope  {Entry}
+        filter(:created_at, :date)
+      end
+      report.created_at.should == Date.new(2013,10,01)
+    ensure
+      Datagrid.configure do |config|
+        config.date_formats = nil
+      end
+    end
+  end
 end

data/spec/datagrid/helper_spec.rb

@@ -272,11 +272,28 @@ describe Datagrid::Helper do
         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">&uarr;</a>
-  <a href="ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="order desc">&darr;</a>
+  <a href="ordered_grid%5Bdescending%5D=false&amp;ordered_grid%5Border%5D=category" class="asc">&uarr;</a>
+  <a href="ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="desc">&darr;</a>
 </div>
         HTML
       end
     end
+    describe ".datagrid_form_for" do
+      it "should render ordering layout" do
+        class FormForGrid
+          include Datagrid
+          scope { Entry }
+          filter(:category)
+        end
+        grid = FormForGrid.new(:category => "hello")
+        subject.datagrid_form_for(grid, :url => "/grid").should match_css_pattern(
+          "form.datagrid-form.form_for_grid[action='/grid']" => 1,
+          "form input[name=utf8]" => 1,
+          "form .filter label" => "Category",
+          "form .filter input.category.default_filter[name='form_for_grid[category]'][value=hello]" => 1,
+          "form input[name=commit][value=Search]" => 1
+        )
+      end
+    end
   end
 end

data/templates/index.html.erb

@@ -1,12 +1,4 @@
-<%%= form_for @grid, :method => :get, :url => <%= grid_route_name %> do |f| %>
-  <%% @grid.filters.each do |filter| %>
-    <div class="field">
-      <%%= f.datagrid_label filter %>
-      <%%= f.datagrid_filter filter %>
-    </div>
-  <%% end %>
-  <%%= f.submit %>
-<%% end %>
+<%%= datagrid_form_for @grid, :method => :get, :url => <%= grid_route_name %> %>
 
 <%%= <%=pagination_helper_code%> %>
 <%%= datagrid_table @grid, @assets %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -250,6 +250,7 @@ files:
 - Rakefile
 - Readme.markdown
 - VERSION
+- app/views/datagrid/_form.html.erb
 - app/views/datagrid/_head.html.erb
 - app/views/datagrid/_order_for.html.erb
 - app/views/datagrid/_row.html.erb
@@ -259,6 +260,7 @@ files:
 - lib/datagrid/active_model.rb
 - lib/datagrid/columns.rb
 - lib/datagrid/columns/column.rb
+- lib/datagrid/configuration.rb
 - lib/datagrid/core.rb
 - lib/datagrid/drivers.rb
 - lib/datagrid/drivers/abstract_driver.rb
@@ -332,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3628850104894180281
+      hash: 2130335005317540436
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -341,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby gem to create datagrids