acts_as_caxlsx 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 448c5c50dbff1b5d6a745ae7335f445069fab20539b98df37d257edda4f8c9a9
-  data.tar.gz: d64c0d7721f2b13f6fc6c67f088b4f8ab4c38252aa5c3fbe9bd883b3356bd2b5
+  metadata.gz: 929a9ff3b96cbc95728446948d62a6f254fea46612a919c66f21c7dbcf5b57a6
+  data.tar.gz: a89a4d43599dd1d1d74a76a1d902ed9b61b76e8dc07671304a84474dd41e9a3b
 SHA512:
-  metadata.gz: c624c6baa51827f86e78fdd32d334b44fa2d23ced1fcf7f301a4635ad16ed26158d4f71b331e5030e652ceb9a4aaa69e70077da7ef882eaea4f291767a580d08
-  data.tar.gz: 2f93f2401e12d28d56577b3b07f59d3056b8097a88b5cd9ea6b46f08dd8d6a847de50821d5128d3068a4129e0525595b53caac9f74ed0ae817d56029d8c1efdf
+  metadata.gz: a2b1f3c42a937f4ae39e8771ae5a2c0cc8406f0e21eba4b12fd2f1dbc469e6df1d1c4600b8264d51f41097f4ad67381746f988fd6c019a19916f5a02e2c13f4c
+  data.tar.gz: 6a23a8a5fc3452e4a091f31aba50d60b93fdd5dc98baaa7e71990fe7c1b0ef81ac92774f0c7eac9e68d51f0bdfb6de0f4481217d1d39070374592fcdf6b4e851

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 CHANGELOG
 ---------
 
+- **Unreleased**
+
+
+- **April.7.26**: 1.0.10
+  - Add Github CI with modern Ruby versions
+  - Use Rubygem's trusted publishing
+  - Compability fixes
+
 - **July.27.12**: 1.0.6
   - conditionaly register XLSX mime type
 

data/README.md

@@ -1,6 +1,8 @@
-# Acts as XLSX
+# Acts as Caxlsx
 
-[![Build Status](https://secure.travis-ci.org/caxlsx/acts_as_caxlsx.png)](http://travis-ci.org/caxlsx/acts_as_caxlsx/)
+[![Test](https://github.com/caxlsx/acts_as_caxlsx/actions/workflows/test.yml/badge.svg)](https://github.com/caxlsx/acts_as_caxlsx/actions/workflows/test.yml)
+[![Gem Version](https://badge.fury.io/rb/acts_as_caxlsx.svg)](https://badge.fury.io/rb/acts_as_caxlsx)
+![downloads](https://img.shields.io/gem/dt/acts_as_caxlsx?label=downloads)
 
 ## Notice: Community Axlsx Organization
 
@@ -12,7 +14,7 @@ http://github.com/caxlsx
 
 ## Synopsis
 
-Acts_as_xlsx is an active record plugin for automatic Office Open XML Spreadsheet Generation using Axlsx. It makes generating excel spreadsheets from any subclass of ActiveRecord::Base as simple as a couple of lines of code.
+Acts_as_caxlsx is an active record plugin for automatic Office Open XML Spreadsheet Generation using Caxlsx. It makes generating excel spreadsheets from any subclass of ActiveRecord::Base as simple as a couple of lines of code.
 
 ## Feature List
 
@@ -26,13 +28,11 @@ Acts_as_xlsx is an active record plugin for automatic Office Open XML Spreadshee
 
 5. Lets you specify columns and methods chains you want to call to populate your table in one go.
 
-6. Gives you access to the axlsx package so you can add styles, charts and pictures to satisfy those flashy sales guys.
-
-7. Plays nicely with both ruby 1.8.7 + rails 2.3 as well as ruby 1.9.3 + rails 3
+6. Gives you access to the Caxlsx package so you can add styles, charts and pictures to satisfy those flashy sales guys.
 
 8. Automatically registers xlsx Mime type for use in respond_to web-service support.
 
-9. Allows you to specify the Axlsx package to add your data to so you can create a single workbook with a sheet for each to_xlsx call.
+9. Allows you to specify the Caxlsx package to add your data to so you can create a single workbook with a sheet for each to_xlsx call.
 
 
 ## Install
@@ -40,7 +40,7 @@ Acts_as_xlsx is an active record plugin for automatic Office Open XML Spreadshee
 To install, add the following to your Gemfile:
 
 ```ruby
-gem 'acts_as_xlsx', git: 'https://github.com/caxlsx/acts_as_xlsx.git'
+gem 'acts_as_caxlsx'
 ```
 
 
@@ -56,7 +56,7 @@ The following Usage guides need to be extracted and added to this README
 
 Detailed documentation is available at:
 
-[https://www.rubydoc.info/gems/acts_as_xlsx/](https://www.rubydoc.info/gems/acts_as_xlsx/)
+[https://www.rubydoc.info/gems/acts_as_caxlsx/](https://www.rubydoc.info/gems/acts_as_caxlsx/)
 
 
 ## Credits
@@ -65,4 +65,4 @@ Originally created by Randy Morgan - @randym
 
 Forked in 2019, to enable the community to maintain the Axlsx ecosystem - http://github.com/caxlsx
 
-Open source software is a community effort. None of this could have been done without the help of [our Contributors](https://github.com/caxlsx/acts_as_xlsx/graphs/contributors).
+Open source software is a community effort. None of this could have been done without the help of [our Contributors](https://github.com/caxlsx/acts_as_caxlsx/graphs/contributors).

data/Rakefile

@@ -1,14 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/lib/acts_as_xlsx/version.rb')
 
-task :build => :gendoc do
-  system "gem build acts_as_xlsx.gemspec"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-task :gendoc do   
+task :gendoc do
   system "yardoc"
 end
 
-task :test do 
+task :test do
      require 'rake/testtask'
      Rake::TestTask.new do |t|
        t.libs << 'test'
@@ -17,8 +16,4 @@ task :test do
      end
 end
 
-task :release => :build do
-  system "gem push acts_as_xlsx-#{Axlsx::Ar::VERSION}.gem"
-end
-
-task :default => :test
+task :default => :test

data/lib/acts_as_xlsx/ar.rb

@@ -54,36 +54,50 @@ module Axlsx
         header_style = options.delete(:header_style) || row_style
         types = [options.delete(:types) || []].flatten
 
-        i18n = options.delete(:i18n) || self.xlsx_i18n
-        columns = options.delete(:columns) || self.xlsx_columns
+        i18n = if options.key?(:i18n)
+                 options.delete(:i18n)
+               else
+                 self.xlsx_i18n
+               end
+
+        # columns => [["column_name", "header"], [...], ...]
+        columns = Array.wrap(options.delete(:columns) || self.xlsx_columns).flat_map { |col|
+          col.is_a?(Hash) ? col.to_a : [[col, nil]]
+        }
+
+        headers = options.delete(:headers)
+        headers||= columns.map { |(col_name, col_header)|
+          if col_header
+            col_header
+          elsif i18n == true
+            self.human_attribute_name(col_name)
+          elsif i18n
+            I18n.t("#{i18n_key}.#{self.name.underscore}.#{col_name}", default: col_name.to_s.humanize)
+          else
+            col_name.to_s.humanize
+          end
+        }
 
         p = options.delete(:package) || Package.new
         row_style = p.workbook.styles.add_style(row_style) unless row_style.nil?
         header_style = p.workbook.styles.add_style(header_style) unless header_style.nil?
-        i18n = self.xlsx_i18n == true ? 'activerecord.attributes' : i18n
-        sheet_name = options.delete(:name) || (i18n ? (self.xlsx_i18n == true ? self.model_name.human : I18n.t("#{i18n}.#{table_name.underscore}")) : table_name.humanize) 
+        i18n_key = i18n == true ? 'activerecord.attributes' : i18n
+        sheet_name = options.delete(:name) || (i18n ? (i18n == true ? self.model_name.human : I18n.t("#{i18n_key}.#{table_name.underscore}", default: table_name.humanize)) : table_name.humanize)
         data = options.delete(:data) || where(options[:where]).order(options[:order]).to_a
         data = data.compact.flatten
 
 
         return p if data.empty?
         p.workbook.add_worksheet(:name=>sheet_name) do |sheet|
-          
-          col_labels = if i18n
-                         columns.map { |c| self.xlsx_i18n == true ? self.human_attribute_name(c) : I18n.t("#{i18n}.#{self.name.underscore}.#{c}") }                         
-                       else
-                         columns.map { |c| c.to_s.humanize }
-                       end
-          
-          sheet.add_row col_labels, :style=>header_style
+          sheet.add_row headers, :style=>header_style
           
           data.each do |r|
-            row_data = columns.map do |c|
-              if c.to_s =~ /\./
-                v = r; c.to_s.split('.').each { |method| !v.nil? ? v = v.send(method) : v = ""; }; v
-              else
-                r.send(c)                
+            row_data = columns.map do |(column_name, _column_header)|
+              v = r
+              column_name.to_s.split('.').each do |method|
+                !v.nil? ? v = v.send(method) : v = nil
               end
+              v
             end
             sheet.add_row row_data, :style=>row_style, :types=>types
           end

data/lib/acts_as_xlsx/version.rb

@@ -1,6 +1,6 @@
 module Axlsx
   module Ar
     # The current version of the gem
-    VERSION = "1.0.8"
+    VERSION = "1.0.10"
   end
 end

data/test/{tc_acts_as_xlsx.rb → tc_acts_as_xlsx_test.rb}

@@ -70,7 +70,14 @@ class TestToXlsx < Test::Unit::TestCase
     assert_equal(Post.last.comments.last.author.name, sheet.rows.last.cells.last.value)
   end
 
-  
+  def test_complex_columns
+    p = Post.to_xlsx columns: [{name: "CUSTOM NAME HEADER", votes: "CUSTOM VOTES HEADER"}, :content, ranking: "CUSTOM RANKING HEADER"]
+    sheet = p.workbook.worksheets.first
+    assert_equal("CUSTOM NAME HEADER", sheet.rows.first.cells[0].value)
+    assert_equal("CUSTOM VOTES HEADER", sheet.rows.first.cells[1].value)
+    assert_equal("Content", sheet.rows.first.cells[2].value)
+    assert_equal("CUSTOM RANKING HEADER", sheet.rows.first.cells[3].value)
+  end
   
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_caxlsx
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Randy Morgan
 - Noel Peden
 bindir: bin
 cert_chain: []
-date: 2025-07-14 00:00:00.000000000 Z
+date: 2026-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -71,7 +71,7 @@ files:
 - lib/acts_as_xlsx/version.rb
 - test/database.yml
 - test/helper.rb
-- test/tc_acts_as_xlsx.rb
+- test/tc_acts_as_xlsx_test.rb
 homepage: https://github.com/caxlsx/acts_as_caxlsx
 licenses: []
 metadata: {}
@@ -82,17 +82,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.6
 specification_version: 4
 summary: ActiveRecord support for Axlsx
 test_files:
 - test/database.yml
 - test/helper.rb
-- test/tc_acts_as_xlsx.rb
+- test/tc_acts_as_xlsx_test.rb