html_namespacing 0.1.8 → 0.2.0

data/ext/html_namespacing/html_namespacing.c

@@ -221,7 +221,12 @@ add_namespace_to_html_with_length_and_allocation_strategy(
             } \
         } while (0)/*;*/
 #define ADVANCE_UNTIL_ONE_OF_THESE_CHARS(chars) \
-        ADVANCE(strcspn(html_p, chars))/*;*/
+        do { \
+          const size_t num_chars = strcspn(html_p, chars); \
+          ADVANCE(num_chars); \
+          if (*html_p == '\0') \
+            goto end; \
+        } while (0) /*;*/
 
     unsigned int state;
     char *r; /* Start of retval */
@@ -385,6 +390,7 @@ add_namespace_to_html_with_length_and_allocation_strategy(
         }
     }
 
+ end:
     COPY_TO_HERE();
     APPEND_END_OF_STRING();
 

data/lib/html_namespacing/plugin/rails.rb

@@ -34,29 +34,83 @@ module HtmlNamespacing
         @options[:javascript_root] || RAILS_ROOT + '/app/javascripts/views'
       end
 
+      def self.stylesheet_root
+        @options[:stylesheet_root] || RAILS_ROOT + '/app/stylesheets/views'
+      end
+
       def self.javascript_optional_suffix
         @options[:javascript_optional_suffix]
       end
 
+      def self.stylesheet_optional_suffix
+        @options[:stylesheet_optional_suffix]
+      end
+
       def self.template_formats
         @formats ||= Set.new(@options[:template_formats] || ['html'])
       end
 
       module Helpers
+        #
+        # Return the javascript for the rendered partials, wrapped in
+        # a script tag.
+        #
         def html_namespacing_javascript_tag(framework, options = {})
-          files = html_namespacing_files(options[:format])
-          root = Pathname.new(::HtmlNamespacing::Plugin::Rails.javascript_root)
+          js = html_namespacing_javascript(framework, options)
+          unless js.blank?
+            "<script type=\"text/javascript\"><!--//--><![CDATA[//><!--\n#{js}//--><!]]></script>"
+          end
+        end
 
+        #
+        # Return the javascript for the rendered partials.
+        #
+        def html_namespacing_javascript(framework, options = {})
+          root = Pathname.new(Rails.javascript_root)
+          optional_suffix = Rails.javascript_optional_suffix
+          files = html_namespacing_files('js',
+                                         :format => options[:format],
+                                         :optional_suffix => optional_suffix,
+                                         :root => root.to_s)
           unless files.empty?
-            r = "<script type=\"text/javascript\"><!--//--><![CDATA[//><!--\n"
-            r << HtmlNamespaceJs[framework][:top]
-            r << "\n"
-            files.collect do |path|
+            r = [HtmlNamespaceJs[framework][:top]] << "\n"
+            files.each do |path|
               relative_path = Pathname.new(path).relative_path_from(root)
-              r << html_namespacing_inline_js(framework, relative_path.to_s, path)
-              r << "\n"
+              r << html_namespacing_inline_js(framework, relative_path.to_s, path) << "\n"
             end
-            r << "//--><!]]></script>"
+            r.join
+          end
+        end
+
+        #
+        # Return the CSS for the rendered partials, wrapped in a style
+        # tag.
+        #
+        def html_namespacing_style_tag(options = {}, style_tag_attributes = {})
+          css = html_namespacing_styles(options)
+          unless css.blank?
+            attribute_string = style_tag_attributes.map{|k,v| " #{k}=\"#{v}\""}.join
+            "<style type=\"text/css\"#{attribute_string}>#{css}</style>"
+          end
+        end
+
+        #
+        # Return the CSS for the rendered partials.
+        #
+        def html_namespacing_styles(options = {})
+          root = Pathname.new(Rails.stylesheet_root)
+          optional_suffix = Rails.stylesheet_optional_suffix
+          files = html_namespacing_files('sass',
+                                         :format => options[:format],
+                                         :optional_suffix => optional_suffix,
+                                         :root => root.to_s)
+          unless files.empty?
+            r = []
+            files.each do |path|
+              relative_path = Pathname.new(path).relative_path_from(root)
+              r << html_namespacing_inline_css(relative_path.to_s, path)
+            end
+            r.join
           end
         end
 
