data_table 0.4.6 → 0.4.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2I5MDdiYWFiZmQ5MmZjNDZkYWJiNjM1YzU0ZjNiYmQwOGJiMjRkMA==
+  data.tar.gz: !binary |-
+    MWZmZGM1ZGU5YzM4OWE4MzIyYmIyNzkzNWVmZGYwMmI5MGUwOTk1Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzM2NmM1ZDkzNzRjYjQ4OTA3MTMxNjQ4NjM5ZGE5ZTNiNjgyNWNmOGMzMWY2
+    MjBjZjQ5NTEzODJjYTg0YzM3MzNkYTU0OTRlYzQzYWU0ODJiM2MwZjVkMWU3
+    NzZjMGY0ZGZjZTg2ZDdiZjlmOWYzZWI1MGEzN2JhNDkyMDk0Mzc=
+  data.tar.gz: !binary |-
+    YzYyMmMzNzE5MjVmMDI3NjMwZDZmYjliNmNiZWUzMGRiYTc4MzhmYzFlMjkz
+    NjgzODdhZDU1OWQyODY5MGQxOTE1M2I3OGQ4ZTA2ZDVjMDMwMGM2ZGQ2MGFh
+    NjZkY2NjZDE4NjQ4YWM3OGFlMjEyZTU4ZGRjZjA1NmJiYzRhY2U=

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    data_table (0.4.6)
+    data_table (0.4.7)
       rails (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -20,34 +20,33 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    diff-lcs (1.1.2)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
+    hike (1.2.3)
+    i18n (0.6.5)
     journey (1.0.4)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
-    multi_json (1.6.1)
+    mime-types (1.25)
+    multi_json (1.7.9)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -56,53 +55,51 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rr (1.0.0)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rr (1.1.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     shoulda (2.11.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   data_table!
-  rr (~> 1.0.0)
-  rspec (~> 2.0.0)
-  shoulda (~> 2.11.0)
+  rr (~> 1.0)
+  rspec (~> 2.0)
+  shoulda (~> 2.11)

data/data_table.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jason Dew"]
   s.email       = ["jason.dew@gmail.com"]
-  s.homepage    = "http://rubygems.org/gems/data_table"
+  s.homepage    = "https://github.com/jasondew/data_table"
   s.summary     = %q{Simple data preparation from AR/Mongoid to the jQuery DataTables plugin}
   s.description = %q{Simple data preparation from AR/Mongoid to the jQuery DataTables plugin}
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", "~>3.0"
 
-  s.add_development_dependency "rspec", "~>2.0.0"
-  s.add_development_dependency "shoulda", "~>2.11.0"
-  s.add_development_dependency "rr", "~>1.0.0"
+  s.add_development_dependency "rspec", "~>2.0"
+  s.add_development_dependency "shoulda", "~>2.11"
+  s.add_development_dependency "rr", "~>1.0"
 end

data/lib/data_table/base.rb

@@ -37,6 +37,8 @@ module DataTable
     end
 
     def _page params
+      return 1 if params[:idisplaystart].blank? or params[:idisplaylength].blank?
+
       params[:idisplaystart].to_i / params[:idisplaylength].to_i + 1
     end
 

data/lib/data_table/version.rb

@@ -1,3 +1,3 @@
 module DataTable
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/data_table_spec.rb

@@ -33,22 +33,21 @@ describe DataTable do
       result.should == {:sEcho => 1, :iTotalRecords => 42, :iTotalDisplayRecords => 10, :aaData => :results}.to_json.html_safe
     end
 
-    # won't work because of ruby 1.9.2 bug...  https://gist.github.com/455547
-#    it "should work with a pagination library that doesn't respond to #total_entries" do
-#      params = {:sSearch => "answer", :iSortCol_0 => "0", :sSortDir_0 => "desc", :iDisplayLength => "10", :sEcho => "1"}
-#      controller = mock!.params { params }.subject
-#
-#      fields = %w(foo bar baz)
-#      search_fields = %w(foo bar)
-#
-#      mock(self).count { 42 }
-#      mock(self)._matching_count(params, search_fields) { 10 }
-#      mock(self)._find_objects(params, fields, search_fields) { :objects }
-#      mock(self)._yield_and_render_array(controller, :objects, :block) { :results }
-#
-#      result = for_data_table(controller, fields, search_fields, :block)
-#      result.should == {:sEcho => 1, :iTotalRecords => 42, :iTotalDisplayRecords => 10, :aaData => :results}.to_json.html_safe
-#    end
+    it "should work with a pagination library that doesn't respond to #total_entries" do
+      params = {:ssearch => "answer", :isortcol_0 => "0", :ssortdir_0 => "desc", :idisplaylength => "10", :secho => "1"}
+      controller = mock!.params { params }.subject
+
+      fields = %w(foo bar baz)
+      search_fields = %w(foo bar)
+
+      mock(self).count { 42 }
+      mock(self)._matching_count(params, search_fields) { 10 }
+      mock(self)._find_objects(params, fields, search_fields) { :objects }
+      mock(self)._yield_and_render_array(controller, :objects, :block) { :results }
+
+      result = for_data_table(controller, fields, search_fields, :block)
+      result.should == {:sEcho => 1, :iTotalRecords => 42, :iTotalDisplayRecords => 10, :aaData => :results}.to_json.html_safe
+    end
 
   end
 
@@ -77,6 +76,11 @@ describe DataTable do
       it "should return 2 when start is 10" do
         send(:_page, {idisplaystart: "10", idisplaylength: "10"}).should == 2
       end
+
+      it "should default to 1 when idisplaystart or idisplaylength are missing" do
+        send(:_page, {}).should == 1
+      end
+
     end
 
   end
@@ -96,6 +100,10 @@ describe DataTable do
       send(:_per_page, {idisplaylength: "-1"}).should == :all
     end
 
+    it "should default to 10 if idisplaylength is missing" do
+      send(:_per_page, {}).should == 25
+    end
+
   end
 
 end

data/spec/mongoid_data_table_spec.rb

@@ -25,8 +25,8 @@ describe DataTable do
       send(:_where_conditions, "", %w(foo bar baz)).should == nil
     end
 
-    it "should return a mongoid $or hash with an entry for each search field" do
-      send(:_where_conditions, "q", %w(foo bar)).should == {"$or" => [{"foo" => /q/i}, {"bar" => /q/i}]}
+    it "should return a mongoid $and wrapping an $or for each search field" do
+      send(:_where_conditions, "q", %w(foo bar)).should == {"$and" => [{"$or"=>[{"foo"=>/q/i}, {"bar"=>/q/i}]}]}
     end
 
     it "should not use $or if there is only one search field" do

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
 require "data_table"
 
-RSpec.configure {|config| config.mock_with :rr }
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  config.mock_with :rr
+  config.order = "random"
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: data_table
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+  version: 0.4.7
 platform: ruby
 authors:
 - Jason Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,51 +27,45 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
 email:
 - jason.dew@gmail.com
@@ -83,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -102,35 +94,28 @@ files:
 - spec/data_table_spec.rb
 - spec/mongoid_data_table_spec.rb
 - spec/spec_helper.rb
-homepage: http://rubygems.org/gems/data_table
+homepage: https://github.com/jasondew/data_table
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2992976277628805336
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2992976277628805336
 requirements: []
 rubyforge_project: data_table
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple data preparation from AR/Mongoid to the jQuery DataTables plugin
 test_files:
 - spec/active_record_data_table_spec.rb