data_table 0.3.8 → 0.3.9

data/lib/data_table/active_record.rb

@@ -3,7 +3,7 @@ module DataTable
     module ClassMethods
 
       def _find_objects params, fields, search_fields
-        self.where(_where_conditions params[:sSearch], 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)
@@ -95,8 +95,8 @@ module DataTable
       end
 
       def _order_fields params, fields
-        direction = params[:sSortDir_0] == "asc" ? "ASC" : "DESC"
-        %{#{fields[params[:iSortCol_0].to_i]} #{direction}}
+        direction = params[:ssortdir_0] == "asc" ? "ASC" : "DESC"
+        %{#{fields[params[:isortcol_0].to_i]} #{direction}}
       end
     end
   end

data/lib/data_table/base.rb

@@ -7,14 +7,14 @@ module DataTable
 
   module ClassMethods
     def for_data_table controller, fields, search_fields=nil, explicit_block=nil, &implicit_block
-      params = controller.params.dup
+      params = Hash[*controller.params.map {|key, value| [key.to_s.downcase.to_sym, value] }.flatten]
       search_fields ||= fields
       block = (explicit_block or implicit_block)
 
       objects = _find_objects params, fields, search_fields
       matching_count = objects.respond_to?(:total_entries) ? objects.total_entries : _matching_count(params, search_fields)
 
-      {:sEcho                => params[:sEcho].to_i,
+      {:sEcho                => params[:secho].to_i,
        :iTotalRecords        => self.count,
        :iTotalDisplayRecords => matching_count,
        :aaData               => _yield_and_render_array(controller, objects, block)
@@ -36,12 +36,11 @@ module DataTable
     end
 
     def _page params
-      return 1 if params[:iDisplayLength].blank?
-      params[:iDisplayStart].to_i / params[:iDisplayLength].to_i + 1
+      params[:idisplaystart].to_i / params[:idisplaylength].to_i + 1
     end
 
     def _per_page params
-      case (display_length = params[:iDisplayLength].to_i)
+      case (display_length = params[:idisplaylength].to_i)
         when -1 then self.count
         when  0 then 25
         else         display_length

data/lib/data_table/mongoid.rb

@@ -2,14 +2,14 @@ module DataTable
   module Mongoid
     module ClassMethods
       def _find_objects params, fields, search_fields
-        self.where(_where_conditions params[:sSearch], search_fields).
+        self.where(_where_conditions params[:ssearch], search_fields).
              order_by(_order_by_fields params, fields).
              page(_page params).
              per(_per_page params)
       end
 
       def _matching_count params, search_fields
-        self.where(_where_conditions params[:sSearch], search_fields).count
+        self.where(_where_conditions params[:ssearch], search_fields).count
       end
 
       def _where_conditions raw_query, search_fields
@@ -30,7 +30,7 @@ module DataTable
       end
 
       def _order_by_fields params, fields
-        [fields[params[:iSortCol_0].to_i], params[:sSortDir_0] || "asc"]
+        [fields[params[:isortcol_0].to_i], params[:ssortdir_0] || "asc"]
       end
 
       def _sanitize string

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/spec/active_record_data_table_spec.rb

@@ -7,7 +7,7 @@ describe DataTable do
   context "#_find_objects" 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}
+      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" }
@@ -96,7 +96,7 @@ describe DataTable do
   context "#_order_fields" do
 
     it "should find the field name and pass the sort direction" do
-      send(:_order_fields, {:iSortCol_0 => "1", :sSortDir_0 => "asc"}, %w(foo bar baz)).should == "bar ASC"
+      send(:_order_fields, {:isortcol_0 => "1", :ssortdir_0 => "asc"}, %w(foo bar baz)).should == "bar ASC"
     end
 
   end

data/spec/data_table_spec.rb

@@ -16,7 +16,8 @@ describe DataTable do
   context "#for_data_table" do
 
     it "should produce JSON for the datatables plugin to consume" do
-      params = {:sSearch => "answer", :iSortCol_0 => "0", :sSortDir_0 => "desc", :iDisplayLength => "10", :sEcho => "1"}
+      params = {sSearch: "answer", iSortCol_0: "0", sSortDir_0: "desc", iDisplayLength: "10", sEcho: "1"}
+      normalized_params = {ssearch: "answer", isortcol_0: "0", ssortdir_0: "desc", idisplaylength: "10", secho: "1"}
       controller = mock!.params { params }.subject
 
       fields = %w(foo bar baz)
@@ -25,7 +26,7 @@ describe DataTable do
 
       mock(self).count { 42 }
       objects = mock!.total_entries { 10 }.subject
-      mock(self)._find_objects(params, fields, search_fields) { objects }
+      mock(self)._find_objects(normalized_params, fields, search_fields) { objects }
       mock(self)._yield_and_render_array(controller, objects, block) { :results }
 
       result = for_data_table(controller, fields, search_fields, block)
@@ -69,20 +70,12 @@ describe DataTable do
   context "#_page" do
 
     context "with a display length of 10" do
-      it "should return 1 when display length is blank" do
-        send(:_page, {:iDisplayStart => "0"}).should == 1
-      end
-
-      it "should return 1 when start is blank" do
-        send(:_page, {:iDisplayStart => "", :iDisplayLength => "10"}).should == 1
-      end
-
       it "should return 1 when start is 0" do
-        send(:_page, {:iDisplayStart => "0", :iDisplayLength => "10"}).should == 1
+        send(:_page, {idisplaystart: "0", idisplaylength: "10"}).should == 1
       end
 
       it "should return 2 when start is 10" do
-        send(:_page, {:iDisplayStart => "10", :iDisplayLength => "10"}).should == 2
+        send(:_page, {idisplaystart: "10", idisplaylength: "10"}).should == 2
       end
     end
 
@@ -91,16 +84,16 @@ describe DataTable do
   context "#_per_page" do
 
     it "should return 10 given an iDisplayLength of 10" do
-      send(:_per_page, {:iDisplayLength => "10"}).should == 10
+      send(:_per_page, {idisplaylength: "10"}).should == 10
     end
 
     it "should return a default of 25 given an invalid iDisplayLength" do
-      send(:_per_page, {:iDisplayLength => "foobar"}).should == 25
+      send(:_per_page, {idisplaylength: "foobar"}).should == 25
     end
 
     it "should return self.count given an iDisplayLength of -1" do
       mock(self).count { :all }
-      send(:_per_page, {:iDisplayLength => "-1"}).should == :all
+      send(:_per_page, {idisplaylength: "-1"}).should == :all
     end
 
   end

data/spec/mongoid_data_table_spec.rb

@@ -6,7 +6,7 @@ describe DataTable do
 
   context "#_find_objects" 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}
+      params = {:ssearch => "answer", :isortcol_0 => "0", :ssortdir_0 => "desc", :idisplaylength => 10, :secho => 1}
 
       mock(self)._where_conditions("answer", %w(foo bar)) { "where clause" }
       mock(self)._order_by_fields(params, %w(foo bar baz)) { "order by" }
@@ -48,7 +48,7 @@ describe DataTable do
   context "#_order_by_fields" do
 
     it "should find the field name and pass the sort direction" do
-      send(:_order_by_fields, {:iSortCol_0 => "1", :sSortDir_0 => "asc"}, %w(foo bar baz)).should == ["bar", "asc"]
+      send(:_order_by_fields, {:isortcol_0 => "1", :ssortdir_0 => "asc"}, %w(foo bar baz)).should == ["bar", "asc"]
     end
 
     it "should use defaults if none are given" do

metadata

@@ -1,97 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: data_table
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 8
-  version: 0.3.8
+version: !ruby/object:Gem::Version
+  version: 0.3.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jason Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-19 00:00:00 -05:00
+date: 2011-09-23 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164364780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164364780
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2164364280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2164364280
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2164363820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2164363820
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2164363360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *2164363360
 description: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
-email: 
+email:
 - jason.dew@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -114,38 +85,29 @@ files:
 has_rdoc: true
 homepage: http://rubygems.org/gems/data_table
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: data_table
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
-test_files: 
+test_files:
 - spec/active_record_data_table_spec.rb
 - spec/data_table_spec.rb
 - spec/mongoid_data_table_spec.rb