data_table 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,18 +1,20 @@
 PATH
   remote: .
   specs:
-    data_table (0.1.0)
-      actionpack (~> 3.0.0)
-      activesupport (~> 3.0.0)
+    data_table (0.1.2)
+      rails (~> 3.0.0)
       will_paginate (~> 3.0.pre2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -20,21 +22,51 @@ GEM
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activesupport (3.0.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.4.1)
+    mail (2.2.6.1)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
     rr (1.0.0)
     rspec (2.0.1)
       rspec-core (~> 2.0.1)
@@ -47,6 +79,9 @@ GEM
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
     shoulda (2.11.3)
+    thor (0.14.1)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.23)
     will_paginate (3.0.pre2)
 
@@ -54,9 +89,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.0.0)
-  activesupport (~> 3.0.0)
   data_table!
+  rails (~> 3.0.0)
   rr (~> 1.0.0)
   rspec (~> 2.0.0)
   shoulda (~> 2.11.0)

data/data_table.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "actionpack", "~>3.0.0"
-  s.add_dependency "activesupport", "~>3.0.0"
+  s.add_dependency "rails", "~>3.0.0"
   s.add_dependency "will_paginate", "~>3.0.pre2"
 
   s.add_development_dependency "rspec", "~>2.0.0"

data/lib/data_table/rails.rb

@@ -1,4 +1,10 @@
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.send :extend, DataTable::ClassMethods
-  ActiveRecord::Base.send :extend, DataTable::ActiveRecord::ClassMethods
+module DataTable
+  class Railtie < Rails::Railtie
+    initializer 'data_table.initialize' do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Base.send :extend, DataTable::ClassMethods
+        ActiveRecord::Base.send :extend, DataTable::ActiveRecord::ClassMethods
+      end
+    end
+  end
 end

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/data_table.rb

@@ -1,3 +1,4 @@
+require "rails"
 require "active_support/core_ext/object/blank"
 require "active_support/core_ext/object/to_json"
 require "active_support/json/encoding"
@@ -7,3 +8,4 @@ require "data_table/base"
 require "data_table/active_record"
 require "data_table/mongoid"
 require "data_table/rails"
+require "mongoid/data_table"

data/lib/mongoid/data_table.rb

@@ -0,0 +1,8 @@
+module Mongoid
+  module DataTable
+    def self.included base
+      base.send :extend, ::DataTable::ClassMethods
+      base.send :extend, ::DataTable::Mongoid::ClassMethods
+    end
+  end
+end

data/spec/active_record_data_table_spec.rb

@@ -27,7 +27,7 @@ describe DataTable do
     end
 
     it "should return an AR array with an entry for each search field" do
-      send(:_where_conditions, "query", %w(foo bar)).should == ["foo LIKE ? OR bar LIKE ?", "%query%", "%query%"]
+      send(:_where_conditions, "query", %w(foo bar)).should == ["UPPER(foo) LIKE ? OR UPPER(bar) LIKE ?", "%QUERY%", "%QUERY%"]
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_table
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 -04:00
+date: 2010-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -34,26 +34,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +49,11 @@ dependencies:
         - pre2
         version: 3.0.pre2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +65,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +81,11 @@ dependencies:
         - 0
         version: 2.11.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,7 +97,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
 email: 
 - jason.dew@gmail.com
@@ -137,6 +121,7 @@ files:
 - lib/data_table/mongoid.rb
 - lib/data_table/rails.rb
 - lib/data_table/version.rb
+- lib/mongoid/data_table.rb
 - spec/active_record_data_table_spec.rb
 - spec/data_table_spec.rb
 - spec/mongoid_data_table_spec.rb