datagrid 0.8.3 → 0.8.4

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2013-05-20"
+  s.date = "2013-05-22"
   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 = [

data/lib/datagrid/drivers/abstract_driver.rb

@@ -2,6 +2,8 @@ module Datagrid
   module Drivers
     class AbstractDriver
 
+      TIMESTAMP_CLASSES = [DateTime, Time, ActiveSupport::TimeWithZone]
+
       class_attribute :subclasses
 
       def self.inherited(base)
@@ -59,6 +61,15 @@ module Datagrid
       def reverse_order(scope)
         raise NotImplementedError
       end
+
+      def is_timestamp?(scope, field)
+        raise NotImplementedError
+      end
+
+      protected
+      def timestamp_class?(klass)
+        TIMESTAMP_CLASSES.include?(klass)
+      end
     end
   end
 end

data/lib/datagrid/drivers/active_record.rb

@@ -45,11 +45,11 @@ module Datagrid
       end
 
       def greater_equal(scope, field, value)
-        scope.where(["#{scope.table_name}.#{field} >= ?", value])
+        scope.where(["#{prefix_table_name(scope, field)} >= ?", value])
       end
 
       def less_equal(scope, field, value)
-        scope.where(["#{scope.table_name}.#{field} <= ?", value])
+        scope.where(["#{prefix_table_name(scope, field)} <= ?", value])
       end
 
       def has_column?(scope, column_name)
@@ -57,6 +57,16 @@ module Datagrid
       rescue ::ActiveRecord::StatementInvalid
         false
       end
+
+      def is_timestamp?(scope, field)
+        has_column?(scope, field) && scope.columns_hash[field.to_s].type == :datetime
+      end
+      
+      protected
+
+      def prefix_table_name(scope, field)
+        has_column?(scope, field) ?  [scope.table_name, field].join(".") : field
+      end
     end
   end
 end

data/lib/datagrid/drivers/array.rb

@@ -45,7 +45,12 @@ module Datagrid
       end
 
       def has_column?(scope, column_name)
-        scope.first.respond_to?(column_name)
+        scope.any? && scope.first.respond_to?(column_name)
+      end
+
+      def is_timestamp?(scope, column_name)
+        has_column?(scope, column_name) && 
+          timestamp_class?(scope.first.send(column_name).class)
       end
     end
   end

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -42,6 +42,11 @@ module Datagrid
       def has_column?(scope, column_name)
         scope.key?(column_name)
       end
+
+      def is_timestamp?(scope, column_name)
+        #TODO implement the support
+        false
+      end
     end
   end
 end

data/lib/datagrid/drivers/mongoid.rb

@@ -16,6 +16,9 @@ module Datagrid
       end
 
       def where(scope, attribute, value)
+        if value.is_a?(Range)
+          value = {"$gte" => value.first, "$lte" => value.last}
+        end
         scope.where(attribute => value)
       end
 
@@ -42,6 +45,11 @@ module Datagrid
       def has_column?(scope, column_name)
         to_scope(scope).klass.fields.keys.include?(column_name.to_s)
       end
+
+      def is_timestamp?(scope, column_name)
+        has_column?(scope, column_name) &&
+          timestamp_class?(to_scope(scope).klass.fields[column_name.to_s].type)
+      end
     end
   end
 end

data/lib/datagrid/filters/date_filter.rb

@@ -14,10 +14,12 @@ class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
   def parse(value)
     return nil if value.blank?
     return value if value.is_a?(Range)
-    formats.each do |format|
-      begin
-        return Date.strptime(value, format)
-      rescue ArgumentError
+    if value.is_a?(String)
+      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)
@@ -38,5 +40,26 @@ class Datagrid::Filters::DateFilter < Datagrid::Filters::BaseFilter
       super
     end
   end
+
+  def default_filter_where(driver, scope, value)
+    if driver.is_timestamp?(scope, name)
+      value = format_value_timestamp(value)
+    end
+    super(driver, scope, value)
+  end
+
+  protected
+  def format_value_timestamp(value)
+    if !value
+      value
+    elsif (range? && value.is_a?(Array))
+      [value.first.try(:beginning_of_day), value.last.try(:end_of_day)]
+    elsif value.is_a?(Range)
+      (value.first.beginning_of_day..value.last.end_of_day)
+    else
+      value.beginning_of_day..value.end_of_day
+    end
+  end
+
 end
 

