datagrid 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c0b1c209da90c0d4fb5eeac1163e6a7b678c4d3
-  data.tar.gz: 04a48e6035196e8a766e4be01df1c703a27ce6af
+  metadata.gz: aa302439fb009cb596541a3cd2c6d5d584dc973c
+  data.tar.gz: 53a5b714ec1ecc3279c7cd0fb278c7c4c150785d
 SHA512:
-  metadata.gz: a73fdb1744c107f4a984444d98d983bd29c1708fc7f41f34082d104e28ad9c80f3982c535544ece008960d4bccba8e971300d0317fb7e7a296ae1548ded79ed3
-  data.tar.gz: 6311c7a16ea16ed340e5c77b8057c6caceda32f587bf4108dccf759974ba486b6b64999820937e7b1165c97b7c8ae7b9459841d6589ea401a1af09d9abf98004
+  metadata.gz: 72b9bb255878dafebf1a932ee8908fedeba902e306480ebe3a1792267c63f19ff61959336be9d7c48f4df9b8f922f24ba21c781e9c000708a632d1b45577f1ac
+  data.tar.gz: ec7577b30d0579b9ba106e220d4c89c2d2fb70bb83f33d31fce3feb4396a7bb28850ef81664187567696b585b26c2ef0873f2165859f36fe9d6233e3e092409d

data/Readme.markdown

@@ -1,6 +1,7 @@
 # Datagrid
 
 [![Build Status](https://travis-ci.org/bogdan/datagrid.svg?branch=master)](https://travis-ci.org/bogdan/datagrid)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid?ref=badge_shield)
 
 Ruby library that helps you to build and represent table-like data with:
 
@@ -197,3 +198,7 @@ Like datagrid?
 Follow the repository on [GitHub](https://github.com/bogdan/datagrid).
 
 Read [author blog](http://gusiev.com).
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fbogdan%2Fdatagrid?ref=badge_large)

data/VERSION

@@ -1 +1 @@
-1.5.7
+1.5.8

data/datagrid.gemspec

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

data/lib/datagrid/columns.rb

@@ -313,8 +313,9 @@ module Datagrid
       #   grid.to_csv(:id, :name)
       #   grid.to_csv(:col_sep => ';')
       def to_csv(*column_names)
+        require "csv"
         options = column_names.extract_options!
-        csv_class.generate(
+        CSV.generate(
           {:headers => self.header(*column_names), :write_headers => true}.merge!(options)
         ) do |csv|
           each_with_batches do |asset|
@@ -531,19 +532,10 @@ module Datagrid
         end
       end
 
-      def csv_class
-        if RUBY_VERSION >= "1.9"
-          require 'csv'
-          CSV
-        else
-          require "fastercsv"
-          FasterCSV
-        end
-      end
-
       def value_from_html_block(context, asset, column)
         args = []
         remaining_arity = column.html_block.arity
+        asset = decorate(asset)
 
         if column.data?
           args << data_value(column, asset)

data/lib/datagrid/columns/column.rb

@@ -149,7 +149,7 @@ class Datagrid::Columns::Column
   def preload
     preload = options[:preload]
 
-    if [nil, true].include?(preload) && driver.can_preload?(driver.to_scope(grid_class.scope), name)
+    if preload == true && driver.can_preload?(driver.to_scope(grid_class.scope), name)
       name
     else
       preload

data/spec/datagrid/helper_spec.rb

@@ -599,6 +599,21 @@ describe Datagrid::Helper do
       expect(subject.datagrid_value(report, :name, entry)).to eq("<a href=\"/profile\">Star</a>")
     end
 
+    it "applies decorator" do
+      report = test_report do
+        scope {Entry}
+        decorate do |model|
+          Class.new(Struct.new(:model)) do
+            def name
+              model.name.upcase
+            end
+          end
+        end
+        column(:name, html: true)
+      end
+      entry = Entry.create!(name: 'hello')
+      expect(subject.datagrid_value(report, :name, entry)).to eq("HELLO")
+    end
   end
 
   describe ".datagrid_header" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids