datagrid 0.3.0 → 0.3.1

data/Readme.markdown

@@ -130,5 +130,39 @@ Each column is sortable.
 
 [More about columns](https://github.com/bogdan/datagrid/wiki/Columns) 
 
+### Front end
 
+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:
+
+* datagrid\_label
+* datagrid\_filter
+
+The easiest way to create a report form:
+
+(haml for readablity)
+
+``` haml
+- form_for @report do |f|
+  - @report.filters.each do |filter|
+    %div
+      = f.datagrid_label filter
+      = f.datagrid_filter filter
+  = f.submit
+```
+
+There is a simple helper set of helpers that allows you display report:
+
+(require will_paginate)
+
+``` haml
+- assets = @report.assets.paginate(:page => params[:page])
+
+%div== Total #{assets.total}
+= datagrid_table(@report, assets)
+= will_paginate assets
+```
+
+[More about frontend](https://github.com/bogdan/datagrid/wiki/Frontend)
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datagrid}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-07-01}
+  s.date = %q{2011-07-07}
   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 = [

data/lib/datagrid/columns.rb

@@ -109,7 +109,7 @@ module Datagrid
         result = super
         if self.order
           column = column_by_name(self.order)
-          result = result.order(self.descending ? column.desc_order : column.order)
+          result = apply_order(result, self.descending ? column.desc_order : column.order)
         end
         result
       end
@@ -139,6 +139,14 @@ module Datagrid
         self.class.column_by_name(name)
       end
 
+      private
+
+      def apply_order(assets, order)
+        # Rails 3.0.x don't able to override already applied order
+        # Using #reorder instead
+        assets.respond_to?(:reorder) ? assets.reorder(order) : assets.order(order)
+      end
+
     end # InstanceMethods
 
   end

data/spec/datagrid/columns_spec.rb

@@ -1,32 +1,36 @@
 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
+  describe "basic methods" do
+
+    let!(:entry) {  Entry.create!(
+      :group => group, :name => "Star", :disabled => false, :confirmed => false, :category => "first"
+    ) }
+    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
 
   it "should support columns with model and report arguments" do
     report = test_report(:category => "foo") do
@@ -45,21 +49,37 @@ describe Datagrid::Columns do
     report.rows.last.first.should be_false
   end
 
+  describe "ordering" do
 
-  it "should raise error if ordered by not existing column" do
-    lambda {
-      test_report(:order => :hello)
-    }.should raise_error(Datagrid::OrderUnsupported)
-  end
 
-  it "should raise error if ordered by column without order" do
-    lambda {
-      test_report(:order => :category) do
-        filter(:category, :default, :order => false) do |value|
-          self
+    it "should raise error if ordered by not existing column" do
+      lambda {
+        test_report(:order => :hello)
+      }.should raise_error(Datagrid::OrderUnsupported)
+    end
+
+    it "should raise error if ordered by column without order" do
+      lambda do
+        test_report(:order => :category) do
+          filter(:category, :default, :order => false) do |value|
+            self
+          end
         end
-      end
-    }.should raise_error(Datagrid::OrderUnsupported)
+      end.should raise_error(Datagrid::OrderUnsupported)
+    end
+
+    it "should override default order" do
+      Entry.all.should be_empty
+      e1 = Entry.create!
+      e2 = Entry.create!
+      test_report(:order => :id) do
+        scope { Entry.order("id desc")}
+        column(:id) do
+          self.order("id asc")
+        end
+      end.assets.all.should == [e1, e2]
+    end
+
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: datagrid
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +03:00
+date: 2011-07-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -315143401371934304
+      hash: 4430126750120291741
       segments: 
       - 0
       version: "0"