Add 5.1 testing, MIME access update

Author: straydogstudio

.travis.yml

@@ -9,13 +9,13 @@ notifications:
       - [email protected]
     on_success: always
 env:
-  - RAILS_VERSION=4.0
-  - RAILS_VERSION=4.1
   - RAILS_VERSION=4.2
   - RAILS_VERSION=5.0
+  - RAILS_VERSION=5.1
 rvm:
-  - 2.2.7
-  - 2.3.4
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 before_install:
   - gem update bundler
 script:

Gemfile

@@ -8,16 +8,19 @@ gemspec
 ENV["RAILS_VERSION"] ||= '4.2'
 
 case ENV['RAILS_VERSION']
+when '5.1'
+  gem 'rails', "~> 5.1.0"
+  gem 'responders', '~> 2.0'
 when '5.0'
   gem 'rails', "~> 5.0.0"
   gem 'responders', '~> 2.0'
 when '4.2'
   gem 'rails', "~> 4.2.0"
   gem 'responders', '~> 2.0'
-when '4.1'
-  gem 'rails', "~> 4.1.0"
-when '4.0'
-  gem 'rails', "~> 4.0.0"
+# when '4.1'
+  # gem 'rails', "~> 4.1.0"
+# when '4.0'
+  # gem 'rails', "~> 4.0.0"
 when '3.1', '3.2'
   gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
 end

README.md

@@ -18,8 +18,8 @@ Status](https://coveralls.io/repos/straydogstudio/axlsx_rails/badge.svg)](https:
 In your Gemfile:
 
 ```ruby
-gem 'rubyzip', '~> 1.1.0'
-gem 'axlsx', '2.1.0.pre'
+gem 'rubyzip', '>= 1.2.1'
+gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: 'c8ac844'
 gem 'axlsx_rails'
 ```
 
@@ -31,11 +31,11 @@ gem 'axlsx', '= 2.0.1'
 gem 'axlsx_rails'
 ```
 
-If `rubyzip >= 1.2.1` is needed:
+If `rubyzip >= 1.1.0` is needed:
 
 ```ruby
-gem 'rubyzip', '>= 1.2.1'
-gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: '776037c0fc799bb09da8c9ea47980bd3bf296874'
+gem 'rubyzip', '~> 1.1.0'
+gem 'axlsx', '2.1.0.pre'
 gem 'axlsx_rails'
 ```
 
@@ -202,7 +202,7 @@ class UserMailer < ActionMailer::Base
   def export(users)
     xlsx = render_to_string layout: false, handlers: [:axlsx], formats: [:xlsx], template: "users/export", locals: {users: users}
     attachment = Base64.encode64(xlsx)
-    attachments["Users.xlsx"] = {mime_type: Mime::XLSX, content: attachment, encoding: 'base64'}
+    attachments["Users.xlsx"] = {mime_type: Mime[:xlsx], content: attachment, encoding: 'base64'}
     # self.instance_variable_set(:@_lookup_context, nil) # If attachments are rendered as content, try this and open an issue
     ...
   end
@@ -241,7 +241,7 @@ If you are having problems with rendering a template and attaching it to a templ
 class UserMailer < ActionMailer::Base
   def export(users)
     xlsx = render_to_string handlers: [:axlsx], formats: [:xlsx], template: "users/export", locals: {users: users}
-    attachments["Users.xlsx"] = {mime_type: Mime::XLSX, content: xlsx, encoding: 'base64'}
+    attachments["Users.xlsx"] = {mime_type: Mime[:xlsx], content: xlsx, encoding: 'base64'}
     # self.instance_variable_set(:@_lookup_context, nil) # If attachments are rendered as content, try this and open an issue
     ...
   end

lib/axlsx_rails/action_controller.rb

@@ -1,5 +1,5 @@
 require 'action_controller'
-unless defined? Mime::XLSX
+unless defined? Mime[:xlsx]
 	Mime::Type.register "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", :xlsx
 end
 
@@ -42,7 +42,7 @@
     options[:locals][:xlsx_use_shared_strings] = options.delete(:xlsx_use_shared_strings)
   end
 
-  mime = (Rails.version.to_f >= 5) ? Mime[:xlsx] : Mime::XLSX
+  mime = Mime[:xlsx]
   send_data render_to_string(options), :filename => file_name, :type => mime, :disposition => disposition
 end
 
@@ -53,6 +53,7 @@
 else
   class ActionController::Responder
     def to_xlsx
+      @_action_has_layout = false
       if @default_response
         @default_response.call(options)
       else

lib/axlsx_rails/template_handler.rb

@@ -3,7 +3,7 @@ module ActionView
   module Template::Handlers
     class AxlsxBuilder
       def default_format
-        (Rails.version.to_f >= 5) ? Mime[:xlsx] : Mime::XLSX
+        Mime[:xlsx]
       end
 
       def self.call(template)

spec/axlsx_request_spec.rb

@@ -126,6 +126,18 @@
     expect(wb.cell(2,1)).to eq('Untie!')
   end
 
+  it "ignores layout" do
+    User.destroy_all
+    @user = User.create name: 'Responder', last_name: 'Bunny', address: '1234 Right Turn, Albuquerque NM 22222', email: '[email protected]'
+    expect {
+      visit "/users/export/#{@user.id}.xlsx"
+    }.to_not raise_error
+    File.open('/tmp/axlsx_temp.xlsx', 'w') {|f| f.write(page.source) }
+    wb = nil
+    expect{ wb = Roo::Excelx.new('/tmp/axlsx_temp.xlsx') }.to_not raise_error
+    expect(wb.cell(2,1)).to eq('Untie!')
+  end
+
   unless Rails.version < '3.2'
     it "handles missing format with render :xlsx" do
       visit '/another'

spec/dummy/app/mailers/notifier.rb

@@ -6,7 +6,7 @@ def instructions(user)
 
     # normal syntax
     xlsx = render_to_string handlers: [:axlsx], template: 'users/send_instructions', layout: false
-    attachments["user_#{user.id}.xlsx"] = {mime_type: Mime::XLSX, content: xlsx}
+    attachments["user_#{user.id}.xlsx"] = {mime_type: Mime[:xlsx], content: xlsx}
 
     mail :to => user.email, :subject => 'Instructions'
   end

spec/dummy_4/app/mailers/notifier.rb

@@ -6,7 +6,7 @@ def instructions(user)
 
     # normal syntax
     xlsx = render_to_string handlers: [:axlsx], template: 'users/send_instructions', layout: false, formats: [:xlsx]
-    attachments["user_#{user.id}.xlsx"] = {mime_type: Mime::XLSX, content: xlsx}
+    attachments["user_#{user.id}.xlsx"] = {mime_type: Mime[:xlsx], content: xlsx}
 
     mail :to => user.email, :subject => 'Instructions'
   end

spec/dummy_4/app/views/layouts/users.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy 4</title>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

spec/dummy_4/app/views/users/export.xlsx.axlsx

@@ -0,0 +1,8 @@
+wb = xlsx_package.workbook
+style_shout = wb.styles.add_style sz: 16, b: true, alignment: { horizontal: :center }
+wb.add_worksheet(name: "Foobar") do |sheet|
+  sheet.add_row ['Bad', 'spellers', 'of', 'the', 'world', '...']
+  sheet.add_row ['Untie!']
+  sheet.merge_cells("A2:E2")
+  sheet["A2"].style = style_shout
+end