mongoid-data_table 1.2.3 → 1.2.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-data_table (1.2.3)
+    mongoid-data_table (1.2.4)
       kaminari (~> 0.12.4)
       rails (>= 3.0.0)
 
@@ -54,7 +54,7 @@ GEM
     mocha (0.9.12)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.1.5)
+    mongoid (2.1.7)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)

data/lib/mongoid/data_table/proxy.rb

@@ -39,13 +39,6 @@ module Mongoid
         params[:iDisplayLength] = conditions.count if (params[:iDisplayLength].to_i rescue 0) == -1
 
         @cookie_prefix = options[:cookie_prefix] || 'SpryMedia_DataTables_'
-        @cookie = @cookies["#{cookie_prefix}#{options[:sInstance]}"]
-        begin
-          @cookie = ::JSON.load(cookie) if cookie.is_a?(String)
-        rescue
-          @cookie = nil
-          @cookies.delete "#{cookie_prefix}#{options[:sInstance]}"
-        end
       end
 
       def collection(force = false)
@@ -57,7 +50,16 @@ module Mongoid
         (@collection = nil).nil?
       end
 
-      def load_cookie!
+      def load_cookie!(sInstance = nil)
+        sInstance ||= options[:sInstance]
+        @cookie = @cookies[cookie_name(sInstance)]
+        begin
+          @cookie = ::JSON.load(cookie) if cookie.is_a?(String)
+        rescue
+          @cookie = nil
+          @cookies.delete cookie_name(sInstance)
+          return self
+        end
         if cookie.present?
 
           state_params = HashWithIndifferentAccess.new.tap do |h|
@@ -180,6 +182,10 @@ module Mongoid
 
       private
 
+      def cookie_name(sInstance)
+        "#{cookie_prefix}#{sInstance}"
+      end
+
       def default_data_table_dataset
         lambda do |object|
           Hash[aliases.map { |c| [ aliases.index(c), object.send(c) ] }].merge(:DT_RowId => object._id)
@@ -209,7 +215,7 @@ module Mongoid
       def method_missing(method, *args, &block) #:nodoc:
         collection.send(method, *args, &block)
       end
-
+1
     end
   end
 end

data/lib/mongoid/data_table/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module DataTable
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-data_table
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-05 00:00:00.000000000Z
+date: 2011-08-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2159026540 !ruby/object:Gem::Requirement
+  requirement: &2160911640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2159026540
+  version_requirements: *2160911640
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2159025700 !ruby/object:Gem::Requirement
+  requirement: &2160910120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *2159025700
+  version_requirements: *2160910120
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2159024760 !ruby/object:Gem::Requirement
+  requirement: &2160909500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2159024760
+  version_requirements: *2160909500
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2159024080 !ruby/object:Gem::Requirement
+  requirement: &2160908580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2159024080
+  version_requirements: *2160908580
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2159023240 !ruby/object:Gem::Requirement
+  requirement: &2160907600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *2159023240
+  version_requirements: *2160907600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159022360 !ruby/object:Gem::Requirement
+  requirement: &2160906460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2159022360
+  version_requirements: *2160906460
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2159021580 !ruby/object:Gem::Requirement
+  requirement: &2160905860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2159021580
+  version_requirements: *2160905860
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2159020260 !ruby/object:Gem::Requirement
+  requirement: &2160905220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2159020260
+  version_requirements: *2160905220
 description: Simple data preparation from Mongoid to the jQuery DataTables plugin
 email:
 - jason.dew@gmail.com
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4185834169125627190
+      hash: -2028248379960395204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4185834169125627190
+      hash: -2028248379960395204
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.7