datagrid 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd828dc639436b3eedd26fad706bb0ba844b62229209dc941019a09e63301d77
-  data.tar.gz: 05c04ebc0ecd2f7b780964ea08677c451ac5c00353dda901af57cc8a447b18ec
+  metadata.gz: 76bece54343c202c79e7ca4d5e90ae1cc91d2c5a77b965a175b36df801e10bd1
+  data.tar.gz: 68e58ec9dec5f010b43a7e078fdbf2c3c1b0923c9f2ab38c327d3665570d08fa
 SHA512:
-  metadata.gz: a7f7d6ab72a350bf5f88b5e41707204fa0d1791cc1b382b66d704b2380bffb96280e508b68896ac4e8bf158d7e36bf030c3aa4744134b07c3c0f41651c7fe256
-  data.tar.gz: b07edf4527a83375d94b5cb9d1730c855e595f029bcdd77e9a311e0745a14acc3797b2e9af2d0335977f2718a7e9756bf753a468280511920d2908a385283878
+  metadata.gz: 9aeb7a29ea7df278090a6417e1f940dfe9f8b1aa57dd907f9f739c4d2bc3e613be66be28635c5cf51a70b9067a7f7da4a00e7adaf09ae8ddea0247c7f34a56b1
+  data.tar.gz: 8660381aa1d508c624b0bc6d1c6e71ca3e6c1e89cad518733aeaee31d1968dc6382c45d1d06cbb60cd33ea1407d3e79e92e5920d93483bdfd47a31ffa1e23cef

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 #bundler_args: --without development
 rvm:
-  - 2.2.2
-  - 2.3.0
-  - 2.4.1
-  - 2.5.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   #- jruby
   #- jruby-head
 #env: JRUBY_OPTS="--server -J-Xms512m -J-Xmx1024m"

data/Gemfile

@@ -6,7 +6,7 @@ group :development do
 
   gem "bundler"
   if RUBY_VERSION >= "2.3"
-    gem "jeweler", ">= 2.1.2", platform: [:ruby_23, :ruby_24, :ruby_25, :ruby_26], git: 'git@github.com:technicalpickles/jeweler.git'
+    gem "jeweler", ">= 2.1.2", platform: :mri, github: 'technicalpickles/jeweler'
   end
 
 
@@ -17,7 +17,7 @@ group :development do
   gem "nokogiri" # used to test html output
 
   if RUBY_VERSION >= "2.5"
-    gem "sqlite3", "~> 1.4", platform: [:ruby_25, :ruby_26]
+    gem "sqlite3", "~> 1.4", platform: :mri
   else
     gem "sqlite3", "~> 1.3.6"
   end

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/app/views/datagrid/_table.html.erb

@@ -11,7 +11,7 @@ Local variables:
     </thead>
     <tbody>
       <% if assets.any? %>
-        <%= datagrid_rows(grid, assets, options) %>
+        <%= datagrid_rows(grid, assets, **options) %>
       <% else %>
         <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
       <% end %>

data/datagrid.gemspec

@@ -2,20 +2,21 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.6.0 ruby lib
+# stub: datagrid 1.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid".freeze
-  s.version = "1.6.0"
+  s.version = "1.6.1"
 
   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 = "2020-03-31"
+  s.date = "2020-09-07"
   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 = [
-    "LICENSE.txt"
+    "LICENSE.txt",
+    "Readme.markdown"
   ]
   s.files = [
     ".document",

data/lib/datagrid/columns.rb

@@ -316,9 +316,8 @@ module Datagrid
       def to_csv(*column_names)
         require "csv"
         options = column_names.extract_options!
-        CSV.generate(
-          {:headers => self.header(*column_names), :write_headers => true}.merge!(options)
-        ) do |csv|
+        options = {:headers => self.header(*column_names), :write_headers => true}.merge!(options)
+        CSV.generate(**options) do |csv|
           each_with_batches do |asset|
             csv << row_for(asset, *column_names)
           end
@@ -407,7 +406,7 @@ module Datagrid
       # Defines a column at instance level
       #
       # See Datagrid::Columns::ClassMethods#column for more info
-      def column(name, options_or_query = {}, options = {}, &block) #:nodoc:
+      def column(name, options_or_query = {}, options = {}, &block)
         self.class.define_column(columns_array, name, options_or_query, options, &block)
       end
 
@@ -416,7 +415,7 @@ module Datagrid
         super
       end
 
-      # Returns all columns available for current grid configuration.
+      # Returns all columns that are possible to be displayed for the current grid object
       #
       #   class MyGrid
       #     filter(:search) {|scope, value| scope.full_text_search(value)}
@@ -536,6 +535,8 @@ module Datagrid
       def value_from_html_block(context, asset, column)
         args = []
         remaining_arity = column.html_block.arity
+        remaining_arity = 1 if remaining_arity < 0
+
         asset = decorate(asset)
 
         if column.data?

data/lib/datagrid/core.rb

@@ -9,7 +9,7 @@ module Datagrid
       base.class_eval do
         class_attribute :scope_value
 
-        class_attribute :datagrid_attributes
+        class_attribute :datagrid_attributes, instance_writer: false
         self.datagrid_attributes = []
 
         class_attribute :dynamic_block, :instance_writer => false
@@ -163,6 +163,9 @@ module Datagrid
       end
 
       # Returns serializable query arguments skipping all nil values
+      #
+      #   grid = ProductsGrid.new(category: 'dresses', available: true)
+      #   grid.as_query # => {category: 'dresses', available: true}
       def as_query
         attributes = self.attributes.clone
         attributes.each do |key, value|
@@ -171,6 +174,15 @@ module Datagrid
         attributes
       end
 
+      # Returns query parameters to link this grid from a page
+      #
+      #   grid = ProductsGrid.new(category: 'dresses', available: true)
+      #   Rails.application.routes.url_helpers.products_path(grid.query_params)
+      #     # => "/products?products_grid[category]=dresses&products_grid[available]=true"
+      def query_params(attributes = {})
+        { param_name.to_sym => as_query.merge(attributes) }
+      end
+
       # Redefines scope at instance level
       #
       #   class MyGrid

data/lib/datagrid/drivers/active_record.rb

@@ -105,7 +105,8 @@ module Datagrid
         if scope.limit_value
           raise Datagrid::ConfigurationError, "ActiveRecord can not use batches in combination with SQL limit"
         end
-        scope.find_each(batch_size ? { :batch_size => batch_size} : {}, &block)
+        options = batch_size ? { batch_size: batch_size } : {}
+        scope.find_each(**options, &block)
       end
 
       def default_cache_key(asset)

data/lib/datagrid/helper.rb

@@ -73,7 +73,7 @@ module Datagrid
     #       %td= row.project_name
     #       %td.project-status{class: row.status}= row.status
     def datagrid_rows(grid, assets = grid.assets, **options, &block)
-      datagrid_renderer.rows(grid, assets, options, &block)
+      datagrid_renderer.rows(grid, assets, **options, &block)
     end
 
     # Renders ordering controls for the given column name

data/lib/datagrid/renderer.rb

@@ -81,10 +81,9 @@ module Datagrid
     def order_path(grid, column, descending, request)
       column = grid.column_by_name(column)
       query = request ? request.query_parameters : {}
-      order_parameter = {grid.param_name => grid.as_query.merge(:order => column.name, :descending => descending)}
       ActionDispatch::Http::URL.path_for(
         path: request ? request.path : '/',
-        params: query.merge(order_parameter)
+        params: query.merge(grid.query_params(order: column.name, descending: descending))
       )
     end
 

data/lib/datagrid/utils.rb

@@ -72,12 +72,8 @@ module Datagrid
       end
 
       def apply_args(*args, &block)
-        return block.call(*args) if block.arity < 0
-        args = args.clone
-        (args.size - block.arity).times do
-          args.pop
-        end
-        block.call(*args)
+        size = block.arity < 0 ? args.size : block.arity
+        block.call(*args.slice(0, size))
       end
 
       def parse_date(value)

data/spec/datagrid/core_spec.rb

@@ -193,4 +193,18 @@ describe Datagrid::Core do
       }.to_not raise_error
     end
   end
