the_grid 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzY4MDZjNWJiYWE1MGE3ZWRhYzk2NzU5NmY5ZjJhNGNhZDMwZGQ5Ng==
+    MmUzMzViNTAwMmM5MjlmNGVjOWY2OGY1N2E3ZmVhMzBiYTA5NDhlOA==
   data.tar.gz: !binary |-
-    MzY3YmI4Yzk2ZDU1ZjM5OTBhOTYyYzQxMTI4NWY5NTdjMTc1N2IwZQ==
+    YWY0N2ZlYzE4N2U1ZWUwMjhkOTJjNWUzNjE3OTY0ZDY4ODlkNTNkOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmYyMzkwYzk0NGQ2YzhiZDdlM2FiODZjNzg2MDk0YWI2YTg0ZmI4MmZjODlk
-    MWU3ZTNjNDI3NjBiODVmOGE5MTI4YTM5OGZlNDQ2OGVjZDBkNTgyZjc4NWQy
-    ZTNjYjUyN2E0OTRlODRmZmJlMjMyMDU3N2JkYWE1Y2JjN2NjMzk=
+    ZWU3NzRhMGNjM2ZiMzQwMGVjMTAyNTdhMTQyZDE2MDM3YzQ1ZjNhODhhZDc5
+    ZGZiZDdmNGM1ZmRlMDY5ZjU1M2U1ZDdkZjE2MTQ5YjZmMjc3MDE2MGJiYmRk
+    N2ZmOGVhN2YwODZjOTFiNDBiOTNiYmRjNTIwMTBmNzQ4NmJjYWU=
   data.tar.gz: !binary |-
-    MDAzMDgwM2M2MDAzYWE4MjYyNzZmYWI5MTExOWNhMTZjODFiOWRjNTEyMDkz
-    MTYwOTdiNWFlMjE3NWQxN2NhYmM2YmQ5NTk5ZjA1MDk3NjViZjVhM2NjN2Zl
-    OTc3ODYyZTNlYmQ4NTdhM2IxNzQyYzE1NjAxZDY0YjBhNDNkNzk=
+    ZmE5ZDRkODVjMjMxMzI1MDRkNDQzMzkwYjU4MTZlZWIxMWFjYTBiMjAxYzRh
+    ODgxZmU3ZmJlOGMxZWI3ZjE5ODc5MDJhMzY5ZGIxNDU0MTAxZDE5Nzk5ZDVm
+    ZDdjYmMzNmI5NDY1MzJmMzQ5MDU5MTk2Zjg4ZWRjOTUwZDVjOTU=

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)
+      api.compose!(options.merge :per_page => BATCH_SIZE) if api.relation.respond_to?(:except)
       generate_csv_with(options)
     end
 
@@ -22,9 +22,13 @@ module TheGrid
     def generate_csv_with(options)
       CSV.generate do |csv|
         csv << headers
-        put_relation_to(csv)
+        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|
@@ -38,7 +42,7 @@ module TheGrid
     end
 
     def headers
-      context.options[:headers] || context.columns.keys.map { |col| col.to_s.titleize }
+      context.options[:titles] || context.columns.keys.map { |col| col.to_s.titleize }
     end
 
   end

data/lib/the_grid/builder.rb

@@ -37,7 +37,7 @@ module TheGrid
 
     def grid_for(relation, options = {}, &block)
       context = Context.new(options.merge(:scope => @_scope), &block)
-      @_view_type.new(relation, context)
+      @_view_type.new(relation, context).assemble_with(@_scope.params)
     end
 
     def method_missing(name, *args, &block)

data/lib/the_grid/version.rb

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

data/spec/builder/csv_spec.rb

@@ -13,13 +13,13 @@ describe TheGrid::Builder::Csv do
   let(:params)   {{ :cmd => [:sort], :field => :name, :order => :desc, :per_page => subject.class.const_get("BATCH_SIZE") }}
 
   it "generates expected csv string" do
-    subject.assemble_with(params).should eql generate_csv(records, subject.context.options[:headers])
+    subject.assemble_with(params).should eql generate_csv(records, subject.context.options[:titles])
   end
 
-  it "uses titleized column names if headers are not specified" do
+  it "uses titleized column names if titles are not specified" do
     subject.context.stub(:options => {})
-    headers = record.keys.map{|c| c.to_s.titleize }
-    subject.assemble_with(params).should eql generate_csv(records, headers)
+    titles = record.keys.map{|c| c.to_s.titleize }
+    subject.assemble_with(params).should eql generate_csv(records, titles)
   end
 
   it "generates csv records in batches" do
@@ -28,16 +28,16 @@ describe TheGrid::Builder::Csv do
   end
 
 
-  def generate_csv(records, headers)
+  def generate_csv(records, titles)
     CSV.generate do |csv|
-      csv << headers
+      csv << titles
       records.each{ |item| csv << item.values }
     end
   end
 
   def build_context
     TheGrid::Builder::Context.new do
-      headers "Id", "Title", "Status", "Description"
+      titles "Id", "Title", "Status", "Description"
       column :name
       column :status
       column :text

metadata

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