mongoid-data_table 1.3.1 → 1.3.2

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+before_install: gem install bundler --pre

data/Gemfile.lock

@@ -138,6 +138,7 @@ DEPENDENCIES
   mocha (~> 0.10.0)
   mongoid (~> 2.1)
   mongoid-data_table!
+  rake
   rb-fsevent
   rspec (~> 2.8)
   spork (~> 0.9.0.rc)

data/lib/mongoid/data_table/proxy.rb

@@ -71,7 +71,7 @@ module Mongoid
             h[:iSortCol_0], h[:sSortDir_0] = (cookie['aaSorting'].first rescue [ nil, nil ])
 
             begin
-              cookie['aaSearchCols'].each_with_index do |(value,regex),index|
+              (cookie['aaSearchCols'] || cookie['aoSearchCols']).each_with_index do |(value,regex),index|
                 h[:"bRegex_#{index}"]  = !regex
                 h[:"sSearch_#{index}"] = value
               end
@@ -93,7 +93,7 @@ module Mongoid
         return [] if cookie.blank?
         array = []
         begin
-          cookie['aaSearchCols'].each_with_index do |(value,regex),index|
+          (cookie['aaSearchCols'] || cookie['aoSearchCols']).each_with_index do |(value,regex),index|
             array.push(URI.decode(value.to_s))
           end
         rescue

data/lib/mongoid/data_table/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module DataTable
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/mongoid-data_table.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 3.0.0"
   s.add_dependency "kaminari", "~> 0.13.0"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "bson_ext", "~>1.3"
   s.add_development_dependency "mongoid", "~>2.1"
   s.add_development_dependency "mocha", "~>0.10.0"

data/spec/spec_helper.rb

@@ -20,9 +20,12 @@ Spork.prefork do
 
   LOGGER = ActiveSupport::BufferedLogger.new($stdout)
 
+  def database_id
+    ENV["CI"] ? "mongoid_data_table_#{Process.pid}" : "mongoid_data_table_test"
+  end
+
   Mongoid.configure do |config|
-    name = "mongoid_data_table_test"
-    config.master = Mongo::Connection.new.db(name)
+    config.master = Mongo::Connection.new.db(database_id)
     config.logger = nil
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-data_table
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70294400798420 !ruby/object:Gem::Requirement
+  requirement: &70327813848740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70294400798420
+  version_requirements: *70327813848740
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70294400797720 !ruby/object:Gem::Requirement
+  requirement: &70327813847520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,21 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70294400797720
+  version_requirements: *70327813847520
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70327813846940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70327813846940
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70294400797100 !ruby/object:Gem::Requirement
+  requirement: &70327813845920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70294400797100
+  version_requirements: *70327813845920
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70294405700120 !ruby/object:Gem::Requirement
+  requirement: &70327813844780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70294405700120
+  version_requirements: *70327813844780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70294405699320 !ruby/object:Gem::Requirement
+  requirement: &70327813843500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70294405699320
+  version_requirements: *70327813843500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70294405698680 !ruby/object:Gem::Requirement
+  requirement: &70327813842980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70294405698680
+  version_requirements: *70327813842980
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70294405698100 !ruby/object:Gem::Requirement
+  requirement: &70327813842320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +99,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *70294405698100
+  version_requirements: *70327813842320
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70294405697480 !ruby/object:Gem::Requirement
+  requirement: &70327813857980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294405697480
+  version_requirements: *70327813857980
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70294405696700 !ruby/object:Gem::Requirement
+  requirement: &70327813857120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294405696700
+  version_requirements: *70327813857120
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70294405695760 !ruby/object:Gem::Requirement
+  requirement: &70327813855780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +132,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70294405695760
+  version_requirements: *70327813855780
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70294405695100 !ruby/object:Gem::Requirement
+  requirement: &70327813854820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294405695100
+  version_requirements: *70327813854820
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70294405694240 !ruby/object:Gem::Requirement
+  requirement: &70327813853180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294405694240
+  version_requirements: *70327813853180
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &70294405709740 !ruby/object:Gem::Requirement
+  requirement: &70327813852340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294405709740
+  version_requirements: *70327813852340
 description: Simple data preparation from Mongoid to the jQuery DataTables plugin
 email:
 - jason.dew@gmail.com
@@ -165,6 +176,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile