datagrid 0.6.4 → 0.7.0

data/spec/datagrid/helper_spec.rb

@@ -97,7 +97,6 @@ describe Datagrid::Helper do
     end
 
     describe ".datagrid_rows" do
-
       it "should support urls" do
         rp = test_report do
           scope { Entry }
@@ -107,6 +106,7 @@ describe Datagrid::Helper do
           "tr td.name a[href=Star]" => "Star"
         )
       end
+
       it "should support conditional urls" do
         rp = test_report do
           scope { Entry }
@@ -114,9 +114,9 @@ describe Datagrid::Helper do
         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 }
@@ -125,8 +125,8 @@ describe Datagrid::Helper do
         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 }
@@ -138,7 +138,6 @@ describe Datagrid::Helper do
       end
 
       it "should render html columns" do
-
         rp = test_report do
           scope { Entry }
           column(:name, :html => true) do |model|
@@ -150,6 +149,28 @@ describe Datagrid::Helper do
         )
       end
 
+      it "should render argument-based html columns" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => lambda {|data| content_tag :h1, data})
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name h1" => "Star"
+        )
+      end
+
+      it "should render argument-based html columns with custom data" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => lambda {|data| content_tag :em, data}) do
+            self.name.upcase
+          end
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name em" => "STAR"
+        )
+      end
+
       it "should render html columns with double arguments for column" do
         rp = test_report do
           scope { Entry }
@@ -162,6 +183,58 @@ describe Datagrid::Helper do
         )
       end
 
+      it "should render argument-based html blocks with double arguments" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => lambda { |data, model| 
+            content_tag :h1, "#{data}-#{model.name.downcase}"
+          })            
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name h1" => "Star-star"
+        )
+      end
+
+      it "should render argument-based html blocks with triple arguments" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => lambda { |data, model, grid| 
+            content_tag :h1, "#{data}-#{model.name.downcase}-#{grid.assets.klass}"
+          })            
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name h1" => "Star-star-Entry"
+        )
+      end
+
+      it "should render argument-based html blocks with double arguments and custom data" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => lambda { |data, model| 
+            content_tag :h1, "#{data}-#{model.name}"
+          }) do
+            self.name.upcase
+          end            
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name h1" => "STAR-Star"
+        )
+      end
+
+      it "should render argument-based html blocks with triple arguments and custom data" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :html => lambda { |data, model, grid| 
+            content_tag :h1, "#{data}-#{model.name}-#{grid.assets.klass}"
+          }) do
+            self.name.upcase
+          end            
+        end
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name h1" => "STAR-Star-Entry"
+        )
+      end
+
       it "should support columns option" do
         rp = test_report do
           scope { Entry }
@@ -176,6 +249,17 @@ describe Datagrid::Helper do
         )
       end
 
+      it "should allow CSS classes to be specified for a column" do
+        rp = test_report do
+          scope { Entry }
+          column(:name, :class => 'my_class')
+        end
+
+        subject.datagrid_rows(rp, [entry]).should match_css_pattern(
+          "tr td.name.my_class" => "Star"
+        )
+      end
+
     end
 
     describe ".datagrid_order_for" do

data/spec/datagrid/ordering_spec.rb

@@ -14,7 +14,7 @@ describe Datagrid::Ordering do
         Entry
       end
       column :name
-    end.assets.should discover(first, second, third).with_exact_order
+    end.assets.should == [first, second, third]
 
   end
 
@@ -24,9 +24,7 @@ describe Datagrid::Ordering do
         Entry
       end
       column :name
-    end.assets.should discover(third, second, first).with_exact_order
-
-
+    end.assets.should == [third, second, first]
   end
 
 
@@ -47,13 +45,25 @@ describe Datagrid::Ordering do
   end
 
   it "should override default order" do
+    test_report(:order => :name) do
+      scope { Entry.order("name desc")}
+      column(:name, :order => "name asc")
+    end.assets.should == [first, second, third]
+  end
 
-    test_report(:order => :id) do
-      scope { Entry.order("id desc")}
-      column(:id) do
-        self.order("id asc")
-      end
-    end.assets.should discover(first, second, third).with_exact_order
+  it "should support order given as block" do
+    test_report(:order => :name) do
+      scope { Entry }
+      column(:name, :order => proc { order("name desc") })
+    end.assets.should == [third, second, first]
+  end
+
+  it "should support order desc given as block" do
+    test_report(:order => :name, :descending => true) do
+      scope { Entry }
+      column(:name,  :order_desc => proc { order("name desc")})
+    end.assets.should == [third, second, first]
   end
+  
 
 end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ require 'action_view'
 require "mongoid"
 require "mongo_mapper"
 require 'datagrid'
-require "discover"
 begin
   require 'ruby-debug'
 rescue LoadError

data/spec/support/active_record.rb

@@ -14,6 +14,8 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :group_id
     t.string :name
     t.string :category
+    t.string :access_level
+    t.string :pet
     t.boolean :disabled, :null => false, :default => false
     t.boolean :confirmed, :null => false, :default => false
     t.date :shipping_date

data/spec/support/simple_report.rb

@@ -40,6 +40,12 @@ class SimpleReport
     render :partial => "actions", :locals => {:model => model}
   end
 
+  column(:access_level, :html => lambda {|data| content_tag :h1, data})
+
+  column(:pet, :html => lambda {|data| content_tag :em, data}) do
+    self.pet.try(:upcase)
+  end
+
   def param_name
     :report
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: accept_values_for
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +259,7 @@ files:
 - lib/datagrid/filters/enum_filter.rb
 - lib/datagrid/filters/float_filter.rb
 - lib/datagrid/filters/integer_filter.rb
+- lib/datagrid/filters/ranged_filter.rb
 - lib/datagrid/filters/string_filter.rb
 - lib/datagrid/form_builder.rb
 - lib/datagrid/helper.rb
@@ -291,8 +276,10 @@ files:
 - spec/datagrid/drivers/mongoid_spec.rb
 - spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
+- spec/datagrid/filters/date_filter_spec.rb
 - spec/datagrid/filters/enum_filter_spec.rb
 - spec/datagrid/filters/float_filter_spec.rb
+- spec/datagrid/filters/integer_filter_spec.rb
 - spec/datagrid/filters_spec.rb
 - spec/datagrid/form_builder_spec.rb
 - spec/datagrid/helper_spec.rb
@@ -321,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1803543762513057738
+      hash: 813907041614063922
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: