datagrid 0.3.5 → 0.3.6

data/Readme.markdown

@@ -20,7 +20,8 @@ In order to create a report, you need to define:
 
 ### Working grid example
 
-[Datagrid DEMO application](https://github.com/bogdan/datagrid-demo) is available.
+[Datagrid DEMO application](http://datagrid.heroku.com) is available live!
+[Demo source code](https://github.com/bogdan/datagrid-demo).
 
 In order to create a grid:
 

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{datagrid}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-08-15}
+  s.date = %q{2011-08-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 = [
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/utils.rb",
     "spec/datagrid/active_model_spec.rb",
     "spec/datagrid/columns_spec.rb",
+    "spec/datagrid/filters/composite_filters_spec.rb",
     "spec/datagrid/filters/enum_filter_spec.rb",
     "spec/datagrid/filters_spec.rb",
     "spec/datagrid/form_builder_spec.rb",

data/lib/datagrid/filters/composite_filters.rb

@@ -15,10 +15,10 @@ module Datagrid
 
         def date_range_filters(field, from_name = :"from_#{field}", to_name = :"to_#{field}")
           filter(from_name, :date) do |date|
-            self.from_date(date, field)
+            self.scoped(:conditions => ["#{field} >= ?", date])
           end
           filter(to_name, :date) do |date|
-            self.to_date(date, field)
+            self.scoped(:conditions => ["#{field} <= ?", date])
           end
         end
 

data/lib/datagrid/filters/enum_filter.rb

@@ -15,9 +15,12 @@ class Datagrid::Filters::EnumFilter < Datagrid::Filters::BaseFilter
     option.respond_to?(:call) ? option.call : option
   end
 
-
   def include_blank
-    self.options.has_key?(:include_blank) ? options[:include_blank] : true
+    self.options.has_key?(:include_blank) ? options[:include_blank] : true unless self.prompt
+  end
+  
+  def prompt
+    self.options.has_key?(:prompt) ? options[:prompt] : false
   end
 
   def strict

data/lib/datagrid/form_builder.rb

@@ -39,7 +39,7 @@ module Datagrid
       if !options.has_key?(:multiple) && filter.multiple
         options[:multiple] = true
       end
-      select filter.name, filter.select || [], {:include_blank => filter.include_blank}, options
+      select filter.name, filter.select || [], {:include_blank => filter.include_blank, :prompt => filter.prompt}, options
     end
 
     def datagrid_integer_filter(attribute_or_filter, options = {})

data/spec/datagrid/columns_spec.rb

@@ -20,13 +20,20 @@ describe Datagrid::Columns do
       subject.header.should == ["Group", "Name"]
     end
 
-    it "should generate data" do
+    it "should generate table data" do
       subject.data.should == [
         subject.header,
         subject.row_for(entry)
       ]
     end
 
+    it "should generate hash for given asset" do
+      subject.hash_for(entry).should == {
+        :group => "Pop",
+        :name => "Star"
+      }
+    end
+
   it "should support csv export" do
     subject.to_csv.should == "Group,Name\nPop,Star\n"
   end

data/spec/datagrid/filters/composite_filters_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Datagrid::Filters::CompositeFilters do
+  
+  describe ".date_range_filters" do
+    
+    it "should generate from date and to date filters" do
+      e1 = Entry.create!(:shipping_date => 6.days.ago)
+      e2 = Entry.create!(:shipping_date => 4.days.ago)
+      e3 = Entry.create!(:shipping_date => 1.days.ago)
+      assets = test_report(:from_shipping_date => 5.days.ago, :to_shipping_date => 2.day.ago) do
+        scope {Entry}
+        date_range_filters(:shipping_date)
+      end.assets
+
+      assets.should include(e2)
+      assets.should_not include(e1, e3)
+    end
+  end
+  
+  describe ".integer_range_filters" do
+    
+    it "should generate from integer and to integer filters" do
+      e1 = Entry.create!(:group_id => 1)
+      e2 = Entry.create!(:group_id => 3)
+      e3 = Entry.create!(:group_id => 5)
+      assets = test_report(:from_group_id => 2, :to_group_id => 4) do
+        scope {Entry}
+        integer_range_filters(:group_id)
+      end.assets
+
+      assets.should include(e2)
+      assets.should_not include(e1, e3)
+    end
+  end
+end

data/spec/datagrid/filters_spec.rb

@@ -34,11 +34,9 @@ describe Datagrid::Filters do
   end
 
   describe "allow_blank and allow_nil options" do
-    before(:each) do
-      $FILTER_PERFORMED = false
-    end
 
     def check_performed(value, result, options)
+      $FILTER_PERFORMED = false
       report = test_report(:name => value) do
         scope {Entry}
         filter(:name, options) do |value|
@@ -57,7 +55,7 @@ describe Datagrid::Filters do
       end
     end
 
-    it "should support allow_blank argument" do
+    it "should support allow_nil argument" do
       check_performed(nil, true, :allow_nil => true)
     end
 

data/spec/datagrid/form_builder_spec.rb

@@ -13,8 +13,7 @@ end
 describe Datagrid::FormBuilder do
 
   let(:template) { ActionView::Base.new}
-  let(:grid) { SimpleReport.new }
-  let(:view) { ActionView::Helpers::FormBuilder.new(:report, grid, template, {}, Proc.new {|f| })}
+  let(:view) { ActionView::Helpers::FormBuilder.new(:report, _grid, template, {}, Proc.new {|f| })}
   subject { view }
 
 
@@ -22,6 +21,12 @@ describe Datagrid::FormBuilder do
 
     subject { view.datagrid_filter(_filter)}
     context "with default filter type" do
+      let(:_grid) {
+        test_report do
+          scope {Entry}
+          filter(:name)
+        end
+      }
       let(:_filter) { :name }
       it { should equal_to_dom(
         '<input class="name default_filter" id="report_name" name="report[name]" size="30" type="text"/>'
@@ -29,12 +34,26 @@ describe Datagrid::FormBuilder do
     end
     context "with integer filter type" do
       let(:_filter) { :group_id }
+      let(:_grid) {
+        test_report do
+          scope {Entry}
+          filter(:group_id, :integer)
+        end
+      }
       it { should equal_to_dom(
-        '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text" value=""/>'
+        '<input class="group_id integer_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
       )}
     end
     context "with enum filter type" do
       let(:_filter) { :category }
+      let(:_grid) {
+        test_report do
+          scope {Entry}
+          filter(:category, :enum, :select => ["first", "second"])
+          filter(:category_without_include_blank, :enum, :select => ["first", "second"], :include_blank => false)
+          filter(:category_with_prompt, :enum, :select => ["first", "second"], :prompt => "My Prompt")
+        end
+      }
       it { should equal_to_dom(
         '<select class="category enum_filter" id="report_category" name="report[category]"><option value=""></option>
        <option value="first">first</option>
@@ -42,7 +61,7 @@ describe Datagrid::FormBuilder do
       )}
       context "when first option is selected" do
         before(:each) do
-          grid.category = "first"
+          _grid.category = "first"
         end
         it { should equal_to_dom(
           '<select class="category enum_filter" id="report_category" name="report[category]"><option value=""></option>
@@ -50,10 +69,32 @@ describe Datagrid::FormBuilder do
        <option value="second">second</option></select>'
         )}
       end
+      context "with include_blank option set to false" do
+        let(:_filter) { :category_without_include_blank }
+        it { should equal_to_dom(
+          '<select class="category_without_include_blank enum_filter" id="report_category_without_include_blank" name="report[category_without_include_blank]">
+         <option value="first">first</option>
+         <option value="second">second</option></select>'
+        )}
+      end
+      context "with prompt option" do
+        let(:_filter) { :category_with_prompt }
+        it { should equal_to_dom(
+          '<select class="category_with_prompt enum_filter" id="report_category_with_prompt" name="report[category_with_prompt]"><option value="">My Prompt</option>
+         <option value="first">first</option>
+         <option value="second">second</option></select>'
+        )}
+      end
     end
 
     context "with eboolean filter type" do
       let(:_filter) { :disabled }
+      let(:_grid) do
+        test_report do
+          scope {Entry}
+          filter(:disabled, :eboolean)
+        end
+      end
       it { should equal_to_dom(
         '<select class="disabled boolean_enum_filter" id="report_disabled" name="report[disabled]"><option value=""></option>
        <option value="YES">YES</option>
@@ -61,7 +102,7 @@ describe Datagrid::FormBuilder do
       )}
     end
     context "with string filter" do
-      let(:grid) do
+      let(:_grid) do
         test_report do
           scope {Entry}
           filter(:name, :string)
@@ -74,7 +115,7 @@ describe Datagrid::FormBuilder do
     end
 
     context "with non multiple filter" do
-      let(:grid) do
+      let(:_grid) do
         test_report do
           scope {Entry}
           filter(
@@ -91,6 +132,12 @@ describe Datagrid::FormBuilder do
   end
 
   describe ".datagrid_label" do
+    let(:_grid) do
+      test_report do
+        scope {Entry}
+        filter(:name, :string)
+      end
+    end
     it "should generate label for filter" do
       view.datagrid_label(:name).should equal_to_dom(
         '<label for="report_name">Name</label>'

data/spec/datagrid/helper_spec.rb

@@ -25,8 +25,8 @@ describe Datagrid::Helper do
       subject.stub!(:datagrid_order_for).and_return(subject.content_tag(:div, "", :class => "order"))
     end
     it "should return data table html" do
-      subject.datagrid_table(grid).should equal_to_dom(
-'<table class="datagrid">
+      subject.datagrid_table(grid).should equal_to_dom(<<-HTML)
+<table class="datagrid">
 <tr>
 <th>Group<div class="order"></div>
 </th>
@@ -38,16 +38,17 @@ describe Datagrid::Helper do
 <td>Pop</td>
 <td>Star</td>
 </tr>
-</table>')
+</table>
+HTML
     end
 
     it "should support cycle option" do
-      subject.datagrid_rows(grid, [entry], :cycle => ["odd", "even"]).should equal_to_dom(
-'<tr class="odd">
+      subject.datagrid_rows(grid, [entry], :cycle => ["odd", "even"]).should equal_to_dom(<<-HTML)
+<tr class="odd">
 <td>Pop</td>
 <td>Star</td>
-</tr>'
-      )
+</tr>
+HTML
     end
   end
 

data/spec/datagrid_spec.rb

@@ -40,13 +40,8 @@ describe SimpleReport do
       
 
     context "when not defined on class level" do
-      before(:each) do
-        @scope = SimpleReport.instance_variable_get("@scope")
-        SimpleReport.instance_variable_set("@scope", nil)
-      end
-
-      after(:each) do
-        SimpleReport.instance_variable_set("@scope", @scope)
+      subject do
+        test_report {}
       end
 
       it "should raise ConfigurationError" do

data/spec/support/schema.rb

@@ -19,6 +19,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :category
     t.boolean :disabled, :null => false, :default => false
     t.boolean :confirmed, :null => false, :default => false
+    t.date :shipping_date
     t.timestamps
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datagrid
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 +03:00
+date: 2011-08-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -251,6 +251,7 @@ files:
 - lib/datagrid/utils.rb
 - spec/datagrid/active_model_spec.rb
 - spec/datagrid/columns_spec.rb
+- spec/datagrid/filters/composite_filters_spec.rb
 - spec/datagrid/filters/enum_filter_spec.rb
 - spec/datagrid/filters_spec.rb
 - spec/datagrid/form_builder_spec.rb