adamh-html_namespacing 0.1.3 → 0.1.4

data/README.rdoc

@@ -183,7 +183,7 @@ files, if you are using <tt>html_namespacing_javascript_tag()</tt>. For
 instance, if <tt>:javascript_optional_suffix</tt> is <tt>'compressed'</tt> and
 you rendered the partial <tt>app/views/foos/_foo.html.haml</tt>, then the
 (presumably minified) file
-<tt>app/javascripts/views/foos/_foo.compressed.js</tt> will be included if it
+<tt>app/javascripts/views/foos/_foo.js.compressed</tt> will be included if it
 exists (otherwise the standard <tt>app/javascripts/views/foos/_foo.js</tt>,
 otherwise nothing).
 
@@ -251,7 +251,7 @@ reader.
 
 Use the following Rails helper, possibly in your default layout:
 
-<tt>html_namespacing_javascript_tag(:jquery)</tt>
+  html_namespacing_javascript_tag(:jquery)
 
 Afterwards, similar to our namespaced CSS framework above, you can easily
 namespace JavaScript behavior:
@@ -271,6 +271,18 @@ available: <tt>NS</tt>, the namespace string, and <tt>$NS()</tt>, a function
 returning a jQuery object containing all elements at the root of the
 namespace.)
 
+In a more complex setup, you may prefer to add another extension, like so:
+
+  html_namespacing_javascript_tag(:jquery, :format => :mobile)
+
+This will find <tt>app/javascripts/views/foos/_description.mobile.js</tt> and
+will ignore <tt>app/javascripts/views/foos/_description.js</tt>. Neglecting the
+second parameter, <tt>html_namespacing_javascript_tag()</tt> would include
+<tt>_description.js</tt> and <em>exclude</em> <tt>_description.mobile.js</tt>:
+only single-extension JavaScript will be included. To include both, use:
+
+  html_namespacing_javascript_tag(:jquery, :format => [nil, :mobile])
+
 === Caching and JavaScript Namespacing
 
 Caching throws a wrench into operations.

data/lib/html_namespacing/plugin/rails.rb

@@ -36,14 +36,17 @@ module HtmlNamespacing
       end
 
       module Helpers
-        def html_namespacing_javascript_tag(framework)
-          files = html_namespacing_files
+        def html_namespacing_javascript_tag(framework, options = {})
+          files = html_namespacing_files(options[:format])
+          root = Pathname.new(::HtmlNamespacing::Plugin::Rails.javascript_root)
+
           unless files.empty?
             r = "<script type=\"text/javascript\"><!--//--><![CDATA[//><!--\n"
             r << HtmlNamespaceJs[framework][:top]
             r << "\n"
-            files.collect do |relative_path, absolute_path|
-              r << html_namespacing_inline_js(framework, relative_path, absolute_path)
+            files.collect do |path|
+              relative_path = Pathname.new(path).relative_path_from(root)
+              r << html_namespacing_inline_js(framework, relative_path.to_s, path)
               r << "\n"
             end
             r << "//--><!]]></script>"
@@ -54,40 +57,25 @@ module HtmlNamespacing
 
         HtmlNamespaceJs = {
           :jquery => {
-            :top => File.open(File.join(File.dirname(__FILE__), 'dom_scan_jquery.compressed.js')) { |f| f.read },
+            :top => File.open(File.join(File.dirname(__FILE__), 'dom_scan_jquery.js.compressed')) { |f| f.read },
             :each => 'jQuery(function($){var NS=%s,$NS=function(){return $($.NS[NS]||[])};%s});'
           }
         }
 
-        def html_namespacing_files
-          suffix = ::HtmlNamespacing::Plugin::Rails.javascript_optional_suffix
-          root = ::HtmlNamespacing::Plugin::Rails.javascript_root
-
-          r = html_namespacing_rendered_paths
-          
-          r.uniq!
-
-          r.collect! do |relative_path|
-            prefix = File.join(root, relative_path)
-            absolute_path = "#{prefix}.js"
-            absolute_path_with_suffix = "#{prefix}.#{suffix}.js" if suffix
-
-            if suffix && File.exist?(absolute_path_with_suffix)
-              [relative_path, absolute_path_with_suffix]
-            elsif File.exist?(absolute_path)
-              [relative_path, absolute_path]
-            else
-              nil
-            end
+        def html_namespacing_files(format)
+          (Array === format ? format : [format]).inject([]) do |r, f|
+            r.concat(GlobFu.find(
+              html_namespacing_rendered_paths,
+              :suffix => 'js',
+              :extra_suffix => f && f.to_s,
+              :optional_suffix => ::HtmlNamespacing::Plugin::Rails.javascript_optional_suffix,
+              :root => ::HtmlNamespacing::Plugin::Rails.javascript_root
+            ))
           end
-
-          r.compact!
-
-          r
         end
 
         def html_namespacing_inline_js(framework, relative_path, absolute_path)
-          namespace = ::HtmlNamespacing::Plugin::Rails.path_to_namespace(relative_path)
+          namespace = ::HtmlNamespacing::Plugin::Rails.path_to_namespace(relative_path.sub(/\..*$/, ''))
           content = File.open(absolute_path) { |f| f.read }
 
           HtmlNamespaceJs[framework][:each] % [namespace.to_json, content]

data/{test/c_extension_test.rb → spec/c_extension_spec.rb}

@@ -1,24 +1,26 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
-class CExtensionTest < Test::Unit::TestCase
+describe(HtmlNamespacing) do
   private
 
   def self.define_test(name, html, ns, expect)
-    define_method("test_#{name}".to_sym) do
-      assert_equal(expect, f(html, ns))
+    it("should work with #{name}") do
+      f(html, ns).should == expect
     end
   end
 
   def self.define_failing_test(name, html)
-    define_method("test_#{name}".to_sym) do
-      assert_raises(ArgumentError) do
-        f(html, 'X')
-      end
+    it("should fail on #{name}") do
+      lambda { f(html, 'X') }.should raise_error(ArgumentError)
     end
   end
 
+  def f(html, ns)
+    HtmlNamespacing::add_namespace_to_html(html, ns)
+  end
+
   self.define_test('nil HTML', nil, 'X', nil)
   self.define_test('nil namespace', '<div>hello</div>', nil, '<div>hello</div>')
   self.define_test('nil everything', nil, nil, nil)
@@ -45,11 +47,7 @@ class CExtensionTest < Test::Unit::TestCase
     self.define_test("ignores <#{tag}> tags", "<#{tag}>foo</#{tag}>", "X", "<#{tag}>foo</#{tag}>")
   end
 
-  self.define_failing_test('unclosed tag fails', '<div>foo')
-  self.define_failing_test('closing tag fails', 'foo</div>')
-  self.define_failing_test('wrong attr syntax fails', '<div foo=bar>foo</div>')
-
-  def f(html, ns)
-    HtmlNamespacing::add_namespace_to_html(html, ns)
-  end
+  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>')
 end

data/{test/test_helper.rb → spec/spec_helper.rb}

@@ -1,3 +1,4 @@
-require 'test/unit'
+require 'rubygems'
+require 'spec'
 
 require File.dirname(__FILE__) + '/../lib/html_namespacing'

metadata

@@ -1,18 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: adamh-html_namespacing
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
-- Adam Hooper
+- adamh
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: adamh-glob_fu
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+    version: 
 description: Inserts "class=" attributes within snippets of HTML so CSS and JavaScript can use automatic scopes
 email: adam@adamhooper.com
 executables: []
@@ -22,36 +31,24 @@ extensions:
 extra_rdoc_files: 
 - README.rdoc
 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.h
 - 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/dom_scan_jquery.js.compressed
+- lib/html_namespacing/plugin/rails.rb
 - lib/html_namespacing/plugin/sass.rb
-- html_namespacing.gemspec
-- Manifest
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/adamh/html_namespacing
 licenses: 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Html_namespacing
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -62,15 +59,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
-rubyforge_project: html_namespacing
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Automatic HTML namespacing
 test_files: 
-- test/c_extension_test.rb
-- test/test_helper.rb
+- spec/c_extension_spec.rb
+- spec/spec_helper.rb

data/Manifest

@@ -1,16 +0,0 @@
-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

data/Rakefile

@@ -1,12 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-Echoe.new('html_namespacing', '0.1.3') do |p|
-  p.author = 'Adam Hooper'
-  p.email = 'adam@adamhooper.com'
-  p.summary = 'Automatic HTML namespacing'
-  p.description = 'Inserts "class=" attributes within snippets of HTML so CSS and JavaScript can use automatic scopes'
-  p.url = 'http://github.com/adamh/html_namespacing'
-  p.rdoc_files = ['README.rdoc'] # echoe seems to gather everything twice
-end

data/html_namespacing.gemspec

@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{html_namespacing}
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Adam Hooper"]
-  s.date = %q{2009-08-17}
-  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", "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"]
-  s.require_paths = ["lib", "ext"]
-  s.rubyforge_project = %q{html_namespacing}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Automatic HTML namespacing}
-  s.test_files = ["test/c_extension_test.rb", "test/test_helper.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end