Changeset 2643 for lang/javascript/jsdeferred

Timestamp:

12/06/07 17:45:06 (13 months ago)

Author:

cho45

Message:

lang/javascript/jsdeferred/trunk/test.html,
lang/javascript/jsdeferred/trunk/Rakefile,
lang/javascript/jsdeferred/trunk/jsdeferred.js:

Rakefile クリーンアップなど

Location:

lang/javascript/jsdeferred/trunk

Files:

• Rakefile (modified) (1 diff)
• jsdeferred.js (modified) (5 diffs)
• test.html (modified) (1 diff)

lang/javascript/jsdeferred/trunk/Rakefile

@@ -6 +6 @@
 CLEAN.include ["jsdeferred.{nodoc,mini,jquery}.js"]
 
-def mini(js)
-        js.gsub(/[ \t]+/, " ").
-                gsub(/\n\n+/, "\n").
-                gsub(/\s?;\s?/, ";").
-                gsub(/\s?\{\s?/, "{").
-                gsub(/\s?function/, "function")
+def mini(js, commentonly=false)
+        js = js.dup
+        js.gsub!(%r|\n?/\*.*?\*/|m, "")
+        js.gsub!(%r|\n?//.*|, "")
+        unless commentonly
+                js.gsub!(/[ \t]+/, " ")
+                js.gsub!(/\n\n+/, "\n")
+                js.gsub!(/\s?;\s?/, ";")
+                js.gsub!(/\s?\{\s?/, "{")
+        end
+        js
 end
 
 task :default => [:test]
 
-task :test => ["jsdeferred.jquery.js"] do
+task :test => [:release] do
 end
 
-task :release => ["jsdeferred.nodoc.js", "jsdeferred.mini.js", "jsdeferred.js"] do
+task :release => ["jsdeferred.nodoc.js", "jsdeferred.mini.js", "jsdeferred.js", "jsdeferred.jquery.js"] do
 end
 
 file "jsdeferred.nodoc.js" => ["jsdeferred.js"] do |t|
-        content = File.read("jsdeferred.js")
-        content.gsub!(%r|\n?/\*.*?\*/|m, "")
-        content.gsub!(%r|\n?//.*|, "")
-
         File.open(t.name, "w") {|f|
-                f << content
+                f << mini(File.read("jsdeferred.js"), true)
         }
 end
 
-file "jsdeferred.mini.js" => ["jsdeferred.nodoc.js"] do |t|
+file "jsdeferred.mini.js" => ["jsdeferred.js"] do |t|
         File.open(t.name, "w") {|f|
-                f << mini(File.read("jsdeferred.nodoc.js"))
+                f << mini(File.read("jsdeferred.js"))
         }
 end
 
-file "jsdeferred.jquery.js" do |t|
+file "jsdeferred.jquery.js" => ["jsdeferred.js", "binding/jquery.js"] do |t|
         File.open(t.name, "w") {|f|
                 f << mini(File.read("jsdeferred.js") + File.read("binding/jquery.js"))

lang/javascript/jsdeferred/trunk/jsdeferred.js

@@ -171 +171 @@
         }
         return ret;
-}
+};
 
 /* function wait (sec) //=> Deferred
@@ -191 +191 @@
         d.canceller   = function () { try { clearTimeout(id) } catch (e) {} };
         return d;
-}
+};
 
 /* function next (fun) //=> Deferred
@@ -204 +204 @@
         d.canceller   = function () { try { clearTimeout(id) } catch (e) {} };
         return d;
-}
+};
 
 /* function call (fun[, args...]) //=> Deferred
@@ -233 +233 @@
                 return f.apply(this, args);
         });
-}
+};
 
 /* function loop (n, fun) //=> Deferred
@@ -285 +285 @@
                 return call(_loop, o.begin);
         });
-}
+};
 
 /* function Deferred.register (name, fun) //=> void 0

lang/javascript/jsdeferred/trunk/test.html

@@ -5 +5 @@
                 
                 <script type="text/javascript" src="http://coderepos.org/share/htdocs/lib/jquery-1.2.1.min.js"></script>
+                <!--
                 <script type="text/javascript" src="jsdeferred.js"></script>
                 <script type="text/javascript" src="binding/jquery.js"></script>
+                -->
+                <script type="text/javascript" src="jsdeferred.jquery.js"></script>
                 <script type="text/javascript" src="test-jsdeferred.js"></script>
                 <style type="text/css">