paginated_table 0.0.3 → 0.0.4

data/test/units/controller_helpers_test.rb

@@ -10,33 +10,32 @@ module PaginatedTable
     }
 
     describe "#paginated_table" do
+      let(:name) { "collection_name" }
       let(:collection) { stub("collection") }
-      let(:tables) { { "collection_name" => collection } }
       let(:page) { stub("page") }
       let(:data) { stub("data") }
       let(:data_page) { stub("data_page", :data => data, :page => page) }
 
       before do
-        PageParams.stubs(:create_page_from_params).with(params).returns(page)
+        PageParams.stubs(:create_page).with(params, {}).returns(page)
         DataPage.stubs(:new).with(collection, page).returns(data_page)
       end
 
       it "sets an instance variable on the controller with the data page" do
-        controller.paginated_table(tables)
-        controller.instance_variable_get("@collection_name").must_equal data_page
+        controller.paginated_table(name, collection)
+        controller.instance_variable_get("@#{name}").must_equal data_page
       end
 
       it "renders the named partial without layout if request is xhr?" do
         request.stubs(:xhr? => true)
-        controller.expects(:render).
-          with(:partial => "collection_name", :layout => false)
-        controller.paginated_table(tables)
+        controller.expects(:render).with(:partial => name, :layout => false)
+        controller.paginated_table(name, collection)
       end
 
       it "does not render if request is not xhr?" do
         request.stubs(:xhr? => false)
         controller.expects(:render).never
-        controller.paginated_table(tables)
+        controller.paginated_table(name, collection)
       end
     end
   end

data/test/units/page_test.rb

@@ -123,9 +123,9 @@ module PaginatedTable
   end
 
   describe PageParams do
-    describe ".create_from_params" do
+    describe ".create_page" do
       it "returns a new page created from the request params" do
-        page = PageParams.create_page_from_params(
+        page = PageParams.create_page(
           :page => '2',
           :per_page => '5',
           :sort_column => 'name',
@@ -136,6 +136,17 @@ module PaginatedTable
         page.sort_column.must_equal 'name'
         page.sort_direction.must_equal 'desc'
       end
+
+      it "returns a new page created from the request params and the defaults" do
+        page = PageParams.create_page(
+          { :page => '2', :per_page => '5' },
+          { :sort_column => 'name', :sort_direction => 'desc' }
+        )
+        page.number.must_equal 2
+        page.rows.must_equal 5
+        page.sort_column.must_equal 'name'
+        page.sort_direction.must_equal 'desc'
+      end
     end
 
     describe ".to_params" do

data/test/units/view_helpers_test.rb

@@ -9,15 +9,14 @@ module PaginatedTable
       view.stubs("params" => params)
       view
     }
-    let(:data_page) { stub("data_page") }
+    let(:page) { stub("page") }
+    let(:data_page) { stub("data_page", :page => page) }
     let(:description_block) { lambda {} }
 
     describe "#paginated_table" do
       it "renders a table" do
         table_description = stub("table_description")
         TableDescription.stubs("new").with(description_block).returns(table_description)
-        page = stub("page")
-        PageParams.stubs("create_page_from_params").with(params).returns(page)
         link_renderer = stub("link_renderer")
         LinkRenderer.stubs("new").with(page).returns(link_renderer)
         table_renderer = stub("table_renderer")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paginated_table
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Donald Ball