jsrequire 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/jsrequire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsrequire}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aekym"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-08-10}
   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 = [
@@ -28,8 +28,12 @@ Gem::Specification.new do |s|
      "test/fixtures/different-place/b.js",
      "test/fixtures/javascripts/a.js",
      "test/fixtures/javascripts/c.js",
+     "test/fixtures/javascripts/coffee/coke.coffee",
+     "test/fixtures/javascripts/coffee/other.coffee",
+     "test/fixtures/javascripts/coffee/tea.js",
      "test/fixtures/javascripts/file.with.dot.js",
      "test/fixtures/javascripts/hook.js",
+     "test/fixtures/javascripts/i_can_cook.coffee",
      "test/fixtures/javascripts/namespace/a.js",
      "test/fixtures/javascripts/namespace/json_reader.js",
      "test/fixtures/javascripts/namespace/norequire.js",

data/lib/jsrequire.rb

@@ -1,4 +1,5 @@
 class JsRequire
+  ALLOWED_EXTENSIONS = %w(coffee js)
 
   class FileNotFoundInLoadpath < ArgumentError; end
 
@@ -128,7 +129,7 @@ class JsRequire
   end
 
 
-  def find_file(filename, current_dir = nil)
+  def find_file_with_extension(filename, current_dir = nil)
     return filename if is_file?(filename)
 
     loadpaths = @extract_loadpaths + @additional_loadpaths
@@ -147,7 +148,21 @@ class JsRequire
       end
     end
 
-    raise FileNotFoundInLoadpath, "File '#{filename}' not found in loadpaths '#{loadpaths.join("', '")}'."
+    false
+  end
+
+  def find_file(filename, current_dir = nil)
+    file = false
+
+    file = find_file_with_extension(filename, current_dir)
+    return file unless file == false
+
+    ALLOWED_EXTENSIONS.each do |extension|
+      file = find_file_with_extension("#{filename}.#{extension}", current_dir)
+      return file unless file == false
+    end
+
+    raise FileNotFoundInLoadpath, "File '#{filename}' not found in loadpaths '#{(@extract_loadpaths + @additional_loadpaths).join("', '")}'."
   end
 
   def exec_preprocessor(action, parameter)
@@ -167,21 +182,12 @@ class JsRequire
     js = []
 
     File.open(filename, "r").each_line do |line|
-      if line =~ /^
-          \s*         # optional leading whitespace
-          \/\*\s*     # opening comment
-          (\w+)\s+    # action
-          (.*)        # parameter
-          \*\/\s*$/x  # closing comment
-
-        action = $1
-        parameter = $2.strip
-
+      if val = parse_line(line)
         # fire callbacks
-        action, parameter = exec_preprocessor(action, parameter)
+        action, parameter = exec_preprocessor(val[0], val[1])
 
         case action
-        when "js" then js << "#{parameter}.js"
+        when "js" then js << parameter
         end
       else
         break
@@ -191,6 +197,28 @@ class JsRequire
     js.uniq.map { |f| find_file(f, File.dirname(filename)) }
   end
 
+  def parse_line(line)
+    case line
+    when /^
+          \s*         # optional leading whitespace
+          \/\*\s*     # opening comment
+          (\w+)\s+    # action
+          (.*)        # parameter
+          \*\/\s*$    # closing comment
+        /x then
+      [$1, $2.strip]
+    when /^
+          \s*         # optional leading whitespace
+          \#\s*       # opening comment
+          (\w+)\s+    # action
+          (.*)$       # parameter
+        /x then
+      [$1, $2.strip]
+    else
+      nil
+    end
+  end
+
 
   def extract_dependencies_recursive(files, included_files = [])
     js = []

data/test/fixtures/javascripts/coffee/other.coffee

@@ -0,0 +1,3 @@
+# js coffee/tea
+
+

data/test/fixtures/javascripts/coffee/tea.js

@@ -0,0 +1 @@
+/* js .coke */

data/test/fixtures/javascripts/i_can_cook.coffee

@@ -0,0 +1,2 @@
+# js coffee.other
+

data/test/test_jsrequire.rb

@@ -117,6 +117,10 @@ class TestJsRequire < Test::Unit::TestCase
       assert_equal additional_loadpaths, @jsrequire.instance_eval("@additional_loadpaths")
     end
 
+    should "work with CoffeeScript files, too" do
+      assert_requires("i_can_cook.coffee", ["coffee/other.coffee", "coffee/tea.js", "coffee/coke.coffee"])
+    end
+
   end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsrequire
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - aekym
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 +02:00
+date: 2010-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -40,8 +40,12 @@ files:
 - test/fixtures/different-place/b.js
 - test/fixtures/javascripts/a.js
 - test/fixtures/javascripts/c.js
+- test/fixtures/javascripts/coffee/coke.coffee
+- test/fixtures/javascripts/coffee/other.coffee
+- test/fixtures/javascripts/coffee/tea.js
 - test/fixtures/javascripts/file.with.dot.js
 - test/fixtures/javascripts/hook.js
+- test/fixtures/javascripts/i_can_cook.coffee
 - test/fixtures/javascripts/namespace/a.js
 - test/fixtures/javascripts/namespace/json_reader.js
 - test/fixtures/javascripts/namespace/norequire.js