@@ -69,14 +123,15 @@ module HtmlNamespacing
           }
         }
 
-        def html_namespacing_files(format)
+        def html_namespacing_files(suffix, options={})
+          format = options[:format]
           (Array === format ? format : [format]).inject([]) do |r, f|
             r.concat(GlobFu.find(
               html_namespacing_rendered_paths,
-              :suffix => 'js',
+              :suffix => suffix,
               :extra_suffix => f && f.to_s,
-              :optional_suffix => ::HtmlNamespacing::Plugin::Rails.javascript_optional_suffix,
-              :root => ::HtmlNamespacing::Plugin::Rails.javascript_root
+              :optional_suffix => options[:optional_suffix],
+              :root => options[:root]
             ))
           end
         end
@@ -87,6 +142,10 @@ module HtmlNamespacing
 
           HtmlNamespaceJs[framework][:each] % [namespace.to_json, content]
         end
+
+        def html_namespacing_inline_css(relative_path, absolute_path)
+          HtmlNamespacing.options[:styles_for].call(relative_path, absolute_path)
+        end
       end
 
       private

data/lib/html_namespacing/plugin/sass.rb

@@ -1,10 +1,27 @@
 module HtmlNamespacing
   module Plugin
     module Sass
-      def self.install(options = {})
-        options[:prefix] ||= 'views'
-        options[:callback] ||= lambda { |p| HtmlNamespacing::Plugin.default_relative_path_to_namespace(p) }
-        Sass_2_2.install(options)
+      class << self
+        def install(options = {})
+          options[:prefix] ||= 'views'
+          options[:callback] ||= lambda { |p| HtmlNamespacing::Plugin.default_relative_path_to_namespace(p) }
+          options[:compress] ||= false
+          @options = options
+          Sass_2_2.install(options)
+          HtmlNamespacing.options[:styles_for] = method(:styles_for)
+        end
+
+        attr_reader :options
+
+        def sass_options
+          ::Sass::Plugin.options
+        end
+
+        def styles_for(relative_path, absolute_path)
+          # Assume the file exists. (If it was found by GlobFu, it should.)
+          css_path = File.join(sass_options[:css_location], self.options[:prefix], relative_path.sub(/\.[^\.\/]*\z/, '.css'))
+          File.read(css_path)
+        end
       end
 
       module Sass_2_2
@@ -46,7 +63,7 @@ module HtmlNamespacing
             end
 
             def namespacing_regex
-              /^#{Regexp.quote(options[:css_location])}\/#{Regexp.quote(namespacing_prefix)}\/(.*)\.css$/
+              /^#{Regexp.quote(Sass.sass_options[:css_location])}\/#{Regexp.quote(namespacing_prefix)}\/(.*)\.css$/
             end
 
             def namespace

data/lib/html_namespacing.rb

@@ -2,4 +2,8 @@ require File.dirname(__FILE__) + '/../ext/html_namespacing/html_namespacing_ext'
 
 module HtmlNamespacing
   autoload(:Plugin, File.dirname(__FILE__) + '/html_namespacing/plugin')
+
+  def self.options
+    @options ||= {}
+  end
 end

data/spec/c_extension_spec.rb

@@ -52,4 +52,7 @@ describe(HtmlNamespacing) do
   self.define_failing_test('unclosed tag', '<div>foo')
   self.define_failing_test('closing tag', 'foo</div>')
   self.define_failing_test('wrong attr syntax', '<div foo=bar>foo</div>')
+  self.define_failing_test("missing closing '>' on last tag", '<div foo="bar">foo</div')
+  self.define_failing_test('end of string during attribute value', '<div foo="x')
+  self.define_failing_test('end of string during doctype declaration', '<!DOCTYPE')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: html_namespacing
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - adamh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -05:00
+date: 2010-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency