csb 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b3bd4ea67fda334584460b781468b6b4f2429332776ca89e0aa0ccdd4e3ecb
-  data.tar.gz: f0116afcdea2a359f499fe2bfc59ddcc165cda66dfb85ec39f8a02b6c4d42378
+  metadata.gz: be1d1fb195f30b6b728b3dc97803f656f826e7049ca1a935194b82893810e4ae
+  data.tar.gz: 9d3a0b882bfd9ebadee139b7dcfd4b22ceda492d304d16cf4c4822105b92937a
 SHA512:
-  metadata.gz: 968babfce1879531fe2d0559ccc58f3a03b7d98f2052bcb15011b4d5e86a4203a79795d5b3d79e30a1149c95391bb80730e07a4db0278be5e5536fe65428ed09
-  data.tar.gz: 1d9afd1a7b315793d20fdbfae184a7ebc5685bb13a4acb0e08bb91ae3b91e8eed6d45c9de97f79f5f7abc7e09ed678276c06bb6798d6b2320a4946f948325cff
+  metadata.gz: dd21b2f4a24c65f7b038b83e499384b088b1d26640653571324843259a5f09f06784195044b7ac7d952c16fdae19a1a8724d8c95ea5f948d34505aeb54fe8b7b
+  data.tar.gz: 0726e686a4a1bd439dd29315fe93f58cdc70010a3a9677e3fd10fb5a6a997a020da35fedd02620029dbb400470fdb8e3ce5b8b7fb0430f2a877632609e8475f7

data/.github/workflows/rspec.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2", "3.3"]
-        gemfile: ["rails70", "rails71"]
+        ruby: ["3.1", "3.2", "3.3"]
+        gemfile: ["rails71", "rails72"]
     steps:
       - uses: actions/checkout@v4
 

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.12.0
+
+- Drop support for Rails versions below 7.1.4
+- Drop support for ruby 3.0
+
+## 0.11.0
+
+- Consider `Csb.configuration` as initial value for `Csb::Builder`
+
 ## 0.10.0
 
 - Drop support for rails 6.1

data/csb.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.0'
 
-  spec.add_dependency "rails", ">= 7.0.0"
+  spec.add_dependency "rails", ">= 7.1.4"
   spec.add_dependency "csv"
 
   spec.add_development_dependency "bundler", "~> 2.0"

data/gemfiles/rails71.gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-gem 'rails', '~> 7.1.0'
+gem 'rails', '~> 7.1.4'
 
 gemspec path: '../'

data/gemfiles/{rails70.gemfile → rails72.gemfile}

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-gem 'rails', '~> 7.0.0'
+gem 'rails', '~> 7.2.0'
 
 gemspec path: '../'

data/lib/csb/builder.rb

@@ -8,12 +8,12 @@ module Csb
     attr_reader :output, :utf8_bom, :items, :cols, :csv_options
     attr_accessor :items
 
-    def initialize(output = '', items: [], utf8_bom: false, csv_options: {})
+    def initialize(output = '', items: [], **kwargs)
       @output = output
-      @utf8_bom = utf8_bom
       @cols = Cols.new
       @items = items
-      @csv_options = csv_options
+      @utf8_bom = kwargs.fetch(:utf8_bom) { Csb.configuration.utf8_bom }
+      @csv_options = kwargs.fetch(:csv_options) { Csb.configuration.csv_options }
     end
 
     def build

data/lib/csb/handler.rb

@@ -12,9 +12,7 @@ module Csb
 
       <<~RUBY
         csv = ::Csb::Template.new(
-          utf8_bom: ::Csb.configuration.utf8_bom,
           streaming: ::Csb.configuration.streaming,
-          csv_options: ::Csb.configuration.csv_options,
         )
         #{source}
         controller.send(:send_file_headers!, type: 'text/csv', filename: csv.filename)

data/lib/csb/railtie.rb

@@ -6,34 +6,6 @@ module Csb
       ActiveSupport.on_load :action_view do
         require 'csb/handler'
         ActionView::Template.register_template_handler :csb, Csb::Handler
-
-        # SEE: https://github.com/rails/rails/pull/51023
-        rails_version = Gem::Version.new(Rails.version)
-        if rails_version >= Gem::Version.new('7.1.0') && rails_version < Gem::Version.new('7.1.4')
-          ActionView::Template.prepend(Module.new do
-            # SEE: https://github.com/Shopify/rails/blob/0601929486398954a17b1985fcf7f9f0611d2d55/actionview/lib/action_view/template.rb#L262C5-L281C8
-            def render(view, locals, buffer = nil, implicit_locals: [], add_to_stack: true, &block)
-              instrument_render_template do
-                compile!(view)
-
-                if strict_locals? && @strict_local_keys && !implicit_locals.empty?
-                  locals_to_ignore = implicit_locals - @strict_local_keys
-                  locals.except!(*locals_to_ignore)
-                end
-
-                if buffer
-                  view._run(method_name, self, locals, buffer, add_to_stack: add_to_stack, has_strict_locals: strict_locals?, &block)
-                  nil
-                else
-                  result = view._run(method_name, self, locals, ActionView::OutputBuffer.new, add_to_stack: add_to_stack, has_strict_locals: strict_locals?, &block)
-                  result.is_a?(ActionView::OutputBuffer) ? result.to_s : result
-                end
-              end
-            rescue => e
-              handle_render_error(view, e)
-            end
-          end)
-        end
       end
     end
   end

data/lib/csb/template.rb

@@ -2,10 +2,8 @@ module Csb
   class Template
     attr_accessor :utf8_bom, :filename, :streaming, :items, :cols, :csv_options
 
-    def initialize(utf8_bom:, streaming:, csv_options:)
-      @utf8_bom = utf8_bom
+    def initialize(streaming:)
       @streaming = streaming
-      @csv_options = csv_options
       @cols = Cols.new
       @items = []
     end
@@ -20,8 +18,16 @@ module Csb
 
     private
 
+    def builder_options
+      {
+        items: items,
+        utf8_bom: utf8_bom,
+        csv_options: csv_options,
+      }.compact
+    end
+
     def build_string
-      builder = Builder.new(utf8_bom: utf8_bom, items: items, csv_options: csv_options)
+      builder = Builder.new(**builder_options)
       builder.cols.copy!(cols)
       builder.build
     end
@@ -29,7 +35,7 @@ module Csb
     def build_enumerator
       Enumerator.new do |y|
         begin
-          builder = Builder.new(y, utf8_bom: utf8_bom, items: items, csv_options: csv_options)
+          builder = Builder.new(y, **builder_options)
           builder.cols.copy!(cols)
           builder.build
         rescue => error

data/lib/csb/version.rb

@@ -1,3 +1,3 @@
 module Csb
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - aki77
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +99,8 @@ files:
 - bin/console
 - bin/setup
 - csb.gemspec
-- gemfiles/rails70.gemfile
 - gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
 - lib/csb.rb
 - lib/csb/builder.rb
 - lib/csb/col.rb
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="