datagrid 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf5af4041b5836e7938747ba830e28bda894965
-  data.tar.gz: 44863f33c721396345e89a6d32f4d1030a1d0128
+  metadata.gz: 44f9ec4967241697a3299e94ea4c112eee7976a0
+  data.tar.gz: 704336e23cb2865df032a9842a0c74797a43b19b
 SHA512:
-  metadata.gz: a651f92eb381d9f9d268ffe20cfa2d2c8aa559adc7b1a11840e86ca1b0ed2e296e45a1471e7c47b9b8692b6cdc51b8180e960594eb99e33ba6a5f9de43b3e810
-  data.tar.gz: da1cc6b18029502799af4395a0c9b846a87449272292543121668fc916c2f841d9bc7c1368d4a8cbc50bac10eaa3a590fe9639f415e6f2f3befab424e45a1ff2
+  metadata.gz: ef2563a325877ffa13f721b5903e5381e064804a35d007e15d5ad279691504886e157c956a56698594351232782a9b9be45afb52038eacfad59f9e3553e31307
+  data.tar.gz: f30f96c8b933c2cc71636f0183615a47c6fe25a0658ea6c4cfd0a6ca738babaf4a1606be3b32071bfc93a505f4d58975327231759f6e70dba57e16830781bfd2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/datagrid.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.1.1 ruby lib
+# stub: datagrid 1.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2014-03-08"
+  s.date = "2014-03-17"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [
@@ -110,8 +111,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "2.2.2"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid/columns.rb

@@ -16,7 +16,6 @@ module Datagrid
         self.default_column_options = {}
 
         class_attribute :batch_size
-        self.batch_size = 1000
 
       end
       base.send :include, InstanceMethods
@@ -259,18 +258,11 @@ module Datagrid
       #   grid.to_csv(:col_sep => ';')
       def to_csv(*column_names)
         options = column_names.extract_options!
-        klass = if RUBY_VERSION >= "1.9"
-                  require 'csv'
-                  CSV
-                else
-                  require "fastercsv"
-                  FasterCSV
-                end
-        klass.generate(
+        csv_class.generate(
           {:headers => self.header(*column_names), :write_headers => true}.merge(options)
         ) do |csv|
-          self.rows(*column_names).each do |row|
-            csv << row
+          each_with_batches do |asset|
+            csv << row_for(asset, *column_names)
           end
         end
       end
@@ -358,10 +350,29 @@ module Datagrid
       protected
 
       def map_with_batches(&block)
+        result = []
+        each_with_batches do |asset|
+          result << block.call(asset)
+        end
+        result
+      end
+
+      def each_with_batches(&block)
         if batch_size && batch_size > 0
-          driver.batch_map(assets, batch_size, &block)
+          driver.batch_each(assets, batch_size, &block)
+        else
+          assets.each(&block)
+        end
+      end
+
+
+      def csv_class
+        if RUBY_VERSION >= "1.9"
+          require 'csv'
+          CSV
         else
-          assets.map(&block)
+          require "fastercsv"
+          FasterCSV
         end
       end
 

data/lib/datagrid/drivers/abstract_driver.rb

@@ -78,7 +78,7 @@ module Datagrid
         raise NotImplementedError
       end
 
-      def batch_map(scope, batch_size, &block)
+      def batch_each(scope, batch_size, &block)
         raise NotImplementedError
       end
 

data/lib/datagrid/drivers/active_record.rb

@@ -101,12 +101,8 @@ module Datagrid
         end
       end
 
-      def batch_map(scope, batch_size, &block)
-        result = []
-        scope.find_each(batch_size ? { :batch_size => batch_size} : {}) do |record|
-          result << yield(record)
-        end
-        result
+      def batch_each(scope, batch_size, &block)
+        scope.find_each(batch_size ? { :batch_size => batch_size} : {}, &block)
       end
 
       protected

data/lib/datagrid/drivers/array.rb

@@ -65,8 +65,8 @@ module Datagrid
         []
       end
 
-      def batch_map(scope, batch_size, &block)
-        scope.map(&block)
+      def batch_each(scope, batch_size, &block)
+        scope.each(&block)
       end
     end
   end

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -56,14 +56,13 @@ module Datagrid
         [] # TODO: implement support
       end
 
-      def batch_map(scope, batch_size, &block)
+      def batch_each(scope, batch_size, &block)
         current_page = 0
-        result = []
         loop do
           batch = scope.skip(current_page * batch_size).limit(batch_size).to_a
-          return result if batch.empty?
+          return if batch.empty?
           scope.skip(current_page * batch_size).limit(batch_size).each do |item|
-            result << yield(item)
+            yield(item)
           end
           current_page+=1
         end

data/lib/datagrid/drivers/mongoid.rb

@@ -79,14 +79,13 @@ module Datagrid
         return :string
       end
 
-      def batch_map(scope, batch_size, &block)
+      def batch_each(scope, batch_size, &block)
         current_page = 0
-        result = []
         loop do
           batch = scope.skip(current_page * batch_size).limit(batch_size).to_a
-          return result if batch.empty?
+          return if batch.empty?
           scope.skip(current_page * batch_size).limit(batch_size).each do |item|
-            result << yield(item)
+            yield(item)
           end
           current_page+=1
         end

data/spec/datagrid/columns_spec.rb

@@ -83,28 +83,6 @@ describe Datagrid::Columns do
       subject.to_csv(:col_sep => ";").should == "Shipping date;Group;Name;Access level;Pet\n#{date};Pop;Star;admin;ROTTWEILER\n"
     end
 
-    it "should support defining a query for a column" do
-      report = test_report do
-        scope {Entry}
-        filter(:name)
-        column(:id)
-        column(:sum_group_id, 'sum(group_id)')
-      end
-      report.assets.first.sum_group_id.should == group.id
-    end
-    it "should support hidding columns through if and unless" do
-      report = test_report do
-        scope {Entry}
-        column(:id, :if => :show?)
-        column(:name, :unless => proc {|grid| !grid.show? })
-
-        def show?
-          false
-        end
-      end
-      report.columns(:id).should == []
-      report.columns(:name).should == []
-    end
   end
 
   it "should support columns with model and report arguments" do
@@ -139,6 +117,43 @@ describe Datagrid::Columns do
     child.column_by_name(:name).should_not be_nil
     child.column_by_name(:group_id).should_not be_nil
   end
+  it "should support defining a query for a column" do
+    report = test_report do
+      scope {Entry}
+      filter(:name)
+      column(:id)
+      column(:sum_group_id, 'sum(group_id)')
+    end
+    Entry.create!(:group => group)
+    report.assets.first.sum_group_id.should == group.id
+  end
+
+    it "should support post formatting for column defined with query" do
+      report = test_report do
+        scope {Group.joins(:entries).group("groups.id")}
+        filter(:name)
+        column(:entries_count, 'count(entries.id)') do |model|
+          format("(#{model.entries_count})") do |value|
+            content_tag(:span, value)
+          end
+        end
+      end
+      3.times { Entry.create!(group: group) }
+      report.rows.should == [["(3)"]]
+    end
+    it "should support hidding columns through if and unless" do
+      report = test_report do
+        scope {Entry}
+        column(:id, :if => :show?)
+        column(:name, :unless => proc {|grid| !grid.show? })
+
+        def show?
+          false
+        end
+      end
+      report.columns(:id).should == []
+      report.columns(:name).should == []
+    end
 
   describe ".column_names attributes" do
     let(:grid) do
@@ -224,7 +239,7 @@ describe Datagrid::Columns do
       fake_assets = double(:assets)
 
       report.should_receive(:assets) { fake_assets }
-      fake_assets.should_receive(:map)
+      fake_assets.should_receive(:each)
       fake_assets.should_not_receive(:find_each)
       report.rows
     end

data/spec/datagrid/drivers/active_record_spec.rb

@@ -18,6 +18,6 @@ describe Datagrid::Drivers::ActiveRecord do
 
   it "should support append_column_queries" do
     scope = subject.append_column_queries(Entry.scoped, [Datagrid::Columns::Column.new(SimpleReport, :sum_group_id, 'sum(entries.group_id)')])
-    scope.to_sql.should == 'SELECT "entries".*, sum(entries.group_id) AS sum_group_id FROM "entries" '
+    scope.to_sql.strip.should == 'SELECT "entries".*, sum(entries.group_id) AS sum_group_id FROM "entries"'
   end
 end

data/spec/datagrid/form_builder_spec.rb

@@ -247,7 +247,7 @@ describe Datagrid::FormBuilder do
           end
         end
         let(:_filter) { :category }
-        if true || Rails.version >= "4.0"
+        if Rails.version >= "4.1"
           it { should equal_to_dom(
             '
 <label class="category enum_filter checkboxes" for="report_category_first"><input id="report_category_first" name="report[category][]" type="checkbox" value="first" />first</label>

data/spec/datagrid_spec.rb

@@ -56,7 +56,7 @@ describe SimpleReport do
   describe ".batch_size" do
     context "when not defined on class level" do
       it "returns nil" do
-        subject.batch_size.should == 1000
+        subject.batch_size.should == nil
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids