jsrequire 0.1.0 → 0.1.1

data/README.mkd

@@ -18,7 +18,7 @@ A JavaScript file
 
 On top of a file add something like:
 
-    /* require foo/bar */
+    /* js foo/bar */
     /* css baz */
 
 This requires the js file foo/bar.js and the stylesheet baz.css. Dependencies are resolved in right order of require statments over all files.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/jsrequire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsrequire}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aekym"]
-  s.date = %q{2010-05-07}
+  s.date = %q{2010-05-26}
   s.description = %q{Organizes requirements of assets in JavaScript files, resolved dependencies of js files and helps include depending css files.}
   s.email = %q{me@aekym.com}
   s.extra_rdoc_files = [

data/lib/jsrequire.rb

@@ -13,6 +13,8 @@ class JsRequire
     @additional_loadpaths = JsRequire::normalize_filepaths(loadpaths.compact)
 
     @preprocessors = Hash.new { |h,k| h[k] = [] }
+
+    on("css", &method(:collect_css))
   end
 
 
@@ -21,6 +23,12 @@ class JsRequire
   end
 
 
+  def collect_css(action, param)
+    @css << param + ".css"
+    nil
+  end
+
+
   # resolve dependencies of js input files
   #
   # returns a hash with js and css dependencies
@@ -37,14 +45,14 @@ class JsRequire
   # }
   #
   def resolve_dependencies(files)
-    @stylesheets = Hash.new { |h,k| h[k] = [] }
+    @css = []
     @extract_loadpaths = extract_loadpaths(files)
 
     js = extract_dependencies_recursive(JsRequire::normalize_filepaths(files))
 
     {
       :javascripts => js,
-      :stylesheets => @stylesheets.map { |k,v| v }.flatten.uniq.sort
+      :stylesheets => @css.uniq.sort
     }
   end
 
@@ -170,8 +178,7 @@ class JsRequire
           action, parameter = exec_preprocessor(action, parameter)
 
           case action
-          when "require" then js << "#{parameter}.js"
-          when "css"     then @stylesheets[filename] << parameter + ".css"
+          when "js" then js << "#{parameter}.js"
           end
         else
           is_require = false
@@ -198,6 +205,5 @@ class JsRequire
     js
   end
 
-
 end
 

data/test/fixtures/different-place/b.js

@@ -1,2 +1,2 @@
-/* require norequire */
+/* js norequire */
 

data/test/fixtures/javascripts/a.js

@@ -1,2 +1,2 @@
-/* require b */
+/* js b */
 

data/test/fixtures/javascripts/c.js

@@ -1,3 +1,3 @@
-/* require a */
-/* require b */
+/* js a */
+/* js b */
 

data/test/fixtures/javascripts/require_filename_with_dot.js

@@ -1 +1 @@
-/* require file.with.dot */
+/* js file.with.dot */

data/test/fixtures/javascripts/require_filename_with_js.js

@@ -1 +1 @@
-/* require namespace.json_reader */
+/* js namespace.json_reader */

data/test/fixtures/javascripts/require_namespaced_file.js

@@ -1,3 +1,3 @@
-/* require namespace.a */
+/* js namespace.a */
 
 

data/test/fixtures/javascripts/require_non_existing_file.js

@@ -1,2 +1,2 @@
-/* require afileyouwillneverfind */
+/* js afileyouwillneverfind */
 

data/test/test_hooks.rb

@@ -67,12 +67,12 @@ class TestHooks < Test::Unit::TestCase
       assert general_called && specific_called, "Callbacks were not called"
     end
 
-    should "rewrite line to require" do
+    should "rewrite line to js-action" do
       called = false
       deps = require("hook.js") do
         @jsrequire.on("view") do |action, params|
           called = true
-          ["require", "norequire"]
+          ["js", "norequire"]
         end
       end
 
@@ -81,18 +81,18 @@ class TestHooks < Test::Unit::TestCase
       assert_match /norequire\.js$/, deps[:javascripts].first
     end
 
-    should "rewrite line to require" do
+    should "skip required view because hook drops it" do
       called = false
       deps = require("hook.js") do
         @jsrequire.on("view") do |action, params|
           called = true
-          ["require", "norequire"]
+          nil
         end
       end
 
       assert called, "Callback not fired"
-      assert_equal 2, deps[:javascripts].size
-      assert_match /norequire\.js$/, deps[:javascripts].first
+      assert_equal 1, deps[:javascripts].size
+      assert_match /hook\.js$/, deps[:javascripts].first
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - aekym
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +02:00
+date: 2010-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: []