jsrequire 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/jsrequire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsrequire}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["aekym"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-07-28}
   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 = [
@@ -35,10 +35,14 @@ Gem::Specification.new do |s|
      "test/fixtures/javascripts/namespace/norequire.js",
      "test/fixtures/javascripts/norequire.js",
      "test/fixtures/javascripts/norequire.with.dot.in.name.js",
+     "test/fixtures/javascripts/relative_namespace/a.js",
+     "test/fixtures/javascripts/relative_namespace/b.js",
+     "test/fixtures/javascripts/relative_namespace/sub/a.js",
      "test/fixtures/javascripts/require_filename_with_dot.js",
      "test/fixtures/javascripts/require_filename_with_js.js",
      "test/fixtures/javascripts/require_namespaced_file.js",
      "test/fixtures/javascripts/require_non_existing_file.js",
+     "test/fixtures/javascripts/require_relative_namespaced_file.js",
      "test/fixtures/javascripts/requirecss.js",
      "test/fixtures/stylesheets/style.css",
      "test/helper.rb",
@@ -48,7 +52,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aekym/jsrequire}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Organizes requirements of assets in JavaScript files}
   s.test_files = [
     "test/helper.rb",
@@ -60,7 +64,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/jsrequire.rb

@@ -1,6 +1,3 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 class JsRequire
 
   class FileNotFoundInLoadpath < ArgumentError; end
@@ -45,6 +42,8 @@ class JsRequire
   # }
   #
   def resolve_dependencies(files)
+    files = [files] unless files.is_a?(Enumerable)
+
     @css = []
     @extract_loadpaths = extract_loadpaths(files)
 
@@ -129,10 +128,11 @@ class JsRequire
   end
 
 
-  def find_file(filename)
+  def find_file(filename, current_dir = nil)
     return filename if is_file?(filename)
 
     loadpaths = @extract_loadpaths + @additional_loadpaths
+    loadpaths.unshift(current_dir) if current_dir && filename =~ /^\./
     loadpaths.each do |path|
       file = File.expand_path(filename, path)
       return file if is_file?(file)
@@ -142,7 +142,7 @@ class JsRequire
     if filename =~ /\./
       loadpaths.each do |path|
         ext = File.extname(filename)
-        file = File.expand_path(filename.gsub(/#{ext}$/, '').gsub('.', '/') + ext, path)
+        file = File.expand_path(filename.gsub(/#{ext}$/, '').gsub(/^\./, '').gsub('.', '/') + ext, path)
         return file if is_file?(file)
       end
     end
@@ -166,28 +166,29 @@ class JsRequire
     is_require = true
     js = []
 
-    File.open(filename, "r") do |f|
-      begin
-        line = f.gets
-        if line =~ /^\s*\/\*\s*(\w+)(.+)\*\/\s*$/
-          action = $1.strip
-          parameter = $2.strip
-
-          # fire callbacks
-          #
-          action, parameter = exec_preprocessor(action, parameter)
-
-          case action
-          when "js" then js << "#{parameter}.js"
-          end
-        else
-          is_require = false
-        end
+    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
 
-      end while is_require
+        # fire callbacks
+        action, parameter = exec_preprocessor(action, parameter)
+
+        case action
+        when "js" then js << "#{parameter}.js"
+        end
+      else
+        break
+      end
     end
 
-    js.uniq.map { |f| find_file(f) }
+    js.uniq.map { |f| find_file(f, File.dirname(filename)) }
   end
 
 

data/test/fixtures/javascripts/c.js

@@ -1,3 +1,4 @@
+/* routes */
 /* js a */
 /* js b */
 

data/test/fixtures/javascripts/relative_namespace/a.js

@@ -0,0 +1,2 @@
+/* js .b */
+/* js .sub.a */

data/test/fixtures/javascripts/require_relative_namespaced_file.js

@@ -0,0 +1,2 @@
+/* js .relative_namespace.a */
+

data/test/test_hooks.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper.rb'
+require 'helper.rb'
 
 class TestHooks < Test::Unit::TestCase
 

data/test/test_jsrequire.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper.rb'
+require 'helper.rb'
 
 class TestJsRequire < Test::Unit::TestCase
 
@@ -91,6 +91,10 @@ class TestJsRequire < Test::Unit::TestCase
       assert_requires("require_namespaced_file.js", "namespace/a.js")
     end
 
+    should "be able to require a file via relative namespaces" do
+      assert_requires("require_relative_namespaced_file.js", ["relative_namespace/a.js", "relative_namespace/b.js", "relative_namespace/sub/a.js"])
+    end
+
     should "be able to require a file with dots in filename" do
       assert_requires("require_filename_with_dot.js", "file.with.dot.js")
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsrequire
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - aekym
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -46,10 +47,14 @@ files:
 - test/fixtures/javascripts/namespace/norequire.js
 - test/fixtures/javascripts/norequire.js
 - test/fixtures/javascripts/norequire.with.dot.in.name.js
+- test/fixtures/javascripts/relative_namespace/a.js
+- test/fixtures/javascripts/relative_namespace/b.js
+- test/fixtures/javascripts/relative_namespace/sub/a.js
 - test/fixtures/javascripts/require_filename_with_dot.js
 - test/fixtures/javascripts/require_filename_with_js.js
 - test/fixtures/javascripts/require_namespaced_file.js
 - test/fixtures/javascripts/require_non_existing_file.js
+- test/fixtures/javascripts/require_relative_namespaced_file.js
 - test/fixtures/javascripts/requirecss.js
 - test/fixtures/stylesheets/style.css
 - test/helper.rb
@@ -65,23 +70,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Organizes requirements of assets in JavaScript files