the_grid 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmUzMzViNTAwMmM5MjlmNGVjOWY2OGY1N2E3ZmVhMzBiYTA5NDhlOA==
+    NGE5YjY3ZGZiZjJjOWUxMjBlMDlkMGNmYzRlMGQ0ODEzMTYyODc3Yg==
   data.tar.gz: !binary |-
-    YWY0N2ZlYzE4N2U1ZWUwMjhkOTJjNWUzNjE3OTY0ZDY4ODlkNTNkOQ==
+    ZWVmMDM4YTAxOGM3N2Y1NmI2ZmI5YTY0ZTcxMDZhMmQ4MTc0NmRiMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWU3NzRhMGNjM2ZiMzQwMGVjMTAyNTdhMTQyZDE2MDM3YzQ1ZjNhODhhZDc5
-    ZGZiZDdmNGM1ZmRlMDY5ZjU1M2U1ZDdkZjE2MTQ5YjZmMjc3MDE2MGJiYmRk
-    N2ZmOGVhN2YwODZjOTFiNDBiOTNiYmRjNTIwMTBmNzQ4NmJjYWU=
+    YjEwYWU3Y2E5MGE5YmYwYWZmYmE5MmMyY2YwNjVhNjYxOTBiYWE2NmYwZDk4
+    NjY3MzY5Y2Y4YmU4M2UxNjRhMmNjNDE5NzVlMDNlOTU0YzdlMTgxOWU4Y2Ni
+    Njg4YjUwNjA2NThmNjgwNDYxNjMyOWY5MjI4NmU5Y2Q5MDI3ZGI=
   data.tar.gz: !binary |-
-    ZmE5ZDRkODVjMjMxMzI1MDRkNDQzMzkwYjU4MTZlZWIxMWFjYTBiMjAxYzRh
-    ODgxZmU3ZmJlOGMxZWI3ZjE5ODc5MDJhMzY5ZGIxNDU0MTAxZDE5Nzk5ZDVm
-    ZDdjYmMzNmI5NDY1MzJmMzQ5MDU5MTk2Zjg4ZWRjOTUwZDVjOTU=
+    YTI3NzIwMTc2MmJiNzY5YTQzZmVjZjU0ODVjYmM0NGQ5N2NmNGEwNDljZWYw
+    MGU4NzhhZmQ5NjAwZjIyMzc4YWY4MDMxZjUyMDllMGQ2MGE1NmMzZDIxYzQx
+    ZTNjMGY3YzQ2Y2I0Y2FjYzM2MWFkNDU1OGIxMmRkNGI0OWE5MGQ=

data/lib/the_grid/api/command/paginate.rb

@@ -6,6 +6,7 @@ module TheGrid
       {}.tap do |o|
         o[:page] = params[:page].to_i
         o[:page] = 1 if o[:page] <= 0
+        o[:size] = params[:size]
 
         o[:per_page] = params[:per_page].to_i
         o[:per_page] = self.class.default_per_page if o[:per_page] <= 0
@@ -18,7 +19,8 @@ module TheGrid
 
     def calculate_max_page_for(relation, params)
       params = configure(relation, params)
-      (relation.except(:limit, :offset).count / params[:per_page].to_f).ceil
+      total_count = params[:size].present? ? params[:size] : relation.except(:limit, :offset, :includes).count
+      (total_count / params[:per_page].to_f).ceil
     end
 
     def contextualize(relation, params)
@@ -26,4 +28,4 @@ module TheGrid
     end
 
   end
-end
+end

data/lib/the_grid/builder/csv.rb

@@ -13,7 +13,7 @@ module TheGrid
 
     def assemble_with(params)
       options = params.merge context.params
-      api.compose!(options.merge :per_page => BATCH_SIZE) if api.relation.respond_to?(:except)
+      api.compose!(options.merge :per_page => BATCH_SIZE) if api.relation.respond_to?(:connection)
       generate_csv_with(options)
     end
 
@@ -25,14 +25,15 @@ module TheGrid
         api.relation.kind_of?(Array) ? put_data_to(csv) : put_relation_to(csv)
       end
     end
-    
+
     def put_data_to(csv)
       put_records_to(csv, api.relation)
     end
 
     def put_relation_to(csv)
-      (1..api.options[:max_page]).each do |page|
-        relation = api.run_command!(:paginate, :page => page, :per_page => BATCH_SIZE)
+      pages = api.options[:max_page]
+      (1..pages).each do |page|
+        relation = api.run_command!(:paginate, :page => page, :per_page => BATCH_SIZE, :size => pages * BATCH_SIZE)
         put_records_to(csv, relation)
       end
     end

data/lib/the_grid/version.rb

@@ -1,3 +1,3 @@
 module TheGrid
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/api/command/paginate_spec.rb

@@ -35,10 +35,15 @@ describe TheGrid::Api::Command::Paginate do
     it "should respect specified per_page option" do
       subject.calculate_max_page_for(relation, :per_page => 15).should eql 2
     end
+
+    it "does not count rows if size options is present" do
+      relation.should_not_receive(:count)
+      subject.calculate_max_page_for(relation, :per_page => 15, :page => 1, :size => 100)
+    end
   end
 
   it "calculates max page when prepares context" do
     subject.contextualize(relation, :page => 1, :per_page => 15).fetch(:max_page).should eql 2
   end
 
-end
+end

data/spec/builder/csv_spec.rb

@@ -5,7 +5,8 @@ describe TheGrid::Builder::Csv do
   subject{ TheGrid::Builder::Csv.new(relation, build_context) }
 
   include_examples "for Grid View Builder"
-  before(:each) { subject.api.stub(:compose!){ subject.api.options[:max_page] = 1 } }
+  before(:each) { subject.api.stub(:compose!) }
+  before(:each) { subject.api.options[:max_page] = 1 }
 
   let(:relation) { double.as_null_object }
   let(:record)   {{ :id => 1, :name => "Name", :status => "Active", :text => "Text" }}
@@ -23,7 +24,7 @@ describe TheGrid::Builder::Csv do
   end
 
   it "generates csv records in batches" do
-    subject.api.should_receive(:run_command!).with(:paginate, :page => 1, :per_page => params[:per_page])
+    subject.api.should_receive(:run_command!).with(:paginate, :page => 1, :per_page => params[:per_page], :size => subject.api.options[:max_page] * params[:per_page])
     subject.assemble_with(params);
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_grid
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sergiy Stotskiy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord