datagrid 0.6.0 → 0.6.2

data/Readme.markdown

@@ -98,6 +98,8 @@ In common case it is `ActiveRecord::Base` (or any other supported ORM) subclass
   end
 ```
 
+[More about scope](https://github.com/bogdan/datagrid/wiki/Scope)
+
 ### Filters
 
 Each filter definition consists of:

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.2

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.6.0"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-05-24"
+  s.date = "2012-06-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 = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/filters/date_filter.rb",
     "lib/datagrid/filters/default_filter.rb",
     "lib/datagrid/filters/enum_filter.rb",
+    "lib/datagrid/filters/float_filter.rb",
     "lib/datagrid/filters/integer_filter.rb",
     "lib/datagrid/filters/string_filter.rb",
     "lib/datagrid/form_builder.rb",
@@ -57,12 +58,14 @@ Gem::Specification.new do |s|
     "lib/tasks/datagrid_tasks.rake",
     "spec/datagrid/active_model_spec.rb",
     "spec/datagrid/columns_spec.rb",
+    "spec/datagrid/core_spec.rb",
     "spec/datagrid/drivers/active_record_spec.rb",
     "spec/datagrid/drivers/mongo_mapper_spec.rb",
     "spec/datagrid/drivers/mongoid_spec.rb",
     "spec/datagrid/filters/boolean_enum_filter_spec.rb",
     "spec/datagrid/filters/composite_filters_spec.rb",
     "spec/datagrid/filters/enum_filter_spec.rb",
+    "spec/datagrid/filters/float_filter_spec.rb",
     "spec/datagrid/filters_spec.rb",
     "spec/datagrid/form_builder_spec.rb",
     "spec/datagrid/helper_spec.rb",

data/lib/datagrid.rb

@@ -44,7 +44,7 @@ module Datagrid
   end # InstanceMethods
 
   class ConfigurationError < StandardError; end
-  class ArgumentError < StandardError; end
+  class ArgumentError < ::ArgumentError; end
 
 
 end

data/lib/datagrid/core.rb

@@ -42,10 +42,6 @@ module Datagrid
         end
       end
 
-      def current_scope
-        @scope
-      end
-
       def driver
         @driver ||= Drivers::AbstractDriver.guess_driver(scope).new
       end
@@ -98,17 +94,20 @@ module Datagrid
         self.assets.paginate(*args, &block)
       end
 
-      def scope
-        check_scope_defined!
-        instance_eval(&self.class.current_scope)
+      def scope(&block)
+        if block_given?
+          @current_scope = block
+        else
+          @current_scope ? @current_scope.call : self.class.scope
+        end
       end
 
       def driver
         self.class.driver
       end
 
-      def check_scope_defined!(message = nil )
-        self.class.send :check_scope_defined!, message
+      def check_scope_defined!(message)
+        self.class.check_scope_defined!(message)
       end
 
     end # InstanceMethods

data/lib/datagrid/drivers/mongoid.rb

@@ -12,7 +12,7 @@ module Datagrid
       end
 
       def to_scope(scope)
-        scope.where
+        scope.where(nil)
       end
 
       def where(scope, condition)

data/lib/datagrid/filters.rb

@@ -10,6 +10,7 @@ module Datagrid
     require "datagrid/filters/integer_filter"
     require "datagrid/filters/composite_filters"
     require "datagrid/filters/string_filter"
+    require "datagrid/filters/float_filter"
 
     FILTER_TYPES = {
       :date => Filters::DateFilter,
@@ -19,6 +20,7 @@ module Datagrid
       :boolean => Filters::BooleanFilter ,
       :integer => Filters::IntegerFilter,
       :enum => Filters::EnumFilter,
+      :float => Filters::FloatFilter,
     }
 
     def self.included(base)
@@ -66,8 +68,8 @@ module Datagrid
       protected
       def default_filter(attribute)
         check_scope_defined!("Scope should be defined before filters")
-        lambda do |value, grid|
-          grid.driver.where(self, attribute => value)
+        lambda do |value, scope, grid|
+          grid.driver.where(scope, attribute => value)
         end
       end
 

data/lib/datagrid/filters/base_filter.rb

@@ -21,8 +21,10 @@ class Datagrid::Filters::BaseFilter
       return scope if value.blank? && !allow_blank?
     end
 
-    if block.arity >= 2 || block.arity < 0
-      scope.instance_exec(value, grid_object, &block)
+    if block.arity >= 3 || block.arity < 0
+      scope.instance_exec(value, scope, grid_object, &block)
+    elsif block.arity == 2
+      scope.instance_exec(value, scope, &block)
     else
       scope.instance_exec(value, &block)
     end
@@ -61,5 +63,13 @@ class Datagrid::Filters::BaseFilter
     options[:allow_blank]
   end
 
+  def form_builder_helper_name
+    self.class.form_builder_helper_name
+  end
+
+  def self.form_builder_helper_name
+    :"datagrid_#{self.to_s.demodulize.underscore}"
+  end
+
 end
 

data/lib/datagrid/filters/composite_filters.rb

@@ -16,22 +16,22 @@ module Datagrid
           from_options = normalize_composite_filter_options(from_options, field)
           to_options = normalize_composite_filter_options(to_options, field)
 
-          filter(from_options[:name] || :"from_#{field}", :date, from_options) do |date, grid|
-            grid.driver.greater_equal(self, field, date)
+          filter(from_options[:name] || :"from_#{field.to_s.tr('.', '_')}", :date, from_options) do |date, scope, grid|
+            grid.driver.greater_equal(scope, field, date)
           end
-          filter(to_options[:name] || :"to_#{field}", :date, to_options) do |date, grid|
-            grid.driver.less_equal(self, field, date)
+          filter(to_options[:name] || :"to_#{field.to_s.tr('.', '_')}", :date, to_options) do |date, scope, grid|
+            grid.driver.less_equal(scope, field, date)
           end
         end
 
         def integer_range_filters(field, from_options = {}, to_options = {})
           from_options = normalize_composite_filter_options(from_options, field)
           to_options = normalize_composite_filter_options(to_options, field)
-          filter(from_options[:name] || :"from_#{field}", :integer, from_options) do |value, grid|
-            grid.driver.greater_equal(self, field, value)
+          filter(from_options[:name] || :"from_#{field.to_s.tr('.', '_')}", :integer, from_options) do |value, scope, grid|
+            grid.driver.greater_equal(scope, field, value)
           end
-          filter(to_options[:name] || :"to_#{field}", :integer, to_options) do |value, grid|
-            grid.driver.less_equal(self, field, value)
+          filter(to_options[:name] || :"to_#{field.to_s.tr('.', '_')}", :integer, to_options) do |value, scope, grid|
+            grid.driver.less_equal(scope, field, value)
           end
         end
 

data/lib/datagrid/filters/float_filter.rb

@@ -0,0 +1,6 @@
+class Datagrid::Filters::FloatFilter < Datagrid::Filters::BaseFilter
+  def format(value)
+    return nil if value.blank?
+    value.to_f
+  end
+end

data/lib/datagrid/form_builder.rb

@@ -8,7 +8,7 @@ module Datagrid
       options[:class] ||= ""
       options[:class] += " " unless options[:class].blank?
       options[:class] += "#{filter.name} #{datagrid_filter_html_class(filter)}"
-      self.send(datagrid_filter_method(filter), filter, options)
+      self.send(filter.form_builder_helper_name, filter, options)
     end
 
     def datagrid_label(filter_or_attribute, options = {})
@@ -54,6 +54,10 @@ module Datagrid
       datagrid_default_filter(attribute_or_filter, options)
     end
 
+    def datagrid_float_filter(attribute_or_filter, options = {})
+      datagrid_default_filter(attribute_or_filter, options)
+    end
+
     def get_attribute(attribute_or_filter)
       attribute_or_filter.is_a?(Symbol) ?  attribute_or_filter : attribute_or_filter.name
     end
@@ -71,10 +75,6 @@ module Datagrid
       filter.class.to_s.demodulize.underscore
     end
 
-    def datagrid_filter_method(filter)
-      :"datagrid_#{filter.class.to_s.demodulize.underscore}"
-    end
-
     class Error < StandardError
     end
   end

data/lib/datagrid/renderer.rb

@@ -65,11 +65,11 @@ module Datagrid
     def order_for(grid, column)
       @template.content_tag(:div, :class => "order") do
         @template.link_to(
-          I18n.t("datagrid.table.order.asc", :default => "ASC"),
+          I18n.t("datagrid.table.order.asc", :default => "↑".html_safe),
           @template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => false)),
           :class => "order asc"
         ) + " " + @template.link_to(
-          I18n.t("datagrid.table.order.desc", :default => "DESC"),
+          I18n.t("datagrid.table.order.desc", :default => "↓".html_safe),
           @template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => true )),
           :class => "order desc"
         )

data/spec/datagrid/core_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Datagrid::Core do
+  
+  it "should support change scope on the fly" do
+    report = test_report do
+      scope { Entry }
+    end
+    report.scope do
+      Entry.limit(1)
+    end
+    2.times { Entry.create }
+    report.assets.to_a.size.should == 1
+  end
+end

data/spec/datagrid/filters/composite_filters_spec.rb

@@ -24,6 +24,13 @@ describe Datagrid::Filters::CompositeFilters do
       report.from_shipping_date.should == 10.days.ago.to_date
       report.to_shipping_date.should == Date.today
     end
+    it "should support table name in field" do
+      report = test_report do
+        report = date_range_filters("entries.shipping_date", {:default => 10.days.ago.to_date}, {:default => Date.today})
+      end
+      report.from_entries_shipping_date.should == 10.days.ago.to_date
+      report.to_entries_shipping_date.should == Date.today
+    end
   end
   
   describe ".integer_range_filters" do
@@ -47,5 +54,12 @@ describe Datagrid::Filters::CompositeFilters do
       report.from_group_id.should == 0
       report.to_group_id.should == 100
     end
+    it "should table name in field name" do
+      report = test_report do
+        report = integer_range_filters("entries.group_id", {:default => 0}, {:default => 100})
+      end
+      report.from_entries_group_id.should == 0
+      report.to_entries_group_id.should == 100
+    end
   end
 end

data/spec/datagrid/filters/float_filter_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Datagrid::Filters::FloatFilter do
+  
+  it "should support float values" do
+    g1 = Group.create!(:rating => 1.5)
+    g2 = Group.create!(:rating => 1.6)
+    report = test_report(:rating => 1.5) do
+      scope { Group }
+      filter(:rating, :float)
+    end
+    report.assets.should include(g1)
+    report.assets.should_not include(g2)
+  end
+end

data/spec/datagrid/filters_spec.rb

@@ -29,6 +29,18 @@ describe Datagrid::Filters do
     }.should raise_error(Datagrid::ArgumentError)
   end
 
+  it "should filter block with 2 arguments" do
+    report = test_report do
+      scope {Entry}
+      filter(:group_id, :integer) do |value, scope|
+        scope.where(group_id: value)
+      end
+    end
+    lambda {
+      report.group_id = [1,2]
+    }.should raise_error(Datagrid::ArgumentError)
+  end
+
 
   it "should initialize when report Scope table not exists" do
     class ModelWithoutTable < ActiveRecord::Base; end

data/spec/datagrid/form_builder_spec.rb

@@ -19,6 +19,12 @@ describe Datagrid::FormBuilder do
 
   describe ".datagrid_filter" do
 
+    it "should work for every filter type" do
+      Datagrid::Filters::FILTER_TYPES.each do |type, klass|
+        Datagrid::FormBuilder.instance_methods.should include(klass.form_builder_helper_name)
+      end
+    end
+
     subject { view.datagrid_filter(_filter)}
     context "with default filter type" do
       let(:_grid) {
@@ -129,6 +135,19 @@ describe Datagrid::FormBuilder do
       let(:_filter) { :name }
       it {should equal_to_dom('<select class="name enum_filter" id="report_name" name="report[name]"></select>')}
     end
+    context "with float filter type" do
+      let(:_grid) {
+        test_report do
+          scope {Entry}
+          filter(:group_id, :float)
+        end
+      }
+      let(:_filter) { :group_id }
+      it { should equal_to_dom(
+        '<input class="group_id float_filter" id="report_group_id" name="report[group_id]" size="30" type="text"/>'
+      )}
+
+    end
   end
 
   describe ".datagrid_label" do

data/spec/datagrid/helper_spec.rb

@@ -140,7 +140,7 @@ describe Datagrid::Helper do
     end
 
     describe ".datagrid_order_for" do
-      it "should render ordreing layout" do
+      it "should render ordering layout" do
         class OrderedGrid
           include Datagrid
           scope { Entry }
@@ -149,7 +149,7 @@ 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">ASC</a> <a href="ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="order desc">DESC</a>
+<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>
 </div>
         HTML
       end

data/spec/datagrid_spec.rb

@@ -3,11 +3,11 @@ require "datagrid/rspec"
 
 
 describe SimpleReport do
-
+  
   it_should_behave_like 'Datagrid'
-
+  
   let(:group) { Group.create!(:name => "Pop") }
-
+  
   subject do
     SimpleReport.new(
       :group_id => group.id,
@@ -37,6 +37,7 @@ describe SimpleReport do
     it "should return defined scope of objects" do
       subject.scope.should respond_to(:each)
     end
+      
 
     context "when not defined on class level" do
       subject do
@@ -52,32 +53,6 @@ describe SimpleReport do
     end
   end
 
-end
-
-class SimpleReportWithContext < SimpleReport
-  attr_accessor :current_user
-  scope do
-    current_user.things
-  end
-end
-
-describe SimpleReportWithContext, "with context" do
 
-  subject do
-
-    SimpleReportWithContext.new(
-      :name => "Star",
-      :category => "first",
-      :disabled => false,
-      :confirmed => false
-    )
-  end
-
-  it "should call " do
-    current_user = Object.new
-    current_user.should_receive(:things).and_return([])
-    SimpleReportWithContext.new(:current_user => current_user).scope
-  end
 
 end
-

data/spec/support/active_record.rb

@@ -22,6 +22,7 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :groups do |t|
     t.string :name
+    t.float :rating 
     t.timestamps
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17705320 !ruby/object:Gem::Requirement
+  requirement: &18401700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17705320
+  version_requirements: *18401700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17704400 !ruby/object:Gem::Requirement
+  requirement: &18399960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17704400
+  version_requirements: *18399960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17718840 !ruby/object:Gem::Requirement
+  requirement: &18397320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *17718840
+  version_requirements: *18397320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17715720 !ruby/object:Gem::Requirement
+  requirement: &18408680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *17715720
+  version_requirements: *18408680
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &17713920 !ruby/object:Gem::Requirement
+  requirement: &18403120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17713920
+  version_requirements: *18403120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17711920 !ruby/object:Gem::Requirement
+  requirement: &18416100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17711920
+  version_requirements: *18416100
 - !ruby/object:Gem::Dependency
   name: accept_values_for
-  requirement: &17726920 !ruby/object:Gem::Requirement
+  requirement: &18414260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17726920
+  version_requirements: *18414260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &17725080 !ruby/object:Gem::Requirement
+  requirement: &18411420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17725080
+  version_requirements: *18411420
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &17723640 !ruby/object:Gem::Requirement
+  requirement: &18426080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17723640
+  version_requirements: *18426080
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &17723000 !ruby/object:Gem::Requirement
+  requirement: &18424960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *17723000
+  version_requirements: *18424960
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &17722200 !ruby/object:Gem::Requirement
+  requirement: &18423880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *17722200
+  version_requirements: *18423880
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &17721480 !ruby/object:Gem::Requirement
+  requirement: &18421380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *17721480
+  version_requirements: *18421380
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &17720880 !ruby/object:Gem::Requirement
+  requirement: &18433540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,10 +153,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *17720880
+  version_requirements: *18433540
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &17720180 !ruby/object:Gem::Requirement
+  requirement: &18429580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17720180
+  version_requirements: *18429580
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -203,6 +203,7 @@ files:
 - lib/datagrid/filters/date_filter.rb
 - lib/datagrid/filters/default_filter.rb
 - lib/datagrid/filters/enum_filter.rb
+- lib/datagrid/filters/float_filter.rb
 - lib/datagrid/filters/integer_filter.rb
 - lib/datagrid/filters/string_filter.rb
 - lib/datagrid/form_builder.rb
@@ -214,12 +215,14 @@ files:
 - lib/tasks/datagrid_tasks.rake
 - spec/datagrid/active_model_spec.rb
 - spec/datagrid/columns_spec.rb
+- spec/datagrid/core_spec.rb
 - spec/datagrid/drivers/active_record_spec.rb
 - spec/datagrid/drivers/mongo_mapper_spec.rb
 - spec/datagrid/drivers/mongoid_spec.rb
 - spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
 - spec/datagrid/filters/enum_filter_spec.rb
+- spec/datagrid/filters/float_filter_spec.rb
 - spec/datagrid/filters_spec.rb
 - spec/datagrid/form_builder_spec.rb
 - spec/datagrid/helper_spec.rb
@@ -248,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1581920802397090213
+      hash: -28109512857849373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: