jspp 1.0.1 → 1.1.0

data/bin/jspp

@@ -1,33 +1,34 @@
 #!/usr/bin/env ruby
 
+# Usage: jspp input > output
+#
+# EXAMPLE
+#              main.js:  /*> script.js */
+#
+#                        var style = "/*> style.css */";
+#
+#            style.css:  html, body {margin:0; padding:0}
+#                        /*> http://nv.github.com/js-preprocessor/example/css/style-child.css */
+#                        .my-style {background: #fffacc}
+#
+#      style-child.css:  .i-am-child {}
+#
+#            script.js:  var my_script;
+#
+# jspp example/main.js:  var my_script;
+#
+#                        var style = "html, body {margin:0; padding:0}\\
+#                        .i-am-child {}\\
+#                        .my-style {background: #fffacc}"
+
 require 'jspp'
 
 if $stdin.tty? and ARGV.empty? or ARGV.delete'-h' or ARGV.delete'--help'
-  puts <<-how_to_use
-
-          JavaScript Preprocessor
-
-  Usage:  jspp input > output
-
-Example:      main.js:  /*> script.js */
-
-                        var style = "/*> style.css */";
-
-            style.css:  html, body {margin:0; padding:0}
-                        /*> http://nv.github.com/js-preprocessor/example/css/style-child.css */
-                        .my-style {background: #fffacc}
-
-      style-child.css:  .i-am-child {}
-
-            script.js:  var my_script;
-
- jspp example/main.js:  var my_script;
-
-                        var style = "html, body {margin:0; padding:0}\\
-                        .i-am-child {}\\
-                        .my-style {background: #fffacc}"
-how_to_use
+  $stderr.puts File.read(__FILE__).grep(/^#[^!]/) {|line|
+    line.sub /^# ?/, ''
+  }.join
+  exit 1
 else
-  DIR = File.dirname ARGV.first || '.'
-  print JSPP(ARGF.read, DIR)
+  dir = File.dirname ARGV.first || '.'
+  print JSPP(ARGF.read, dir)
 end

data/lib/jspp.rb

@@ -2,19 +2,6 @@ class JSPP
 
   INCLUDE = %r{/\*>\s*(.+?)\s*\*/}
   INCLUDE_INSIDE_STRING = %r{"#{INCLUDE.source}"}
-  
-  def get_file path, base_dir='.'
-    if path.index'http://' or path.index'https://'
-      require 'open-uri'
-      file = open(path).read
-      dir = File.dirname path
-    else
-      full_path = File.join base_dir, path
-      file = File.read full_path
-      dir = File.dirname full_path
-    end
-    [file, dir]
-  end
 
   def parse text='', base_dir='.'
     text.gsub!(INCLUDE_INSIDE_STRING) {
@@ -28,10 +15,26 @@ class JSPP
     }
     text
   end
+
+  def get_file path, base_dir='.'
+    if path.index'http://' or path.index'https://'
+      require 'open-uri'
+      file = open(path).read
+      dir = File.dirname path
+    else
+      full_path = File.join base_dir, path
+      file = File.read full_path
+      dir = File.dirname full_path
+    end
+    [file, dir]
+  end
+
 end
 
 module Kernel
-  def JSPP text, base_dir='.'
+  def JSPP path
+    text = File.read path
+    base_dir = File.dirname path
     JSPP.new.parse text, base_dir
   end
   private :JSPP

data/spec/jspp_spec.rb

@@ -1,13 +1,22 @@
 require 'helper'
 
 describe JSPP do
-  describe '#get_file' do
-    it 'fetches URI' do
-      JSPP.new.get_file(PETS_URL).first.should == PETS
+
+  describe '::INCLUDE' do
+    it 'matches files' do
+      JSPP::INCLUDE.match('/*> path_to/my_file.js */')[1].should == 'path_to/my_file.js'
     end
-    it 'reads file' do
-      main_js = EXAMPLE + '/main.js'
-      JSPP.new.get_file(main_js, '/').first.should == File.read(main_js)
+    it 'matches URIs' do
+      JSPP::INCLUDE.match('/*> http://elv1s.ru/x/pets.txt */')[1].should == 'http://elv1s.ru/x/pets.txt'
+    end
+  end
+
+  describe '::INCLUDE_INSIDE_STRING' do
+    it 'matches local files inside strings' do
+      JSPP::INCLUDE_INSIDE_STRING.match('"/*> path_to/my_file.js */"')[1].should == 'path_to/my_file.js'
+    end
+    it 'matches URIs inside strings' do
+      JSPP::INCLUDE_INSIDE_STRING.match('"/*> http://elv1s.ru/x/pets.txt */"')[1].should == 'http://elv1s.ru/x/pets.txt'
     end
   end
 
@@ -27,4 +36,29 @@ var style = "html, body {margin:0; padding:0}\\
       JSPP.new.parse(PETS).should == PETS
     end
   end
+
+  describe '#get_file' do
+    it 'fetches URI' do
+      JSPP.new.get_file(PETS_URL).first.should == PETS
+    end
+    it 'reads file' do
+      main_js = EXAMPLE + '/main.js'
+      JSPP.new.get_file(main_js, '/').first.should == File.read(main_js)
+    end
+  end
+
+end
+
+
+describe Kernel, '#JSPP' do
+  it 'do all the stuff' do
+    JSPP(EXAMPLE + '/main.js').should == <<-result
+var my_script;
+
+var style = "html, body {margin:0; padding:0}\\
+.i-am-child {}\\
+.my-style {background: #fffacc}\\
+";
+    result
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nikita Vasilyev
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 +03:00
+date: 2010-03-21 00:00:00 +03:00
 default_executable: 
 dependencies: []