datagrid 1.6.3 → 1.8.0

data/lib/datagrid/renderer.rb

@@ -1,7 +1,8 @@
 require "action_view"
 
 module Datagrid
-  class Renderer #:nodoc:
+  # @!visibility private
+  class Renderer
 
     def self.for(template)
       new(template)
@@ -40,9 +41,9 @@ module Datagrid
 
       _render_partial('table', options[:partials],
                       {
-                        :grid => grid,
-                        :options => options,
-                        :assets => assets
+                        grid: grid,
+                        options: options,
+                        assets: assets
                       })
     end
 
@@ -55,22 +56,20 @@ module Datagrid
 
     def rows(grid, assets = grid.assets, **options, &block)
       result = assets.map do |asset|
-        if block_given?
-          @template.capture do
-            yield(Datagrid::Helper::HtmlRow.new(@template, grid, asset))
-          end
-        else
-          _render_partial( 'row', options[:partials], {
-            :grid => grid,
-            :options => options,
-            :asset => asset
-          })
-        end
+        row(grid, asset, **options, &block)
       end.to_a.join
 
       _safe(result)
     end
 
+    def row(grid, asset, **options, &block)
+      Datagrid::Helper::HtmlRow.new(self, grid, asset, options).tap do |row|
+        if block_given?
+          return @template.capture(row, &block)
+        end
+      end
+    end
+
     def order_for(grid, column, options = {})
       _render_partial('order_for', options[:partials],
                       { :grid => grid, :column => column })
@@ -98,4 +97,61 @@ module Datagrid
       })
     end
   end
+
+  module Helper
+    # Represents a datagrid row that provides access to column values for the given asset
+    # @example
+    #   row = datagrid_row(grid, user)
+    #   row.class      # => Datagrid::Helper::HtmlRow
+    #   row.first_name # => "<strong>Bogdan</strong>"
+    #   row.grid       # => Grid object
+    #   row.asset      # => User object
+    #   row.each do |value|
+    #     puts value
+    #   end
+    class HtmlRow
+
+      include Enumerable
+
+      attr_reader :grid, :asset, :options
+
+      # @!visibility private
+      def initialize(renderer, grid, asset, options)
+        @renderer = renderer
+        @grid = grid
+        @asset = asset
+        @options = options
+      end
+
+      # @return [Object] a column value for given column name
+      def get(column)
+        @renderer.format_value(@grid, column, @asset)
+      end
+
+      # Iterates over all column values that are available in the row
+      # param block [Proc] column value iterator
+      def each(&block)
+        (@options[:columns] || @grid.html_columns).each do |column|
+          block.call(get(column))
+        end
+      end
+
+      def to_s
+        @renderer.send(:_render_partial, 'row', options[:partials], {
+          :grid => grid,
+          :options => options,
+          :asset => asset
+        })
+      end
+
+      protected
+      def method_missing(method, *args, &blk)
+        if column = @grid.column_by_name(method)
+          get(column)
+        else
+          super
+        end
+      end
+    end
+  end
 end

data/lib/datagrid/rspec.rb

@@ -32,14 +32,14 @@ shared_examples_for "Datagrid" do
       describe "filter ##{filter.name}" do
 
         let(:filter_value) do
-          
+
           case Datagrid::Filters::FILTER_TYPES.invert[filter.class]
           when :default, :string
             "text"
           when :date
             1.day.ago
-          when :xboolean, :eboolean
-            Datagrid::Filters::BooleanEnumFilter::YES
+          when :xboolean
+            Datagrid::Filters::ExtendedBooleanFilter::YES
           when :boolean
             true
           when :integer
@@ -58,7 +58,7 @@ shared_examples_for "Datagrid" do
         end
 
         it "should be supported" do
-          subject.assets.should_not be_nil 
+          subject.assets.should_not be_nil
           #TODO: better matcher.
         end
       end

data/lib/datagrid/scaffold.rb

@@ -124,6 +124,6 @@ RUBY
 
   def file_exists?(name)
     name = Rails.root.join(name) unless name.to_s.first == "/"
-    File.exists?(name)
+    File.exist?(name)
   end
 end

data/lib/datagrid/utils.rb

@@ -1,4 +1,5 @@
 module Datagrid
+  # @!visibility private
   module Utils # :nodoc:
     class << self
 

data/lib/datagrid/version.rb

@@ -1,3 +1,3 @@
 module Datagrid
-  VERSION = "1.6.3"
+  VERSION = "1.8.0"
 end

data/lib/datagrid.rb

@@ -23,6 +23,7 @@ module Datagrid
 
   autoload :Engine
 
+  # @!visibility private
   def self.included(base)
     base.class_eval do
 
@@ -34,7 +35,7 @@ module Datagrid
       include ::Datagrid::Ordering
 
     end
-  end # self.included
+  end
 
   class ConfigurationError < StandardError; end
   class ArgumentError < ::ArgumentError; end

data/templates/grid.rb.erb

@@ -5,7 +5,7 @@ class <%= grid_class_name %> < BaseGrid
   end
 
   filter(:id, :integer)
-  filter(:created_at, :date, :range => true)
+  filter(:created_at, :date, range: true)
 
   column(:id)
   column(:name)

data/templates/index.html.erb

@@ -1,4 +1,4 @@
-<%%= datagrid_form_for @grid, :method => :get, :url => <%= grid_route_name %> %>
+<%%= datagrid_form_for @grid, method: :get, url: <%= grid_route_name %> %>
 
 <%%= <%=pagination_helper_code%> %>
 <%%= datagrid_table @grid %>

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -62,7 +62,6 @@ files:
 - lib/datagrid/engine.rb
 - lib/datagrid/filters.rb
 - lib/datagrid/filters/base_filter.rb
-- lib/datagrid/filters/boolean_enum_filter.rb
 - lib/datagrid/filters/boolean_filter.rb
 - lib/datagrid/filters/composite_filters.rb
 - lib/datagrid/filters/date_filter.rb
@@ -90,7 +89,7 @@ files:
 - templates/controller.rb.erb
 - templates/grid.rb.erb
 - templates/index.html.erb
-homepage: http://github.com/bogdan/datagrid
+homepage: https://github.com/bogdan/datagrid
 licenses:
 - MIT
 metadata:
@@ -107,14 +106,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Ruby gem to create datagrids

data/lib/datagrid/filters/boolean_enum_filter.rb

@@ -1,17 +0,0 @@
-class Datagrid::Filters::BooleanEnumFilter < Datagrid::Filters::EnumFilter #:nodoc:
-
-  YES = "YES"
-  NO = "NO"
-
-  def initialize(report, attribute, options = {}, &block)
-    options[:select] = [YES, NO].map do |key, value|
-      [I18n.t("datagrid.filters.eboolean.#{key.downcase}", :default => key.downcase.capitalize), key]
-    end
-    super(report, attribute, options, &block)
-  end
-
-
-  def checkbox_id(value)
-    [object_name, name, value].join('_').underscore 
-  end
-end