mongoid-data_table 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-data_table (1.0.0)
+    mongoid-data_table (1.0.1)
       rails (~> 3.0.0)
       will_paginate (~> 3.0.pre2)
 

data/lib/mongoid/data_table.rb

@@ -35,9 +35,7 @@ module Mongoid
         self.data_table_options[:sortable] ||= self.data_table_fields
       end
 
-      def to_data_table(controller, options = {}, explicit_block = nil, &implicit_block) #fields, search_fields=nil, explicit_block=nil, &implicit_block)
-        block = (explicit_block or implicit_block)
-
+      def to_data_table(controller, options = {}, &block)
         ::Mongoid::DataTable::Proxy.new(self, controller, options, &block)
       end
 

data/lib/mongoid/data_table/proxy.rb

@@ -2,16 +2,16 @@ module Mongoid
   module DataTable
     class Proxy < ::Mongoid::Relations::Proxy
 
-      attr_reader :klass, :controller, :options, :block, :params, :criteria, :unscoped, :fields, :aliases
+      attr_reader :klass, :controller, :options, :extension, :params, :criteria, :unscoped, :fields, :aliases
 
       def initialize(klass, controller, options = {}, &block)
         @klass      = klass
         @controller = controller
         @options    = klass.data_table_options.merge(options)
-        @block      = block
+        @extension  = block
 
         @params   = options[:params]   || controller.params.dup
-        @criteria = options[:criteria] || klass.scoped
+        @criteria = options[:criteria] || klass.criteria
         @unscoped = options[:unscoped] || klass.unscoped
         @fields   = options[:fields]   || klass.data_table_fields
         @aliases  = options[:aliases]  || @fields
@@ -40,17 +40,17 @@ module Mongoid
       end
 
       def conditions
-        criteria.clone.order_by(order_by_conditions).where(filter_conditions).where(filter_field_conditions)
+        criteria.order_by(order_by_conditions).where(filter_conditions).where(filter_field_conditions)
       end
 
       def to_hash(&inline_block)
-        inline_block = block || default_data_table_block unless block_given?
+        inline_block = extension || default_data_table_block unless block_given?
         {
           :sEcho => params[:sEcho].to_i,
           :iTotalRecords => unscoped.count,
           :iTotalDisplayRecords => conditions.count,
           :aaData => collection.map do |object|
-            data = controller.instance_eval { inline_block[object] }
+            data = controller.instance_eval { inline_block.call(object) }
             data.inject(data.is_a?(Hash) ? {} : []) do |result, item|
               Rails.logger.silence do
                 controller.instance_eval(&render_data_table_block(klass, item, object, result))

data/lib/mongoid/data_table/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module DataTable
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: mongoid-data_table
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jason Dew
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 Z
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails