syntax cleanup

Author: Mads Buus Westmark

README.md

@@ -81,7 +81,7 @@ Example of _my_partial.docx.erb
 # Add mime-type in /config/initializers/mime_types.rb:
 Mime::Type.register "application/vnd.openxmlformats-officedocument.wordprocessingml.document", :docx
 
-# Add docx reponder in your controler
+# Add docx responder in your controller
 def show
   respond_to do |format|
     format.docx do

Rakefile

@@ -1,4 +1,4 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 task :default => :spec
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new

lib/htmltoword/action_controller.rb

@@ -1,15 +1,16 @@
+require 'rack/test'
 require 'action_controller'
+
 unless defined? Mime::DOCX
-  Mime::Type.register "application/vnd.openxmlformats-officedocument.wordprocessingml.document", :docx
+  Mime::Type.register 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', :docx
 end
 
 ActionController::Renderers.add :docx do |filename, options|
-  unless formats.include?(:docx) || Rails.version < '3.2'
-    formats[0] = :docx
-  end
+  formats[0] = :docx unless formats.include?(:docx) || Rails.version < '3.2'
 
+  # This is ugly and should be solved with regular file utils
   if options[:template] == action_name
-    if filename =~ /^([^\/]+)\/(.+)$/
+    if filename =~ %r{^([^\/]+)/(.+)$}
       options[:prefixes] ||= []
       options[:prefixes].unshift $1
       options[:template] = $2
@@ -19,11 +20,11 @@
   end
 
   # disposition / filename
-  disposition   = options.delete(:disposition) || 'attachment'
+  disposition = options.delete(:disposition) || 'attachment'
   if file_name = options.delete(:filename)
-    file_name += ".docx" unless file_name =~ /\.docx$/
+    file_name += '.docx' unless file_name =~ /\.docx$/
   else
-    file_name = "#{filename.gsub(/^.*\//,'')}.docx"
+    file_name = "#{filename.gsub(/^.*\//, '')}.docx"
   end
 
   # other properties
@@ -33,20 +34,19 @@
   content = options.delete(:content) || render_to_string(options)
 
   doc = Htmltoword::Document.create content, file_name, word_template
-  send_data File.read(doc.path), :filename => file_name, :type => Mime::DOCX, :disposition => disposition
+  send_data File.read(doc.path), filename: file_name, type: Mime::DOCX, disposition: disposition
 end
 
-# For respond_with default
-begin
-  ActionController::Responder
-rescue LoadError
-else
-  class ActionController::Responder
-    def to_docx
-      if @default_response
-        @default_response.call(options)
-      else
-        controller.render({:docx => controller.action_name}.merge(options))
+if defined? ActionController::Responder
+  module ActionController
+    # For respond_with default
+    class Responder
+      def to_docx
+        if @default_response
+          @default_response.call(options)
+        else
+          controller.render({ docx: controller.action_name }.merge(options))
+        end
       end
     end
   end

spec/spec_helper.rb

@@ -4,7 +4,7 @@
 
 def compare_resulting_wordml_with_expected(html, resulting_wordml)
   source = Nokogiri::HTML(html.gsub(/>\s+</, "><"))
-  xslt = Nokogiri::XSLT( File.read(Htmltoword::Document.default_xslt_template))
+  xslt = Nokogiri::XSLT(File.read(Htmltoword::Document.default_xslt_template))
   result = xslt.transform(source)
   if compare_content_of_body?(resulting_wordml)
     result.at("//w:sectPr").remove