+
+
+  describe ".query_param" do
+    it "works" do
+      grid = test_report(name: 'value') do
+        scope {Entry}
+        filter(:name)
+        def param_name
+          'grid'
+        end
+      end
+      expect(grid.query_params).to eq({grid: {name: 'value'}})
+    end
+  end
 end

data/spec/datagrid/filters/date_filter_spec.rb

@@ -124,7 +124,7 @@ describe Datagrid::Filters::DateFilter do
 
   it "should support block" do
     date = Date.new(2018, 01, 07)
-    time = date.to_time + 2.hours + 2.minutes
+    time = Time.utc(2018, 01, 07, 2, 2)
     report = test_report(:created_at => date) do
       scope { Entry }
       filter(:created_at, :date, :range => true) do |value|

data/spec/datagrid/helper_spec.rb

@@ -245,6 +245,17 @@ describe Datagrid::Helper do
       )
     end
 
+    it "should render columns with &:symbol block" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, &:name)
+      end
+
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name" => "Star"
+      )
+    end
+
     it "should render html columns" do
       rp = test_report do
         scope { Entry }
@@ -257,6 +268,41 @@ describe Datagrid::Helper do
       )
     end
 
+    it "should render :html columns with &:symbol block" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => true, &:name)
+      end
+
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name" => "Star"
+      )
+    end
+
+    it "should render format columns with &:symbol block" do
+      rp = test_report do
+        scope { Entry }
+        column(:name) do |record|
+          format(record, &:name)
+        end
+      end
+
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name" => "Star"
+      )
+    end
+
+    it "should render :html columns with &:symbol block with a data attribute" do
+      rp = test_report do
+        scope { Entry }
+        column(:name, :html => true, data: 'DATA', &:name)
+      end
+
+      expect(subject.datagrid_rows(rp, [entry])).to match_css_pattern(
+        "tr td.name" => "Star"
+      )
+    end
+
     it "should render argument-based html columns" do
       rp = test_report do
         scope { Entry }

data/spec/support/test_partials/client/datagrid/_order_for.html.erb

@@ -2,10 +2,10 @@
   <p>Namespaced order_for partial.</p>
   <%= link_to(
       I18n.t("datagrid.table.order.asc").html_safe,
-      url_for(grid.param_name => grid.as_query.merge(:order => column.name, :descending => false)),
+      url_for(grid.query_params(order: column.name, descending: false)),
       :class => "asc") %>
   <%= link_to(
       I18n.t("datagrid.table.order.desc").html_safe,
-      url_for(grid.param_name => grid.as_query.merge(:order => column.name, :descending => true )),
+      url_for(grid.query_params(order: column.name, descending: true)),
       :class => "desc") %>
 </div>

data/spec/support/test_partials/client/datagrid/_table.html.erb

@@ -13,7 +13,7 @@ Local variables:
     <% if assets.empty? %>
     <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
     <% else %>
-    <%= datagrid_rows(grid, assets, options) %>
+    <%= datagrid_rows(grid, assets, **options) %>
     <% end %>
   </tbody>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,6 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- Readme.markdown
 files:
 - ".document"
 - ".rspec"
@@ -284,7 +285,7 @@ homepage: http://github.com/bogdan/datagrid
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby gem to create datagrids
 test_files: []