fortitude 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ce3b6762f088fca61147da654a6f3508d1fcb5
-  data.tar.gz: b2cc3632e67c21dc00edcbf4f87d9b538b168b53
+  metadata.gz: e628239070a163ab3cf3431cd1541827f7164bce
+  data.tar.gz: 680d6b3550680358167ad185658e31836a4fb1ea
 SHA512:
-  metadata.gz: 54f01af0007be5caa3b469ac3ff26952c8b365ee65f78fc402f9ea53e37ab757da20a64f271807fc1547d6c3625f755aa3f15ac918347c6c016276930e2e5a21
-  data.tar.gz: 89e9ca7d79dd014124cca6d12d564847206169d4f0fe9df34a71c59b1f6dfd99333ae959b22db9cf0eff8051afbc306327cf250d9210f55b96e23fc4611f8680
+  metadata.gz: 1abdd3e8929afb29866c8af7728f07a6b8969e1401a1168234cb9b1cebf9b9d14c3b713b8c9a21e5335a03b2a1fb719a344620a3f60ac6d2923f3b2183791e28
+  data.tar.gz: f5b5fb078f3484478dbe89eb8e04cea9de528b2427821c89692e1fdcc77c8f981333dddf33838e3f467b15def7cf9ee797f6abec82cca69f1b701b3dd3638860

data/.fix_bundler_for_jruby_17

@@ -0,0 +1,26 @@
+def safe_system(cmd)
+  $stderr.puts "Running: #{cmd}"
+  result = system("#{cmd} 2>&1")
+  unless result && $? && $?.success?
+    raise "Command failed: #{$?.inspect}"
+  end
+end
+
+if defined?(RUBY_ENGINE) && RUBY_ENGINE.to_s == 'jruby' && defined?(JRUBY_VERSION) && JRUBY_VERSION.to_s =~ /^1\.7\./
+  safe_system("gem update --system")
+
+  target_dir = "/home/travis/.rvm/gems"
+  targets = Dir.entries(target_dir).select { |e| e =~ /^jruby\-#{JRUBY_VERSION}.*@global$/i }
+
+  targets.each do |target|
+    full_path = File.join(target_dir, target)
+    safe_system("gem uninstall -i '#{full_path}' bundler")
+  end
+
+  safe_system("gem install bundler -v 1.12.5 --no-rdoc --no-ri --no-document")
+else
+  ruby_engine = if defined?(RUBY_ENGINE) then RUBY_ENGINE.inspect else 'nil' end
+  jruby_version = if defined?(JRUBY_VERSION) then JRUBY_VERSION.inspect else 'nil' end
+
+  puts "No need to fix Bundler versions. RUBY_ENGINE is #{ruby_engine} and JRUBY_VERSION is #{jruby_version}."
+end

data/.gitignore

@@ -18,3 +18,4 @@ lib/*.bundle
 /*.sublime-project
 /*.sublime-workspace
 /doc/source/.retina_images_workaround
+*.swp

data/.travis.yml

@@ -1,56 +1,49 @@
+sudo: false
 rvm:
     - "1.8.7"
     - "1.9.3-p551"
-    - "2.0.0-p598"
-    - "2.1.5"
-    - "2.2.0"
-    - "jruby-1.7.18"
+    - "2.0.0-p648"
+    - "2.1.10"
+    - "2.2.5"
+    - "2.3.1"
+    - "jruby-1.7.26"
+    - "jruby-9.1.5.0"
+# 2016-09-20 ageweke -- This is temporary, and is because JRuby 1.7.26 is incompatible with Bundler 1.13.0/1,
+# because of the following issue: https://github.com/bundler/bundler/issues/4975.
+before_install:
+    - ruby .fix_bundler_for_jruby_17
 env:
-    - FORTITUDE_SPECS_RAILS_VERSION=4.2.0
-    - FORTITUDE_SPECS_RAILS_VERSION=4.1.9
+    - FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1
+    - FORTITUDE_SPECS_RAILS_VERSION=4.2.7.1
+    - FORTITUDE_SPECS_RAILS_VERSION=4.1.16
     - FORTITUDE_SPECS_RAILS_VERSION=4.0.13
-    - FORTITUDE_SPECS_RAILS_VERSION=3.2.21
+    - FORTITUDE_SPECS_RAILS_VERSION=3.2.22.5
     - FORTITUDE_SPECS_RAILS_VERSION=3.1.12
     - FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-    - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+    - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.7.1
     - FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-before_script:
-    - export JRUBY_OPTS="$JRUBY_OPTS -J-Xmx128m -J-Xms128m -J-Xss2048k"
 matrix:
     exclude:
         # Rails 4.x doesn't support Ruby 1.8.7
         -   rvm: 1.8.7
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.2.7.1
         -   rvm: 1.8.7
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.9
+            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.16
         -   rvm: 1.8.7
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.0
+            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.7.1
         -   rvm: 1.8.7
             env: FORTITUDE_SPECS_RAILS_VERSION=4.0.13
-        # 2014-06-19 ageweke -- ARGH. After trying about seventeen different things, no matter what I do,
-        # Travis fails JRuby builds about 20% of the time with "Killed". Their documentation indicates that this
-        # is likely an out-of-memory issue (i.e., entire VM's memory is consumed). However, I'm running JRuby with
-        # only 128MB allocated to each VM (per above) -- yuck -- and it's still happening; this makes no sense, as it
-        # would take something like 20+ concurrent JRuby processes to consume 3GB, and we should never be running
-        # more than 2-3.
-        #
-        # At this point, I have little choice other than to mark these as 'allowed failures', and check in on each
-        # one manually to make sure there aren't other failures, too. This is very frustrating, but I can't seem to
-        # find a way around it. If there's a fix out there somewhere, I'm all ears!
-    allow_failures:
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.2.0
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.1.9
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_SPECS_RAILS_VERSION=4.0.13
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_SPECS_RAILS_VERSION=3.2.21
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_SPECS_RAILS_VERSION=3.1.12
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_SPECS_RAILS_VERSION=3.0.20
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=4.2.0
-        -   rvm: jruby-1.7.18
-            env: FORTITUDE_NATIVE_EXTENSIONS=false FORTITUDE_SPECS_RAILS_VERSION=3.0.20
+        # Rails 5.x doesn't support Ruby < 2.2
+        -   rvm: 1.8.7
+            env: FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1
+        -   rvm: "1.9.3-p551"
+            env: FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1
+        -   rvm: "2.0.0-p648"
+            env: FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1
+        -   rvm: "2.1.10"
+            env: FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1
+        -   rvm: "jruby-1.7.26"
+            env: FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1
+        # JRuby doesn't support Rails 5 yet
+        -   rvm: jruby-9.1.5.0
+            env: FORTITUDE_SPECS_RAILS_VERSION=5.0.0.1

data/CHANGES.md

@@ -1,5 +1,49 @@
 # Fortitude Releases
 
+## 0.9.5, 12 October 2016
+
+* Rails 5 compatibility: Fortitude now is fully compatible with Rails 5.0.0.1.
+* Significant improvements in performance to our dispatching to #t, the Rails method to produce translations of
+  localized strings. Localized Rails applications tend to use this method a _lot_, so its performance can have a
+  big impact on overall application performance.
+* A much better error message if you try to declare a method `static` when it hasn't been defined yet — this
+  can often be the result of putting the `static` declaration above the method definition in the source file,
+  rather than below it. (Thanks to [`tobymao`](https://github.com/tobymao) for the bug report!)
+* Updated versions of Ruby and Rails that Travis CI tests against to the very latest.
+* Fixed an issue where Fortitude wasn't properly respecting Rails' view paths. Fortitude templates could be found at
+  alternate view paths, but our trick of namespacing views under `Views::` wouldn't apply. Now, it all works
+  perfectly. (Thanks to [Karl He](https://github.com/karlhe) for the bug report and example patch!)
+* Fixed an issue where `#block_given?` always returned `true` inside a Fortitude widget's `#content` method, whether
+  a block was supplied to it or not. (Thanks to [Jeff Dickey](https://github.com/jdickey) for the bug report!)
+* Fixed an incompatibility between Fortitude and Rails 4.2.5.1, since Rails 4.2.5.1 added a fifth parameter to
+  `ActionView::PathResolver#find_templates`. (Thanks to [Luke Francl](https://github.com/look) for the bug report!)
+* Fixed incompatibilities with more-recently released versions of gems (`uglifier`, `rake`, `activesupport`) that
+  otherwise broke compatibility with previous Ruby versions.
+* Fixed an issue where Fortitude’s system for figuring out what the name of a Fortitude widget would be, based on its
+  filename, could be confused by filenames ending in other extensions before `.rb` (for example, `.html.rb`).
+* Eliminated a deprecation warning from Rails 5 caused by Fortitude's use of `render :text` internally.
+* Removed usage of `alias_method_chain` on Ruby 2.0 and later, in favor of `Module#prepend`. This removes deprecation
+  warnings otherwise triggered by Rails 5. (Using `Module#prepend` causes problems in JRuby, so `alias_method_chain`
+  is still used on JRuby instead.)
+* Changed the behavior of `automatic_helper_access false` so that, in a Rails application, it still makes all the
+  built-in Rails helpers properly accessible, but does not make user-defined helpers accessible. (If there are even
+  certain built-in Rails helpers you don’t want people using, you can easily override them in your widget class to
+  raise an exception.) Without this, `automatic_helper_access false` became so cumbersome to use that it was nearly
+  pointless. (Thanks to [Matt Walters](https://github.com/mattwalters) for the pull request!)
+* Fixed an issue where explicitly declaring an assignment method as a helper (_e.g._, `helper :foo=`) did not work
+  properly.
+* Fixed an issue where passing a block to (_e.g._) `f.label`, where `f` is the object yielded to a `form_for` helper,
+  did not work properly. (Thanks to [Adam Becker](https://github.com/ajb) for the bug report and test case!)
+* Reduced escaping in attribute values: only `"` and `&` need to be escaped, not `<`, `>`, or `'`. (Thanks to
+  [Adam Becker](https://github.com/ajb) for the bug report!)
+* Fixed an issue where, under certain extremely rare circumstances, adding a view path in the controller (using
+  [`ActionView::ViewPaths.append_view_path`](http://api.rubyonrails.org/classes/ActionView/ViewPaths/ClassMethods.html#method-i-prepend_view_path)
+  and related methods) would not be able to figure out the proper class name of the widget, and would fail. (Thanks
+  to [Leaf](https://github.com/leafo) for the bug report!)
+* Added the ability for the `inline_html` method on a widget class to accept a `Fortitude::RenderingContext`, thus
+  allowing you to use it with code requiring access to helpers. (Thanks to [Adam Becker](https://github.com/ajb) for
+  the bug report!)
+
 ## 0.9.4, 11 February 2015
 
 * Fixed an issue where use of Rails' `form_for` or `fields_for` from within another `form_for` or `fields_for` block

data/CONTRIBUTORS.md

@@ -2,6 +2,8 @@
 
 Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contributions from:
 
+* [`tobymao`](https://github.com/tobymao): reporting a bug where trying to declare a method `static` before it's been
+  defined resulted in a confusing error.
 * [Ahto Jussila](https://github.com/ahto): a patch to provide separate MRI and JRuby gems, so that
   `gem install fortitude` works properly no matter which platform you're on.
 * [Roman Heinrich](https://github.com/mindreframer): reporting a bug where trying to use Fortitude as a Tilt
@@ -37,7 +39,31 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
     a memory leak.
   * Reporting an issue where use of Rails' `form_for` and/or `fields_for` from within another `form_for` or
     `fields_for` block would not produce the correct output.
+  * Reporting an issue where, under certain extremely rare circumstances, adding a view path in the controller (using
+    [`ActionView::ViewPaths.append_view_path`](http://api.rubyonrails.org/classes/ActionView/ViewPaths/ClassMethods.html#method-i-prepend_view_path)
+    and related methods) would not be able to figure out the proper class name of the widget, and would fail.
 * [Adam Becker](https://github.com/ajb) for:
   * Discussion and details around exactly what `:attribute => true`, `:attribute => false`, and so on should render
     from Fortitude.
   * Reporting an issue where you could not easily render a Fortitude widget from Erector, nor vice-versa.
+  * Fixes for compatibility with Rails 5.
+  * Fix for a deprecation warning from Rails 5 caused by Fortitude's use of `render :text` internally.
+  * Reporting an issue and providing a test case and patch for an issue where calling `f.label` with a block, where
+    `f` is the object yielded to Rails' `form_for`, would cause an exception from Fortitude.
+  * Reporting an issue where Fortitude was escaping characters that it didn’t need to in attribute values
+    (specifically, `<`, `>`, and `'`).
+  * Reporting an issue where you couldn't use `inline_html` in a way that allowed you to pass a
+    `Fortitude::RenderingContext`, thus preventing you from using it with code that required access to helpers.
+* [Karl He](https://github.com/karlhe) for:
+  * Reporting an issue (and supplying an example patch) where Fortitude wasn't respecting Rails' additional view
+    paths correctly &mdash; only `app/views`.
+* [Jeff Dickey](https://github.com/jdickey) for:
+  * Reporting an issue where `#block_given?` inside a Fortitude widget's `#content` method returned `true` always,
+    whether or not there was anything to yield to.
+* [Luke Francl](https://github.com/look) for:
+  * Reporting an incompatibility between Fortitude and Rails 4.2.5.1, and discovering the underlying cause (a fifth
+    parameter added to `ActionView::PathResolver#find_templates`.)
+* [Victor Lymar](https://github.com/vlymar) for:
+  * Fixes for compatibility with Rails 5.
+* [Matt Walters](https://github.com/mattwalters) for:
+  * A patch to make built-in Rails helpers work even when `automatic_helper_access` was set to `false`.

data/Rakefile

@@ -32,7 +32,7 @@ namespace :jruby do
   end
 
   task :ensure_jruby do
-    unless RUBY_ENGINE == 'jruby'
+    unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
       raise "You must run this task using JRuby, not #{RUBY_ENGINE}"
     end
   end

data/ext/com/fortituderuby/ext/fortitude/FortitudeNativeLibrary.java

@@ -57,13 +57,13 @@ public class FortitudeNativeLibrary implements Library {
                 outputString.cat(selfString);
             } else {
                 byte[] selfBytes = selfString.getBytes();
-                fortitude_escaped_strcpy(outputString, selfBytes);
+                fortitude_escaped_strcpy(outputString, selfBytes, false);
             }
 
             return runtime.getNil();
         }
 
-        public static void fortitude_escaped_strcpy(RubyString output, byte[] source) {
+        public static void fortitude_escaped_strcpy(RubyString output, byte[] source, boolean forAttributeValue) {
             byte[] buffer = new byte[BUFFER_SIZE];
             int bufferPos = 0;
 
@@ -84,35 +84,47 @@ public class FortitudeNativeLibrary implements Library {
                     buffer[bufferPos++] = ';';
                     break;
 
-                case LESS_THAN_BYTE:
+                case DOUBLE_QUOTE_BYTE:
                     buffer[bufferPos++] = '&';
-                    buffer[bufferPos++] = 'l';
+                    buffer[bufferPos++] = 'q';
+                    buffer[bufferPos++] = 'u';
+                    buffer[bufferPos++] = 'o';
                     buffer[bufferPos++] = 't';
                     buffer[bufferPos++] = ';';
                     break;
 
-                case GREATER_THAN_BYTE:
-                    buffer[bufferPos++] = '&';
-                    buffer[bufferPos++] = 'g';
-                    buffer[bufferPos++] = 't';
-                    buffer[bufferPos++] = ';';
+                case LESS_THAN_BYTE:
+                    if (forAttributeValue) {
+                        buffer[bufferPos++] = '<';
+                    } else {
+                        buffer[bufferPos++] = '&';
+                        buffer[bufferPos++] = 'l';
+                        buffer[bufferPos++] = 't';
+                        buffer[bufferPos++] = ';';
+                    }
                     break;
 
-                case SINGLE_QUOTE_BYTE:
-                    buffer[bufferPos++] = '&';
-                    buffer[bufferPos++] = '#';
-                    buffer[bufferPos++] = '3';
-                    buffer[bufferPos++] = '9';
-                    buffer[bufferPos++] = ';';
+                case GREATER_THAN_BYTE:
+                    if (forAttributeValue) {
+                        buffer[bufferPos++] = '>';
+                    } else {
+                        buffer[bufferPos++] = '&';
+                        buffer[bufferPos++] = 'g';
+                        buffer[bufferPos++] = 't';
+                        buffer[bufferPos++] = ';';
+                    }
                     break;
 
-                case DOUBLE_QUOTE_BYTE:
-                    buffer[bufferPos++] = '&';
-                    buffer[bufferPos++] = 'q';
-                    buffer[bufferPos++] = 'u';
-                    buffer[bufferPos++] = 'o';
-                    buffer[bufferPos++] = 't';
-                    buffer[bufferPos++] = ';';
+                case SINGLE_QUOTE_BYTE:
+                    if (forAttributeValue) {
+                        buffer[bufferPos++] = '\'';
+                    } else {
+                        buffer[bufferPos++] = '&';
+                        buffer[bufferPos++] = '#';
+                        buffer[bufferPos++] = '3';
+                        buffer[bufferPos++] = '9';
+                        buffer[bufferPos++] = ';';
+                    }
                     break;
 
                 default:
@@ -130,11 +142,11 @@ public class FortitudeNativeLibrary implements Library {
     public static class FortitudeHashExtensions {
         public static final byte SPACE = (byte) ' ';
 
-        public static void fortitude_append_to(IRubyObject object, RubyString rbOutput) {
+        public static void fortitude_append_to(IRubyObject object, RubyString rbOutput, boolean forAttributeValue) {
             if (object instanceof RubyString) {
-                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, ((RubyString) object).getBytes());
+                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, ((RubyString) object).getBytes(), forAttributeValue);
             } else if (object instanceof RubySymbol) {
-                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, ((RubyString) ((RubySymbol) object).to_s()).getBytes());
+                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, ((RubyString) ((RubySymbol) object).to_s()).getBytes(), forAttributeValue);
             } else if (object instanceof RubyArray) {
                 RubyArray array = (RubyArray) object;
 
@@ -143,16 +155,16 @@ public class FortitudeNativeLibrary implements Library {
                     if (i > 0) {
                         rbOutput.cat(SPACE);
                     }
-                    fortitude_append_to(element, rbOutput);
+                    fortitude_append_to(element, rbOutput, forAttributeValue);
                 }
             } else if (object instanceof RubyNil) {
                 // nothing here
             } else if (object instanceof RubyFixnum) {
                 RubyString asString = ((RubyFixnum) object).to_s();
-                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, asString.getBytes());
+                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, asString.getBytes(), forAttributeValue);
             } else {
                 RubyString asString = (RubyString) ((RubyBasicObject) object).callMethod("to_s");
-                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, asString.getBytes());
+                FortitudeStringExtensions.fortitude_escaped_strcpy(rbOutput, asString.getBytes(), forAttributeValue);
             }
         }
 
@@ -177,10 +189,10 @@ public class FortitudeNativeLibrary implements Library {
 
                     if (prefix != null) {
                         newPrefix = (RubyString) prefix.dup();
-                        fortitude_append_to(key, newPrefix);
+                        fortitude_append_to(key, newPrefix, false);
                     } else {
                         newPrefix = RubyString.newEmptyString(runtime);
-                        fortitude_append_to(key, newPrefix);
+                        fortitude_append_to(key, newPrefix, false);
                     }
 
                     newPrefix.cat('-');
@@ -196,19 +208,19 @@ public class FortitudeNativeLibrary implements Library {
                         // nothing here
                     }
 
-                    fortitude_append_to(key, output);
+                    fortitude_append_to(key, output, false);
 
                     if ((value instanceof RubyBoolean) && (value.isTrue())) {
                         if (this.allowsBareAttributes.isTrue()) {
                             // ok, nothing here
                         } else {
                             output.cat(EQUALS_QUOTE);
-                            fortitude_append_to(key, output);
+                            fortitude_append_to(key, output, false);
                             output.cat('"');
                         }
                     } else {
                         output.cat(EQUALS_QUOTE);
-                        fortitude_append_to(value, output);
+                        fortitude_append_to(value, output, true);
                         output.cat('"');
                     }
                 }

data/ext/fortitude_native_ext/fortitude_native_ext.c

@@ -18,7 +18,7 @@ void Init_fortitude_native_ext() {
 #define BUF_SIZE 256
 #define MAX_SUBSTITUTION_LENGTH 6
 
-void fortitude_escaped_strcpy(VALUE rb_output, const char * src) {
+void fortitude_escaped_strcpy(VALUE rb_output, const char * src, int for_attribute_value) {
     char buf[BUF_SIZE + 1];
     char* buf_pos = buf;
     char* max_buf_pos = buf + (BUF_SIZE - MAX_SUBSTITUTION_LENGTH);
@@ -39,29 +39,29 @@ void fortitude_escaped_strcpy(VALUE rb_output, const char * src) {
             *buf_pos++ = 'm';
             *buf_pos++ = 'p';
             *buf_pos++ = ';';
-        } else if (ch == '<') {
+        } else if (ch == '"') {
+            *buf_pos++ = '&';
+            *buf_pos++ = 'q';
+            *buf_pos++ = 'u';
+            *buf_pos++ = 'o';
+            *buf_pos++ = 't';
+            *buf_pos++ = ';';
+        } else if (ch == '<' && (! for_attribute_value)) {
             *buf_pos++ = '&';
             *buf_pos++ = 'l';
             *buf_pos++ = 't';
             *buf_pos++ = ';';
-        } else if (ch == '>') {
+        } else if (ch == '>' && (! for_attribute_value)) {
             *buf_pos++ = '&';
             *buf_pos++ = 'g';
             *buf_pos++ = 't';
             *buf_pos++ = ';';
-        } else if (ch == '\'') {
+        } else if (ch == '\'' && (! for_attribute_value)) {
             *buf_pos++ = '&';
             *buf_pos++ = '#';
             *buf_pos++ = '3';
             *buf_pos++ = '9';
             *buf_pos++ = ';';
-        } else if (ch == '"') {
-            *buf_pos++ = '&';
-            *buf_pos++ = 'q';
-            *buf_pos++ = 'u';
-            *buf_pos++ = 'o';
-            *buf_pos++ = 't';
-            *buf_pos++ = ';';
         } else {
             if (ch == '\0') {
                 break;
@@ -92,11 +92,11 @@ VALUE method_append_escaped_string(VALUE self, VALUE rb_output) {
         return Qnil;
     }
 
-    fortitude_escaped_strcpy(rb_output, c_self);
+    fortitude_escaped_strcpy(rb_output, c_self, 0);
     return Qnil;
 }
 
-void fortitude_append_to(VALUE object, VALUE rb_output) {
+void fortitude_append_to(VALUE object, VALUE rb_output, int for_attribute_value) {
     ID to_s;
     char buf[25];
     long value;
@@ -111,11 +111,11 @@ void fortitude_append_to(VALUE object, VALUE rb_output) {
 
     switch (TYPE(object)) {
         case T_STRING:
-            fortitude_escaped_strcpy(rb_output, RSTRING_PTR(object));
+            fortitude_escaped_strcpy(rb_output, RSTRING_PTR(object), for_attribute_value);
             break;
 
         case T_SYMBOL:
-            fortitude_escaped_strcpy(rb_output, rb_id2name(SYM2ID(object)));
+            fortitude_escaped_strcpy(rb_output, rb_id2name(SYM2ID(object)), for_attribute_value);
             break;
 
         case T_ARRAY:
@@ -125,7 +125,7 @@ void fortitude_append_to(VALUE object, VALUE rb_output) {
                 if (i > 0) {
                     rb_str_cat2(rb_output, " ");
                 }
-                fortitude_append_to(array_element, rb_output);
+                fortitude_append_to(array_element, rb_output, for_attribute_value);
             }
 
         case T_NONE:
@@ -140,7 +140,7 @@ void fortitude_append_to(VALUE object, VALUE rb_output) {
 
         default:
             new_string = rb_funcall(object, to_s, 0);
-            fortitude_escaped_strcpy(rb_output, RSTRING_PTR(new_string));
+            fortitude_escaped_strcpy(rb_output, RSTRING_PTR(new_string), for_attribute_value);
             break;
     }
 }
@@ -175,12 +175,12 @@ int fortitude_append_key_and_value(VALUE key, VALUE value, VALUE key_and_value_d
             switch (TYPE(prefix)) {
                 case T_STRING:
                     new_prefix_as_string = rb_funcall(prefix, dup, 0);
-                    fortitude_append_to(key, new_prefix_as_string);
+                    fortitude_append_to(key, new_prefix_as_string, 0);
                     break;
 
                 case T_NIL:
                     new_prefix_as_string = rb_str_new("", 0);
-                    fortitude_append_to(key, new_prefix_as_string);
+                    fortitude_append_to(key, new_prefix_as_string, 0);
                     break;
 
                 default:
@@ -212,12 +212,12 @@ int fortitude_append_key_and_value(VALUE key, VALUE value, VALUE key_and_value_d
                     break;
             }
 
-            fortitude_append_to(key, rb_output);
+            fortitude_append_to(key, rb_output, 0);
             if (TYPE(allows_bare_attributes) == T_TRUE) {
                 /* ok */
             } else {
                 rb_str_cat2(rb_output, "=\"");
-                fortitude_append_to(key, rb_output);
+                fortitude_append_to(key, rb_output, 1);
                 rb_str_cat2(rb_output, "\"");
             }
             break;
@@ -238,9 +238,9 @@ int fortitude_append_key_and_value(VALUE key, VALUE value, VALUE key_and_value_d
                     break;
             }
 
-            fortitude_append_to(key, rb_output);
+            fortitude_append_to(key, rb_output, 0);
             rb_str_cat2(rb_output, "=\"");
-            fortitude_append_to(value, rb_output);
+            fortitude_append_to(value, rb_output, 1);
             rb_str_cat2(rb_output, "\"");
             break;
     }