data/spec/datagrid/filters/date_filter_spec.rb

@@ -15,6 +15,43 @@ describe Datagrid::Filters::DateFilter do
     report.assets.should_not include(e3)
   end
 
+  {:active_record => Entry, :mongoid => MongoidEntry}.each do |orm, klass|
+    describe "with orm #{orm}" do
+      describe "date to timestamp conversion" do
+        let(:klass) { klass }
+        subject do
+          test_report(:created_at => _created_at) do
+            scope { klass } 
+            filter(:created_at, :date, :range => true)
+          end.assets.to_a
+        end
+
+        def entry_dated(date)
+          klass.create(:created_at => date)
+        end
+
+        context "when single date paramter given" do
+          let(:_created_at) { Date.today }
+          it { should include(entry_dated(1.second.ago))}
+          it { should include(entry_dated(Date.today.end_of_day))}
+          it { should_not include(entry_dated(Date.today.beginning_of_day - 1.second))}
+          it { should_not include(entry_dated(Date.today.end_of_day + 1.second))}
+        end
+
+        context "when range date range given" do
+          let(:_created_at) { [Date.yesterday, Date.today] }
+          it { should include(entry_dated(1.second.ago))}
+          it { should include(entry_dated(1.day.ago))}
+          it { should include(entry_dated(Date.today.end_of_day))}
+          it { should include(entry_dated(Date.yesterday.beginning_of_day))}
+          it { should_not include(entry_dated(Date.yesterday.beginning_of_day - 1.second))}
+          it { should_not include(entry_dated(Date.today.end_of_day + 1.second))}
+        end
+      end
+
+    end
+  end
+
   it "should support date range given as array argument" do
     e1 = Entry.create!(:created_at => 7.days.ago)
     e2 = Entry.create!(:created_at => 4.days.ago)
@@ -93,16 +130,39 @@ describe Datagrid::Filters::DateFilter do
     report.assets.should include(Entry.create!(:created_at => DateTime.now))
   end
   
-  it "should have configurable date format" do
-    with_date_format do
+
+  context "when date format is configured" do
+    around(:each) do |example|
+      with_date_format do
+        example.run
+      end
+    end
+
+    it "should have configurable date format" do
       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)
     end
+
+    it "should support default explicit date" do
+      report = test_report(:created_at => Date.parse("2013-10-01")) do
+        scope  {Entry}
+        filter(:created_at, :date)
+      end
+      report.created_at.should == Date.new(2013,10,01)
+    end
   end
 
+
+  it "should automatically reverse Array if first more than last" do
+    report = test_report(:created_at => ["2013-01-01", "2012-01-01"]) do
+      scope  {Entry}
+      filter(:created_at, :date, :range => true)
+    end
+    report.created_at.should == [Date.new(2012, 01, 01), Date.new(2013, 01, 01)]
+  end
   it "should automatically reverse Array if first more than last" do
     report = test_report(:created_at => ["2013-01-01", "2012-01-01"]) do
       scope  {Entry}

data/spec/datagrid/filters/integer_filter_spec.rb

@@ -92,5 +92,16 @@ describe Datagrid::Filters::IntegerFilter do
     report.assets.should_not include(Entry.create!(:group_id => 1))
     report.assets.should include(Entry.create!(:group_id => 5))
   end
+
+
+  it "should not prefix table name if column is joined" do
+    report = test_report(:rating => [4,nil]) do
+      scope { Entry.joins(:group) } 
+      filter(:rating, :integer, :range => true)
+    end
+    report.assets.should_not include(Entry.create!(:group => Group.create!(:rating => 3)))
+    report.assets.should include(Entry.create!(:group => Group.create!(:rating => 5)))
+  end
+
   
 end

data/spec/support/configuration.rb

@@ -1,12 +1,13 @@
 def with_date_format(format = "%m/%d/%Y")
   begin
+    old_format = Datagrid.configuration.date_formats
     Datagrid.configure do |config|
       config.date_formats = format
     end
     yield
   ensure
     Datagrid.configure do |config|
-      config.date_formats = nil
+      config.date_formats = old_format
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -335,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1396287359807292106
+      hash: -3876339943882620778
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: