data_table 0.1.9 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    data_table (0.1.7)
+    data_table (0.2.0)
       rails (~> 3.0.0)
       will_paginate (~> 3.0.pre2)
 
@@ -9,63 +9,63 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
       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)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     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)
+    i18n (0.5.0)
+    mail (2.2.17)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.1)
+    rack (1.2.2)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       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)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rr (1.0.0)
     rspec (2.0.1)
@@ -79,10 +79,10 @@ GEM
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
     shoulda (2.11.3)
-    thor (0.14.1)
-    treetop (1.4.8)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.26)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -90,8 +90,6 @@ PLATFORMS
 
 DEPENDENCIES
   data_table!
-  rails (~> 3.0.0)
   rr (~> 1.0.0)
   rspec (~> 2.0.0)
   shoulda (~> 2.11.0)
-  will_paginate (~> 3.0.pre2)

data/lib/data_table/active_record.rb

@@ -11,15 +11,21 @@ module DataTable
 
       def _discover_joins fields
         joins = Set.new
+        object = self.new
 
         fields.each { |it|
           field = it.split('.')
+
           if (field.size == 2) then
-            joins.add field[0].singularize.to_sym
+            if object.respond_to?(field[0].to_sym)
+              joins.add field[0].to_sym
+            elsif object.respond_to?(field[0].singularize.to_sym)
+              joins.add field[0].singularize.to_sym
+            end
           end
         }
 
-        joins.collect
+        joins.to_a
       end
 
       def _where_conditions query, search_fields

data/lib/data_table/version.rb

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

data/spec/active_record_data_table_spec.rb

@@ -36,9 +36,18 @@ describe DataTable do
 
   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
+    it "should return the joins on the fields" do
+      mock(self).new {self}
+      stub(self).foo {true}
+      stub(self).foz {true}
+      stub(self).furs {true}
+
+      joins = _discover_joins(%w(foo.bar foz.ber furs.bib nones.zip baz))
+      joins.should include :foo
+      joins.should include :foz
+      joins.should include :furs
+      joins.should_not include :nones
+    end
 
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: data_table
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jason Dew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: data_table
-rubygems_version: 1.4.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin