datagrid 0.5.4 → 0.6.0

data/Gemfile

@@ -10,16 +10,13 @@ group :development do
   gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.0"
 
-  gem "ruby-debug", :platform => "mri_18"
-  #gem "ruby-debug19", :platform => "mri_19"
+  gem "debugger"
 
-  gem "mocha"
   gem "rspec"
   gem "accept_values_for"
   gem "nokogiri" # used to test html output
 
   gem "sqlite3-ruby"
-  gem 'will_paginate', '2.3.15'
 
   gem "mongoid", "2.2.2"
   gem "mongo_mapper", ">=0.11.0"

data/Readme.markdown

@@ -189,6 +189,6 @@ If you need a custom interface for your report you should probably build it your
 
 Like datagrid? 
 
-Follow the repository on [GitHub](https://github.com/bogdan/datagrid/toggle_watch). 
+Follow the repository on [GitHub](https://github.com/bogdan/datagrid). 
 
 Read [author blog](http://gusiev.com).

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

data/app/views/datagrid/_table.html.erb

@@ -1,10 +1,14 @@
-<!--
+<%#
 Local variables:
 * grid - instance of Datagrid
 * assets - Array of database Entities
 * options - passed options Hash
--->
+%>
 <%= content_tag :table, options[:html] do %>
-  <%= datagrid_header(grid, options) %>
-  <%= datagrid_rows(grid, assets, options) %>
+  <thead>
+    <%= datagrid_header(grid, options) %>
+  </thead>
+  <tbody>
+    <%= datagrid_rows(grid, assets, options) %>
+  </tbody>
 <% end %>

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.5.4"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-04-11"
+  s.date = "2012-05-24"
   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 = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "Rakefile",
     "Readme.markdown",
@@ -47,7 +46,6 @@ 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/filter_eval.rb",
     "lib/datagrid/filters/integer_filter.rb",
     "lib/datagrid/filters/string_filter.rb",
     "lib/datagrid/form_builder.rb",
@@ -93,13 +91,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<accept_values_for>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<will_paginate>, ["= 2.3.15"])
       s.add_development_dependency(%q<mongoid>, ["= 2.2.2"])
       s.add_development_dependency(%q<mongo_mapper>, [">= 0.11.0"])
       s.add_development_dependency(%q<bson>, ["= 1.4.0"])
@@ -110,13 +106,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<accept_values_for>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<will_paginate>, ["= 2.3.15"])
       s.add_dependency(%q<mongoid>, ["= 2.2.2"])
       s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
       s.add_dependency(%q<bson>, ["= 1.4.0"])
@@ -128,13 +122,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<accept_values_for>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<will_paginate>, ["= 2.3.15"])
     s.add_dependency(%q<mongoid>, ["= 2.2.2"])
     s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
     s.add_dependency(%q<bson>, ["= 1.4.0"])

data/lib/datagrid.rb

@@ -1,16 +1,24 @@
-require "datagrid/core"
-require "datagrid/active_model"
-require "datagrid/filters"
-require "datagrid/columns"
-require "datagrid/ordering"
+require "action_view"
 
-require "datagrid/helper"
-require "datagrid/form_builder"
-require "datagrid/renderer"
+module Datagrid
 
-require "datagrid/engine"
+  extend ActiveSupport::Autoload
 
-module Datagrid
+  autoload :Core
+  autoload :ActiveModel
+  autoload :Filters
+  autoload :Columns
+  autoload :Ordering
+
+  autoload :Helper
+  ActionView::Base.send(:include, Datagrid::Helper)
+  
+  autoload :FormBuilder
+  ActionView::Helpers::FormBuilder.send(:include, Datagrid::FormBuilder)
+  
+  autoload :Renderer
+
+  autoload :Engine
 
   def self.included(base)
     base.extend         ClassMethods

data/lib/datagrid/core.rb

@@ -42,6 +42,10 @@ module Datagrid
         end
       end
 
+      def current_scope
+        @scope
+      end
+
       def driver
         @driver ||= Drivers::AbstractDriver.guess_driver(scope).new
       end
@@ -95,15 +99,16 @@ module Datagrid
       end
 
       def scope
-        self.class.scope
+        check_scope_defined!
+        instance_eval(&self.class.current_scope)
       end
 
       def driver
         self.class.driver
       end
 
-      def check_scope_defined!(message)
-        self.class.check_scope_defined!(message)
+      def check_scope_defined!(message = nil )
+        self.class.send :check_scope_defined!, message
       end
 
     end # InstanceMethods

data/lib/datagrid/drivers/mongoid.rb

@@ -28,7 +28,7 @@ module Datagrid
       end
 
       def default_order(scope, column_name)
-        scope.fields.keys.include?(column_name.to_s) ? column_name : nil
+        to_scope(scope).klass.fields.keys.include?(column_name.to_s) ? column_name : nil
       end
 
       def greater_equal(scope, field, value)

data/lib/datagrid/filters.rb

@@ -7,7 +7,6 @@ module Datagrid
     require "datagrid/filters/boolean_filter"
     require "datagrid/filters/date_filter"
     require "datagrid/filters/default_filter"
-    require "datagrid/filters/filter_eval"
     require "datagrid/filters/integer_filter"
     require "datagrid/filters/composite_filters"
     require "datagrid/filters/string_filter"
@@ -67,9 +66,8 @@ module Datagrid
       protected
       def default_filter(attribute)
         check_scope_defined!("Scope should be defined before filters")
-        grid = self
-        lambda do |value|
-          grid.driver.where(scope, attribute => value)
+        lambda do |value, grid|
+          grid.driver.where(self, attribute => value)
         end
       end
 
@@ -87,7 +85,7 @@ module Datagrid
       def assets
         result = super
         self.class.filters.each do |filter|
-          result = filter.apply(result, filter_value(filter))
+          result = filter.apply(self, result, filter_value(filter))
         end
         result
       end

data/lib/datagrid/filters/base_filter.rb

@@ -1,4 +1,3 @@
-require "datagrid/filters/filter_eval"
 
 class Datagrid::Filters::BaseFilter
 
@@ -15,13 +14,18 @@ class Datagrid::Filters::BaseFilter
     raise NotImplementedError, "#format(value) suppose to be overwritten"
   end
 
-  def apply(scope, value)
+  def apply(grid_object, scope, value)
     if value.nil?
       return scope if !allow_nil?
     else
       return scope if value.blank? && !allow_blank?
     end
-    ::Datagrid::Filters::FilterEval.new(self, scope, value).run
+
+    if block.arity >= 2 || block.arity < 0
+      scope.instance_exec(value, grid_object, &block)
+    else
+      scope.instance_exec(value, &block)
+    end
   end
 
   def format_values(value)

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -11,8 +11,8 @@ class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter
     super(report, attribute, options, &block)
   end
 
-  def apply(scope, value)
-    super(scope, to_boolean(value))
+  def apply(grid_object, scope, value)
+    super(grid_object, scope, to_boolean(value))
   end
 
   def to_boolean(value)

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|
-            driver.greater_equal(self, field, date)
+          filter(from_options[:name] || :"from_#{field}", :date, from_options) do |date, grid|
+            grid.driver.greater_equal(self, field, date)
           end
-          filter(to_options[:name] || :"to_#{field}", :date, to_options) do |date|
-            driver.less_equal(self, field, date)
+          filter(to_options[:name] || :"to_#{field}", :date, to_options) do |date, grid|
+            grid.driver.less_equal(self, 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|
-            driver.greater_equal(self, field, value)
+          filter(from_options[:name] || :"from_#{field}", :integer, from_options) do |value, grid|
+            grid.driver.greater_equal(self, field, value)
           end
-          filter(to_options[:name] || :"to_#{field}", :integer, to_options) do |value|
-            driver.less_equal(self, field, value)
+          filter(to_options[:name] || :"to_#{field}", :integer, to_options) do |value, grid|
+            grid.driver.less_equal(self, field, value)
           end
         end
 

data/lib/datagrid/form_builder.rb

@@ -13,7 +13,7 @@ module Datagrid
 
     def datagrid_label(filter_or_attribute, options = {})
       filter = get_filter(filter_or_attribute)
-      self.label(filter.name, filter.header, options = {})
+      self.label(filter.name, filter.header, options)
     end
 
     protected
@@ -45,7 +45,7 @@ module Datagrid
     def datagrid_integer_filter(attribute_or_filter, options = {})
       filter = get_filter(attribute_or_filter)
       if filter.multiple && self.object[filter.name].blank?
-        options[:value] = "" 
+        options[:value] = ""
       end
       text_field filter.name, options
     end
@@ -55,12 +55,12 @@ module Datagrid
     end
 
     def get_attribute(attribute_or_filter)
-      attribute_or_filter.is_a?(Symbol) ?  attribute_or_filter : attribute_or_filter.name 
+      attribute_or_filter.is_a?(Symbol) ?  attribute_or_filter : attribute_or_filter.name
     end
 
     def get_filter(attribute_or_filter)
-      if attribute_or_filter.is_a?(Symbol) 
-        object.class.filter_by_name(attribute_or_filter) || 
+      if attribute_or_filter.is_a?(Symbol)
+        object.class.filter_by_name(attribute_or_filter) ||
           raise(Error, "filter #{attribute_or_filter} not found")
       else
         attribute_or_filter
@@ -80,5 +80,4 @@ module Datagrid
   end
 end
 
-ActionView::Helpers::FormBuilder.send(:include, Datagrid::FormBuilder)
 

data/lib/datagrid/helper.rb

@@ -36,4 +36,4 @@ module Datagrid
     end
   end
 end
-ActionView::Base.send(:include, Datagrid::Helper)
+

data/lib/datagrid/renderer.rb

@@ -12,7 +12,15 @@ module Datagrid
     end
 
     def format_value(grid, column, asset)
-      value = column.html? ? @template.instance_exec(asset, grid, &column.block) : column.value(asset, grid)
+      value = if column.html?
+        if column.block.arity > 1
+          @template.instance_exec(asset, grid, &column.block)
+        else
+          @template.instance_exec(asset, &column.block)
+        end
+      else
+        column.value(asset, grid)
+      end
       url = column.options[:url] && column.options[:url].call(asset)
       if url
         @template.link_to(value, url)
@@ -32,7 +40,7 @@ module Datagrid
       options[:html][:class] ||= "datagrid #{grid.class.to_s.underscore.demodulize}"
       assets = args.any? ? args.shift : grid.assets
       paginate = options[:paginate]
-      if paginate 
+      if paginate
         ::Datagrid::Utils.warn_once(":paginate option is deprecated. Looks to https://github.com/bogdan/datagrid/wiki/Frontend.")
         assets = assets.paginate(paginate)
       end
@@ -57,7 +65,7 @@ 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 => "ASC"),
           @template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => false)),
           :class => "order asc"
         ) + " " + @template.link_to(

data/spec/datagrid/form_builder_spec.rb

@@ -119,9 +119,9 @@ describe Datagrid::FormBuilder do
         test_report do
           scope {Entry}
           filter(
-            :name, :enum, 
-            :include_blank => false, 
-            :multiple => false, 
+            :name, :enum,
+            :include_blank => false,
+            :multiple => false,
             :select => []
           )
         end
@@ -143,10 +143,12 @@ describe Datagrid::FormBuilder do
         '<label for="report_name">Name</label>'
       )
     end
+    it "should pass options through to the helper" do
+      view.datagrid_label(:name, :class => 'foo').should equal_to_dom(
+        '<label class="foo" for="report_name">Name</label>'
+      )
+    end
   end
-
-  
-
 end
 
 

data/spec/datagrid/helper_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require "will_paginate"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/object"
 

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,7 +37,6 @@ 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
@@ -48,11 +47,37 @@ describe SimpleReport do
         lambda {
           subject.scope
         }.should raise_error(Datagrid::ConfigurationError)
-        
+
       end
     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/spec_helper.rb

@@ -13,7 +13,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require "active_record"
-require "will_paginate"
+require 'action_view'
 require "mongoid"
 require "mongo_mapper"
 require 'datagrid'

data/spec/support/active_record.rb

@@ -6,7 +6,6 @@ ActiveRecord::Base.logger = TEST_LOGGER
 
 
 
-WillPaginate.enable
 
 ActiveRecord::Schema.verbose = false
 ActiveRecord::Schema.define(:version => 1) do

data/spec/support/mongoid.rb

@@ -6,10 +6,10 @@ Mongoid.from_hash({
   "host" => "localhost",
   "database" =>"datagrid_mongoid",
   "autocreate_indexes" => true,
+  "logger" => nil,
 })
 
 #Mongoid.logger = TEST_LOGGER #TODO: understand why still output to STDOUT
-Mongoid.logger = nil
 
 
 class MongoidEntry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &9639800 !ruby/object:Gem::Requirement
+  requirement: &17705320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9639800
+  version_requirements: *17705320
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9638360 !ruby/object:Gem::Requirement
+  requirement: &17704400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9638360
+  version_requirements: *17704400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9637320 !ruby/object:Gem::Requirement
+  requirement: &17718840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *9637320
+  version_requirements: *17718840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9636560 !ruby/object:Gem::Requirement
+  requirement: &17715720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *9636560
+  version_requirements: *17715720
 - !ruby/object:Gem::Dependency
-  name: ruby-debug
-  requirement: &9634860 !ruby/object:Gem::Requirement
+  name: debugger
+  requirement: &17713920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9634860
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &9632840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *9632840
+  version_requirements: *17713920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9647700 !ruby/object:Gem::Requirement
+  requirement: &17711920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9647700
+  version_requirements: *17711920
 - !ruby/object:Gem::Dependency
   name: accept_values_for
-  requirement: &9644920 !ruby/object:Gem::Requirement
+  requirement: &17726920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9644920
+  version_requirements: *17726920
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9642560 !ruby/object:Gem::Requirement
+  requirement: &17725080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9642560
+  version_requirements: *17725080
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &9641040 !ruby/object:Gem::Requirement
+  requirement: &17723640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,21 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9641040
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: &9656640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 2.3.15
-  type: :development
-  prerelease: false
-  version_requirements: *9656640
+  version_requirements: *17723640
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &9655700 !ruby/object:Gem::Requirement
+  requirement: &17723000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +120,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *9655700
+  version_requirements: *17723000
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &9655180 !ruby/object:Gem::Requirement
+  requirement: &17722200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +131,10 @@ dependencies:
         version: 0.11.0
   type: :development
   prerelease: false
-  version_requirements: *9655180
+  version_requirements: *17722200
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &9654520 !ruby/object:Gem::Requirement
+  requirement: &17721480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +142,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *9654520
+  version_requirements: *17721480
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &9653580 !ruby/object:Gem::Requirement
+  requirement: &17720880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,10 +153,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *9653580
+  version_requirements: *17720880
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &9652580 !ruby/object:Gem::Requirement
+  requirement: &17720180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9652580
+  version_requirements: *17720180
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -198,7 +176,6 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - Rakefile
 - Readme.markdown
@@ -226,7 +203,6 @@ files:
 - lib/datagrid/filters/date_filter.rb
 - lib/datagrid/filters/default_filter.rb
 - lib/datagrid/filters/enum_filter.rb
-- lib/datagrid/filters/filter_eval.rb
 - lib/datagrid/filters/integer_filter.rb
 - lib/datagrid/filters/string_filter.rb
 - lib/datagrid/form_builder.rb
@@ -272,7 +248,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2917374290940836838
+      hash: -1581920802397090213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,151 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    accept_values_for (0.4.3)
-      activemodel (>= 3.0.0)
-      rspec
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    bson (1.4.0)
-    bson_ext (1.4.0)
-    builder (3.0.0)
-    columnize (0.3.5)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    fastercsv (1.5.4)
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.3)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    mongo (1.4.0)
-      bson (= 1.4.0)
-    mongo_mapper (0.11.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.4.0)
-    mongoid (2.2.2)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
-    plucky (0.4.3)
-      mongo (~> 1.3)
-    polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
-      bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
-    rdoc (3.11)
-      json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    will_paginate (2.3.15)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  accept_values_for
-  bson (= 1.4.0)
-  bson_ext (= 1.4.0)
-  bundler (~> 1.1.0)
-  fastercsv
-  jeweler (~> 1.6.0)
-  mocha
-  mongo_mapper (>= 0.11.0)
-  mongoid (= 2.2.2)
-  nokogiri
-  rails (>= 3.0)
-  rake
-  rspec
-  ruby-debug
-  sqlite3-ruby
-  will_paginate (= 2.3.15)

data/lib/datagrid/filters/filter_eval.rb

@@ -1,31 +0,0 @@
-# ActiveRecord is a little brain fuck.
-# We can not call instance_eval on ActiveRecord::Relation class
-# because it will automatically convert it to an array because #instance_eval
-# is not included in the method list that do not cause force result loading
-# That is why we need this helper class
-class Datagrid::Filters::FilterEval
-
-  attr_accessor :filter, :scope, :value
-
-  def initialize(filter, scope, value)
-    @filter = filter
-    @scope = scope
-    @value = value
-  end
-
-  def run
-    instance_exec @value, &(@filter.block)
-  end
-
-  def driver
-    @filter.grid.driver
-  end
-
-  def method_missing(meth, *args, &blk)
-    if @scope.respond_to?(meth)
-      @scope.send(meth, *args, &blk)
-    else
-      super(meth, *args, &blk)
-    end
-  end
-end