data_table 0.1.8 → 0.1.9

data/README.rdoc

@@ -25,8 +25,8 @@ in your controller:
       respond_to do |wants|
         wants.html
         wants.json do
-          render(:json => Provider.for_data_table(self, %w(name fein category county state), %w(name fein)) do |provider|
-            ["<%= link_to(provider, provider) %>", provider.fein, provider.category, provider.county, provider.state]
+          render(:json => Provider.for_data_table(self, %w(name fein categories.name county state), %w(name fein)) do |provider|
+            ["<%= link_to(provider, provider) %>", provider.fein, provider.category.name, provider.county, provider.state]
           end)
         end
       end

data/lib/data_table/active_record.rb

@@ -1,12 +1,27 @@
 module DataTable
   module ActiveRecord
     module ClassMethods
+
       def _find_objects params, fields, search_fields
         self.where(_where_conditions params[:sSearch], search_fields).
+             includes(_discover_joins fields).
              order(_order_fields params, fields).
              paginate :page => _page(params), :per_page => _per_page(params)
       end
 
+      def _discover_joins fields
+        joins = Set.new
+
+        fields.each { |it|
+          field = it.split('.')
+          if (field.size == 2) then
+            joins.add field[0].singularize.to_sym
+          end
+        }
+
+        joins.collect
+      end
+
       def _where_conditions query, search_fields
         return if query.blank?
 

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/active_record_data_table_spec.rb

@@ -9,10 +9,11 @@ describe DataTable do
     it "should find the objects required based on the params" do
       params = {:sSearch => "answer", :iSortCol_0 => "0", :sSortDir_0 => "desc", :iDisplayLength => 10, :sEcho => 1}
 
+      mock(self)._discover_joins(%w(foo bar baz)) { [] }
       mock(self)._where_conditions("answer", %w(foo bar)) { "where clause" }
       mock(self)._order_fields(params, %w(foo bar baz)) { "order" }
 
-      mock(self).where("where clause") { mock!.order("order") { mock!.paginate({:page => :page, :per_page => :per_page}) { :answer } } }
+      mock(self).where("where clause") { mock!.includes([]) { mock!.order("order") { mock!.paginate({:page => :page, :per_page => :per_page}) { :answer } } } }
       mock(self)._page(params) { :page }
       mock(self)._per_page(params) { :per_page }
 
@@ -33,6 +34,14 @@ describe DataTable do
 
   end
 
+  context "#_discover_joins" do
+
+     it "should return the joins on the fields" do
+       _discover_joins(%w(foo.bar foz.ber baz)).should == [:foo, :foz]
+     end
+
+  end
+
   context "#_order_fields" do
 
     it "should find the field name and pass the sort direction" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_table
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -05:00
+date: 2011-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id002
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: data_table
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin