adamh-html_namespacing 0.1.0 → 0.1.2

data/Manifest

@@ -12,5 +12,5 @@ lib/html_namespacing/plugin/dom_scan_jquery.compressed.js
 lib/html_namespacing/plugin/rails.rb
 lib/html_namespacing/plugin/dom_scan_jquery.js
 lib/html_namespacing/plugin/sass.rb
-Manifest
 html_namespacing.gemspec
+Manifest

data/README.rdoc

@@ -175,6 +175,9 @@ gain access to this method.
 <tt>:javascript_root</tt>: Root of namespaced JavaScript files, if you are
 using <tt>html_namespacing_javascript_tag()</tt> (see below).
 
+<tt>:template_formats</tt>: If set (to an Array), apply HTML namespacing
+under the given (String) formats. Default is <tt>['html']</tt>.
+
 <tt>:javascript_optional_suffix</tt>: optional suffix for your JavaScript
 files, if you are using <tt>html_namespacing_javascript_tag()</tt>. For
 instance, if <tt>:javascript_optional_suffix</tt> is <tt>'compressed'</tt> and

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('html_namespacing', '0.1.0') do |p|
+Echoe.new('html_namespacing', '0.1.2') do |p|
   p.author = 'Adam Hooper'
   p.email = 'adam@adamhooper.com'
   p.summary = 'Automatic HTML namespacing'

data/ext/html_namespacing/html_namespacing.c

@@ -22,56 +22,10 @@ static const char* const IGNORE_TAGS[] = {
     NULL
 };
 
-/*
- * Returns the first power of 2 which is >= the given length.
- */
 static int
-round_to_power_of_two(int i)
+determine_alloc_size_of_at_least(int i)
 {
-    int j = 1;
-
-    while (j < i) {
-        j <<= 1;
-    }
-
-    return j;
-}
-
-/*
- * Returns the number of bytes in the first utf-8 character of *utf8.
- */
-static size_t
-utf8_char_bytes(const char *utf8)
-{
-    size_t i;
-    const unsigned char *u;
-
-    if (utf8[0] < 0x80) {
-        return 1;
-    }
-
-    u = (const unsigned char *) utf8;
-
-    for (i = 1; i < 6; i++) {
-        if ((u[i] & 0xc0) != 0x80) {
-            return i;
-        }
-    }
-
-    return -1;
-}
-
-/*
- * Copies num_bytes bytes from *src_p to *dest_p, doing no bounds checking.
- *
- * Advances *dest_p and *src_p by num_bytes.
- */
-static void
-copy_n_bytes_and_advance(char **dest_p, const char **src_p, size_t num_bytes)
-{
-    memcpy(*dest_p, *src_p, num_bytes);
-    *dest_p += num_bytes;
-    *src_p += num_bytes;
+    return i + 1024;
 }
 
 /*
@@ -119,57 +73,6 @@ ensure_string_length(
     return 0;
 }
 
-/*
- * Tries to copy a single utf8 character to dest, possibly reallocating.
- *
- * Arguments:
- *   - dest: Beginning of destination string. May be reallocated during copy.
- *   - dest_len: Amount of memory allocated to dest. May be increased during
- *     copy.
- *   - dest_p: Pointer to end of destination string (potentially 1 past the
- *     allocated length of dest).
- *   - src_p: Source string. Will be advanced.
- *
- * Returns:
- *   - 0 on success. dest may be changed; dest_p will be incremented; src_p
- *     will be incremented.
- *   - ENOMEM if reallocation failed. dest, dest_p, and src_p will remain
- *     unchanged.
- */
-static int
-append_next_utf8_char(
-        char **dest,
-        size_t *dest_len,
-        char **dest_p,
-        const char **src_p,
-        HtmlNamespacingAllocationStrategy allocation_strategy)
-{
-    size_t c_num_utf8_bytes;
-    size_t dest_p_offset;
-    size_t new_dest_len;
-    char *new_dest;
-    int rv;
-
-    c_num_utf8_bytes = utf8_char_bytes(*src_p);
-    new_dest = *dest;
-    dest_p_offset = *dest_p - *dest;
-    new_dest_len = dest_p_offset + c_num_utf8_bytes;
-
-    rv = ensure_string_length(
-            &new_dest, dest_len, new_dest_len, allocation_strategy);
-    if (rv == ENOMEM) {
-        return ENOMEM;
-    }
-    if (new_dest != *dest) {
-        *dest = new_dest;
-        *dest_p = new_dest + dest_p_offset;
-    }
-
-    copy_n_bytes_and_advance(dest_p, src_p, c_num_utf8_bytes);
-
-    return 0;
-}
-
 /*
  * Tries to copy s into dest, possibly reallocating.
  *
@@ -191,15 +94,14 @@ append_string(
         size_t *dest_len,
         char **dest_p,
         const char *s,
+        size_t len,
         HtmlNamespacingAllocationStrategy allocation_strategy)
 {
-    int len;
     int rv;
     size_t dest_p_offset;
     size_t new_dest_len;
     char *new_dest;
 
-    len = strlen(s);
     new_dest = *dest;
     dest_p_offset = *dest_p - *dest;
     new_dest_len = dest_p_offset + len;
@@ -220,63 +122,6 @@ append_string(
     return 0;
 };
 
-static int
-append_next_chars_until(
-        char **dest,
-        size_t *dest_len,
-        char **dest_p,
-        const char **src_p,
-        const char *until_chars,
-        HtmlNamespacingAllocationStrategy allocation_strategy)
-{
-    size_t num_bytes;
-    size_t dest_p_offset;
-    size_t new_dest_len;
-    char *new_dest;
-    int rv;
-
-    num_bytes = strcspn(*src_p, until_chars);
-    new_dest = *dest;
-    dest_p_offset = *dest_p - *dest;
-    new_dest_len = dest_p_offset + num_bytes;
-
-    rv = ensure_string_length(
-            &new_dest, dest_len, new_dest_len, allocation_strategy);
-    if (rv == ENOMEM) {
-        return ENOMEM;
-    }
-    if (new_dest != *dest) {
-        *dest = new_dest;
-        *dest_p = new_dest + dest_p_offset;
-    }
-
-    copy_n_bytes_and_advance(dest_p, src_p, num_bytes);
-
-    return 0;
-}
-
-static int
-append_end_of_string(
-        char **dest,
-        size_t *dest_len,
-        char **dest_p,
-        HtmlNamespacingAllocationStrategy allocation_strategy)
-{
-    int rv;
-    const char *end = "\0";
-
-    rv = append_next_utf8_char(
-            dest, dest_len, dest_p, &end, allocation_strategy);
-
-    if (rv == 0) {
-        /* We don't add the length of '\0' */
-        *dest_len -= 1;
-        *dest_p -= 1;
-    }
-
-    return rv;
-}
-
 enum {
     PARSE_NORMAL,
     PARSE_OPEN_TAG,
@@ -351,20 +196,38 @@ add_namespace_to_html_with_length_and_allocation_strategy(
         HtmlNamespacingAllocationStrategy allocation_strategy)
 {
 
-#define APPEND_NEXT_CHAR() \
-        if (*html && append_next_utf8_char(&r, &r_len, &r_p, &html, allocation_strategy) != 0) goto error/*;*/
 #define APPEND_STRING(s) \
-        if (append_string(&r, &r_len, &r_p, s, allocation_strategy) != 0) goto error/*;*/
+        do { \
+            if (append_string(&r, &r_len, &r_p, s, strlen(s), allocation_strategy) != 0) goto error; \
+        } while (0)/*;*/
 #define APPEND_END_OF_STRING() \
-        if (append_end_of_string(&r, &r_len, &r_p, allocation_strategy) != 0) goto error/*;*/
-#define APPEND_NEXT_CHARS_UNTIL(chars) \
-        if (append_next_chars_until(&r, &r_len, &r_p, &html, chars, allocation_strategy) != 0) goto error/*;*/
+        do { \
+            if (append_string(&r, &r_len, &r_p, "", 1, allocation_strategy) != 0) goto error; \
+            r_len -= 1; \
+            r_p -= 1; \
+        } while (0)/*;*/
+#define COPY_TO_HERE() \
+        do { \
+            if (append_string(&r, &r_len, &r_p, html_first_uncopied_p, html_p - html_first_uncopied_p, allocation_strategy) != 0) goto error; \
+            html_first_uncopied_p = html_p; \
+        } while (0)/*;*/
+#define ADVANCE(n) \
+        do { \
+            if (html_p + n <= html + html_len) { \
+                html_p += n; \
+            } else { \
+                html_p = html + html_len; \
+            } \
+        } while (0)/*;*/
+#define ADVANCE_UNTIL_ONE_OF_THESE_CHARS(chars) \
+        ADVANCE(strcspn(html_p, chars))/*;*/
 
     unsigned int state;
     char *r; /* Start of retval */
     char *r_p; /* Pointer in retval */
     size_t r_len; /* Length of retval */
-    const char *html_start;
+    const char *html_first_uncopied_p;
+    const char *html_p;
     const char *open_tag_name = NULL;
     size_t open_tag_name_len = 0;
     size_t num_chars_remaining;
@@ -373,13 +236,13 @@ add_namespace_to_html_with_length_and_allocation_strategy(
     int open_tag_had_class_attribute;
     const char *open_tag_attribute_value;
 
-    r_len = round_to_power_of_two(html_len);
+    r_len = determine_alloc_size_of_at_least(html_len);
     r = allocation_strategy.malloc(sizeof(char) * r_len);
     if (!r) {
         return ENOMEM;
     }
 
-    html_start = html;
+    html_first_uncopied_p = html_p = html;
     state = PARSE_NORMAL;
     r_p = r;
     num_tags_open = 0;
@@ -388,63 +251,70 @@ add_namespace_to_html_with_length_and_allocation_strategy(
     open_tag_attribute_value = NULL;
 
     while (1) {
-        num_chars_remaining = html_len - (html - html_start);
+        num_chars_remaining = html_len - (html_p - html);
         if (num_chars_remaining <= 0) break;
 
         switch (state) {
             case PARSE_NORMAL:
-                if (*html == '<') {
-                    APPEND_NEXT_CHAR();
+                if (*html_p == '<') {
+                    ADVANCE(1);
                     if (num_chars_remaining >= 9
-                            && 0 == strncmp("![CDATA[", html, 8)) {
+                            && 0 == strncmp("![CDATA[", html_p, 8)) {
                         state = PARSE_CDATA;
-                    } else if (num_chars_remaining >= 2 && html[0] == '/') {
+                    } else if (num_chars_remaining >= 2 && html_p[0] == '/') {
                         state = PARSE_CLOSE_TAG;
                     } else if (num_chars_remaining >= 4
-                            && 0 == strncmp("!--", html, 3)) {
+                            && 0 == strncmp("!--", html_p, 3)) {
                         state = PARSE_COMMENT;
                     } else if (num_chars_remaining >= 9
-                            && 0 == strncmp("!DOCTYPE", html, 8)) {
+                            && 0 == strncmp("!DOCTYPE", html_p, 8)) {
                         state = PARSE_DOCTYPE;
                     } else if (num_chars_remaining >= 5
-                            && 0 == strncmp("?xml", html, 4)) {
+                            && 0 == strncmp("?xml", html_p, 4)) {
                         state = PARSE_XML_DECL;
                     } else {
-                        open_tag_name = html;
+                        open_tag_name = html_p;
                         state = PARSE_OPEN_TAG_NAME;
                     }
                 } else {
-                    APPEND_NEXT_CHARS_UNTIL("<");
+                    ADVANCE_UNTIL_ONE_OF_THESE_CHARS("<");
                 }
                 break;
             case PARSE_OPEN_TAG_NAME:
-                APPEND_NEXT_CHARS_UNTIL(WHITE_SPACE ">/");
-                open_tag_name_len = html - open_tag_name;
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS(WHITE_SPACE ">/");
+                open_tag_name_len = html_p - open_tag_name;
                 state = PARSE_OPEN_TAG;
                 break;
             case PARSE_OPEN_TAG:
-                if (*html == '/' || *html == '>') {
+                if (*html_p == '/' || *html_p == '>') {
                     if (num_tags_open == 0 && !open_tag_had_class_attribute
                             && !should_ignore_tag(open_tag_name, open_tag_name_len)) {
-                        APPEND_STRING(" class=\"");
-                        APPEND_STRING(ns);
-                        APPEND_STRING("\"");
+                        COPY_TO_HERE();
+                        if (*html_p == '/' && char_is_whitespace(*(html_p - 1))) {
+                            /* We're in an empty tag with a trailing space */
+                            APPEND_STRING("class=\"");
+                            APPEND_STRING(ns);
+                            APPEND_STRING("\" ");
+                        } else {
+                            APPEND_STRING(" class=\"");
+                            APPEND_STRING(ns);
+                            APPEND_STRING("\"");
+                        }
                     }
 
                     open_tag_had_class_attribute = 0;
                     open_tag_attribute_value = NULL;
 
-                    if (*html == '/') {
-                        APPEND_STRING(" ");
+                    if (*html_p == '/') {
                         state = PARSE_EMPTY_TAG;
                     } else {
                         num_tags_open++;
                         state = PARSE_NORMAL;
                     }
-                    APPEND_NEXT_CHAR();
-                } else if (!char_is_whitespace(*html)) {
+                    ADVANCE(1);
+                } else if (!char_is_whitespace(*html_p)) {
                     if (num_chars_remaining >= 5
-                            && 0 == strncmp(html, "class", 5)) {
+                            && 0 == strncmp(html_p, "class", 5)) {
                         open_tag_attribute_is_class_attribute = 1;
                         open_tag_had_class_attribute = 1;
                     } else {
@@ -452,68 +322,67 @@ add_namespace_to_html_with_length_and_allocation_strategy(
                     }
                     state = PARSE_OPEN_TAG_ATTRIBUTE_NAME;
                 } else {
-                    APPEND_NEXT_CHAR();
+                    ADVANCE(1);
                 }
                 break;
             case PARSE_OPEN_TAG_ATTRIBUTE_NAME:
-                APPEND_NEXT_CHARS_UNTIL("=");
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS("=");
+                ADVANCE(1);
                 state = PARSE_OPEN_TAG_ATTRIBUTE_EQUALS;
-                APPEND_NEXT_CHAR();
                 break;
             case PARSE_OPEN_TAG_ATTRIBUTE_EQUALS:
-                APPEND_NEXT_CHARS_UNTIL("'\"");
-                open_tag_attribute_value = html;
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS("'\"");
+                open_tag_attribute_value = html_p;
                 state = PARSE_OPEN_TAG_ATTRIBUTE_VALUE;
-                APPEND_NEXT_CHAR();
+                ADVANCE(1);
                 break;
             case PARSE_OPEN_TAG_ATTRIBUTE_VALUE:
-                APPEND_NEXT_CHARS_UNTIL("'\"");
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS("'\"");
                 /* open_tag_attribute_value is either ' or " */
-                while (*html != *open_tag_attribute_value) {
-                    APPEND_NEXT_CHAR();
-                    APPEND_NEXT_CHARS_UNTIL("'\"");
+                while (*html_p != *open_tag_attribute_value) {
+                    ADVANCE(1);
+                    ADVANCE_UNTIL_ONE_OF_THESE_CHARS("'\"");
                 }
                 if (open_tag_attribute_is_class_attribute
                         && num_tags_open == 0) {
+                    COPY_TO_HERE();
                     APPEND_STRING(" ");
                     APPEND_STRING(ns);
                 }
                 open_tag_attribute_is_class_attribute = 0;
                 state = PARSE_OPEN_TAG;
-                APPEND_NEXT_CHAR();
+                ADVANCE(1);
                 break;
             case PARSE_CLOSE_TAG:
-                APPEND_NEXT_CHARS_UNTIL(">");
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS(">");
                 num_tags_open--;
                 open_tag_attribute_value = NULL;
                 state = PARSE_NORMAL;
-                APPEND_NEXT_CHAR();
+                ADVANCE(1);
                 break;
             case PARSE_EMPTY_TAG:
             case PARSE_XML_DECL:
             case PARSE_DOCTYPE:
-                APPEND_NEXT_CHARS_UNTIL(">");
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS(">");
+                ADVANCE(1);
                 state = PARSE_NORMAL;
-                APPEND_NEXT_CHAR();
                 break;
             case PARSE_COMMENT:
-                APPEND_NEXT_CHAR(); /* at least one */
-                APPEND_NEXT_CHARS_UNTIL("-");
-                if (*html == '-' && num_chars_remaining >= 3
-                        && 0 == strncmp("->", html, 2)) {
-                    APPEND_NEXT_CHAR();
-                    APPEND_NEXT_CHAR();
+                ADVANCE(1); /* at least one */
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS("-");
+                if (*html_p == '-' && num_chars_remaining >= 3
+                        && 0 == strncmp("->", html_p, 2)) {
+                    ADVANCE(2);
                     state = PARSE_NORMAL;
                 }
                 /* else loop... */
                 break;
             case PARSE_CDATA:
-                APPEND_NEXT_CHAR(); /* at least one */
-                APPEND_NEXT_CHARS_UNTIL("]");
-                if (*html == ']' && num_chars_remaining >= 3
-                        && 0 == strncmp("]>", html, 2)) {
-                    APPEND_NEXT_CHAR();
-                    APPEND_NEXT_CHAR();
+                ADVANCE(1); /* at least one */
+                ADVANCE_UNTIL_ONE_OF_THESE_CHARS("]");
+                if (*html_p == ']' && num_chars_remaining >= 3
+                        && 0 == strncmp("]>", html_p, 2)) {
+                    ADVANCE(2);
                     state = PARSE_NORMAL;
                 }
                 /* else loop... */
@@ -523,6 +392,7 @@ add_namespace_to_html_with_length_and_allocation_strategy(
         }
     }
 
+    COPY_TO_HERE();
     APPEND_END_OF_STRING();
 
     if (state != PARSE_NORMAL

data/html_namespacing.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{html_namespacing}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Hooper"]
-  s.date = %q{2009-07-28}
+  s.date = %q{2009-08-10}
   s.description = %q{Inserts "class=" attributes within snippets of HTML so CSS and JavaScript can use automatic scopes}
   s.email = %q{adam@adamhooper.com}
   s.extensions = ["ext/html_namespacing/extconf.rb"]
   s.extra_rdoc_files = ["README.rdoc"]
-  s.files = ["README.rdoc", "Rakefile", "test/c_extension_test.rb", "test/test_helper.rb", "ext/html_namespacing/extconf.rb", "ext/html_namespacing/html_namespacing.h", "ext/html_namespacing/html_namespacing.c", "ext/html_namespacing/html_namespacing_ext.c", "lib/html_namespacing.rb", "lib/html_namespacing/plugin.rb", "lib/html_namespacing/plugin/dom_scan_jquery.compressed.js", "lib/html_namespacing/plugin/rails.rb", "lib/html_namespacing/plugin/dom_scan_jquery.js", "lib/html_namespacing/plugin/sass.rb", "Manifest", "html_namespacing.gemspec"]
+  s.files = ["README.rdoc", "Rakefile", "test/c_extension_test.rb", "test/test_helper.rb", "ext/html_namespacing/extconf.rb", "ext/html_namespacing/html_namespacing.h", "ext/html_namespacing/html_namespacing.c", "ext/html_namespacing/html_namespacing_ext.c", "lib/html_namespacing.rb", "lib/html_namespacing/plugin.rb", "lib/html_namespacing/plugin/dom_scan_jquery.compressed.js", "lib/html_namespacing/plugin/rails.rb", "lib/html_namespacing/plugin/dom_scan_jquery.js", "lib/html_namespacing/plugin/sass.rb", "html_namespacing.gemspec", "Manifest"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/adamh/html_namespacing}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Html_namespacing", "--main", "README.rdoc"]

data/lib/html_namespacing/plugin/rails.rb

@@ -31,6 +31,10 @@ module HtmlNamespacing
         @options[:javascript_optional_suffix]
       end
 
+      def self.template_formats
+        @formats ||= Set.new(@options[:template_formats] || ['html'])
+      end
+
       module Helpers
         def html_namespacing_javascript_tag(framework)
           files = html_namespacing_files
@@ -108,7 +112,7 @@ module HtmlNamespacing
 
             view.html_namespacing_rendered_paths << path_without_format_and_extension if view.respond_to?(:html_namespacing_rendered_paths)
 
-            if format == 'html'
+            if HtmlNamespacing::Plugin::Rails.template_formats.include?(format)
               add_namespace_to_html(html, view)
             else
               html

data/test/c_extension_test.rb

@@ -24,14 +24,16 @@ class CExtensionTest < Test::Unit::TestCase
   self.define_test('nil everything', nil, nil, nil)
   self.define_test('plain text', 'hello', 'X', 'hello')
   self.define_test('regular tag', '<div>hello</div>', 'X', '<div class="X">hello</div>')
-  self.define_test('empty tag', '<div/>', 'X', '<div class="X" />')
+  self.define_test('empty tag', '<div/>', 'X', '<div class="X"/>')
+  self.define_test('empty tag with " />"', '<div />', 'X', '<div class="X" />')
+  self.define_test('empty tag with " />" and class', '<div class="A" />', 'X', '<div class="A X" />')
   self.define_test('nested tag', '<div><div>hello</div></div>', 'X', '<div class="X"><div>hello</div></div>')
   self.define_test('two tags', '<div>hello</div><div>goodbye</div>', 'X', '<div class="X">hello</div><div class="X">goodbye</div>')
   self.define_test('existing class= tag with double-quotes', '<div class="foo">bar</div>', 'baz', '<div class="foo baz">bar</div>')
   self.define_test('existing class= tag with single-quotes', "<div class='foo'>bar</div>", 'baz', "<div class='foo baz'>bar</div>")
   self.define_test('other attributes are ignored', '<div id="id" class="foo" style="display:none;">bar</div>', 'baz', '<div id="id" class="foo baz" style="display:none;">bar</div>')
   self.define_test('works with utf-8', '<div class="𝞪">𝟂</div>', '𝞺', '<div class="𝞪 𝞺">𝟂</div>')
-  self.define_test('empty tag with existing class=', '<span class="foo"/>', 'bar', '<span class="foo bar" />')
+  self.define_test('empty tag with existing class=', '<span class="foo"/>', 'bar', '<span class="foo bar"/>')
   self.define_test('works with newlines in tag', "<div\n\nclass\n\n=\n\n'foo'\n\n>bar</div>", 'baz', "<div\n\nclass\n\n=\n\n'foo baz'\n\n>bar</div>")
   self.define_test('works with "\'" within \'"\' attributes', '<div title="Adam\'s House" class="foo">bar</div>', 'baz', '<div title="Adam\'s House" class="foo baz">bar</div>')
   self.define_test('ignores XML prolog', '<?xml version="1.0"?><div>foo</div>', 'X', '<?xml version="1.0"?><div class="X">foo</div>')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamh-html_namespacing
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Adam Hooper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +36,8 @@ files:
 - lib/html_namespacing/plugin/rails.rb
 - lib/html_namespacing/plugin/dom_scan_jquery.js
 - lib/html_namespacing/plugin/sass.rb
-- Manifest
 - html_namespacing.gemspec
+- Manifest
 has_rdoc: true
 homepage: http://github.com/adamh/html_namespacing
 licenses: