snowball 0.1.5 → 0.1.6

data/bin/roll.js

@@ -11,6 +11,10 @@ var argv = optimist
     .option('help', {
       desc : 'Show this help'
     })
+    .option('raw', {
+      alias : 'r',
+      desc : 'Just compile entry file, without using browserify.'
+    })
     .option('require', {
         alias : 'r',
         desc : 'A module name or file to bundle.require()\n'
@@ -38,6 +42,27 @@ var argv = optimist
 if (argv.help) {
   return optimist.showHelp()
 }
+if (argv.raw) {
+  var compilers = {
+    coffee: function (data) {
+      var coffee = require("coffee-script");
+      return coffee.compile(data);
+    }
+  };
+  (argv._.concat(argv.entry || [])).forEach(function (entry) {
+    // todo: keep a map of extension => compiler instead (in order to support jade compiling too)
+    var compile = compilers[path.extname(entry).replace(/^\./, "")];
+    fs.readFile(entry, function (err, data) {
+      if (err) throw err;
+      if (compile) data = compile(data.toString());
+      process.stdout.write("\n");
+      process.stdout.write(data);
+      process.stdout.write("\n");
+    });
+  });
+  return;
+}
+
 
 // Parse argv.env properly
 // turns argv.env strings like ['FOO=bar', 'BAZ=qux', ...] into an object of { FOO: 'bar', BAZ:'qux' }

data/lib/snowball/config.rb

@@ -2,50 +2,50 @@
 module Snowball
   class Config
     class Builder
-      def initialize(config)
+      def initialize(config = {})
         @config = config
+        @config[:extensions] ||= [:js, :coffee]
+        @config[:source_paths] ||= []
+        @config[:raw] ||= []
+        @config[:source] ||= []
+        @config[:includes] ||= []
+        @config[:ignores] = []
+        @config[:env] ||= {}
+        @config[:prelude] ||= true
       end
       def http_path(path)
-        @config.http_path = path
+        @config[:http_path] = path
       end
       alias_method :set_serve_path, :http_path # todo: deprecate
       def source_path(path)
-        @config.source_paths << File.expand_path(path)
+        @config[:source_paths] << File.expand_path(path)
       end
 
       alias_method :add_load_path, :source_path # todo: deprecate
       def raw(glob_string)
-        @config.raw << glob_string
+        @config[:raw] << glob_string
+      end
+
+      def source(glob_string)
+        @config[:source] << glob_string
       end
 
       def ignore(node_module)
-        @config.ignores << node_module
+        @config[:ignores] << node_module
       end
 
       def setenv(*args)
-        @config.env.merge!(args.first) and return if args.size == 1
-        @config.env[args.first] = args[1]
+        @config[:env].merge!(args.first) and return if args.size == 1
+        @config[:env][args.first] = args[1]
       end
 
       def include(node_module)
-        @config.includes << node_module
+        @config[:includes] << node_module
       end
 
       def prelude(bool)
-        @config.prelude = bool
+        @config[:prelude] = bool
       end
     end
-
-    attr_accessor :http_path, :source_paths, :raw, :extensions, :includes, :ignores, :prelude, :env
-
-    def initialize
-      @extensions = [:js, :coffee]
-      @source_paths = []
-      @raw = []
-      @includes = []
-      @ignores = []
-      @env = {}
-      @prelude = true
-    end
   end
 end

data/lib/snowball/roller.rb

@@ -8,16 +8,17 @@ module Snowball
     def self.roll(entry, opts)
       args = []
 
-      ignores = opts.ignores.dup
+      ignores = opts[:ignores].dup
       ignores.unshift *%w(jsdom xmlhttprequest location navigator)
       ignores.uniq!
 
       args << ignores.map { |node_module| "--ignore #{node_module}" }.join(" ")
-      args << opts.includes.map { |node_module| "--require #{node_module}" }.join(" ")
-      args << "--prelude #{!!opts.prelude}"
+      args << opts[:includes].map { |node_module| "--require #{node_module}" }.join(" ")
+      args << "--prelude #{!!opts[:prelude]}"
       args << "--entry #{entry}"
+      args << "--raw" if opts[:raw]
 
-      args += (opts.env || {}).map do |k,v|
+      args += (opts[:env] || {}).map do |k,v|
         "--env #{k}=#{v}"
       end
 

data/lib/snowball/sinatra.rb

@@ -4,8 +4,8 @@ module Sinatra
   module Snowball
     # Resolves a file relative to the source path
     def self.resolve_file(config, file)
-      source_paths = config.source_paths
-      extensions = config.extensions
+      source_paths = config[:source_paths]
+      extensions = config[:extensions]
 
       source_paths.each do |source_path|
         try_file = File.expand_path(File.join(source_path, file))
@@ -27,29 +27,30 @@ module Sinatra
     end
 
     def snowball(&block)
-      config = ::Snowball::Config.new
+      config = {}
       builder = ::Snowball::Config::Builder.new(config)
       builder.send(:instance_eval, &block)
       self.set :snowball, config
-      self.get "#{config.http_path}/*" do |bundle|
+      self.get "#{config[:http_path]}/*" do |bundle|
         begin
           entryfile = Snowball.resolve_file(config, bundle)
         rescue Errno::ENOENT => e
           halt 404, "File #{bundle} not found"
         end
 
-        if File.extname(bundle) != '.js' or config.raw.any? { |glob_str| File.fnmatch(glob_str, entryfile) }
+        if File.extname(bundle) != '.js' or config[:source].any? { |glob_str| File.fnmatch(glob_str, entryfile) }
           send_file entryfile
         else
+          raw = config[:raw].any? { |glob_str| File.fnmatch(glob_str, entryfile) }
           content_type :js
-          [200, ::Snowball::Roller.roll(*[entryfile, config].compact)]
+          [200, ::Snowball::Roller.roll(*[entryfile, config.merge({:raw => raw})].compact)]
         end
       end
     end
 
     module Helpers
       def javascript_path(file)
-        "#{self.settings.snowball.http_path}/#{file}.js"
+        "#{self.settings.snowball[:http_path]}/#{file}.js"
       end
 
       def javascript_tag(file, opts={})

data/lib/snowball/version.rb

@@ -1,3 +1,3 @@
 module Snowball
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/fixtures/js/raw-2.js

@@ -0,0 +1 @@
+console.log("That is awesome!");

data/spec/fixtures/js/raw.coffee

@@ -0,0 +1 @@
+alert "I knew it!" if elvis?

data/spec/fixtures/snowball_app.rb

@@ -4,7 +4,8 @@ class SnowballApp < Sinatra::Base
     http_path "/js"
     source_path "spec/fixtures/js"
     source_path "spec/fixtures/js/food"
-    raw "*/food/steak.js"
+    raw "*/js/raw-2.js"
+    raw "*/js/raw.coffee"
   end
 
   get "/javascript_tag" do

data/spec/snowball_spec.rb

@@ -31,12 +31,24 @@ describe "SnowballApp" do
       last_response.body.should match compiled
     end
 
-    it "serves the coffee-script file raw if requested with .coffee as extension" do
+    it "serves the coffee-script file as source if requested with .coffee as extension" do
       get "/js/require.coffee"
       last_response.status.should eq 200
       last_response.body.should match Regexp.escape("test = ->")
     end
 
+    it "serves the javascript entry raw (not browserified) it matches the configured glob strings" do
+      get "/js/raw-2.js"
+      last_response.status.should eq 200
+      last_response.body.should match Regexp.escape('console.log("That is awesome!");')
+    end
+
+    it "serves the coffeescript entry raw (combiled, but not browserified) it matches the configured glob strings" do
+      get "/js/raw.js"
+      last_response.status.should eq 200
+      last_response.body.should match Regexp.escape('alert("I knew it!");')
+    end
+
     it "includes transitive dependencies" do
       get "/js/require.js"
       last_response.status.should eq 200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snowball
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -123,6 +123,8 @@ files:
 - spec/fixtures/js/hello.jade
 - spec/fixtures/js/pastry/tart.js
 - spec/fixtures/js/pastry/tartlet.coffee
+- spec/fixtures/js/raw-2.js
+- spec/fixtures/js/raw.coffee
 - spec/fixtures/js/require-error.js
 - spec/fixtures/js/require.coffee
 - spec/fixtures/js/some.coffee
@@ -164,6 +166,8 @@ test_files:
 - spec/fixtures/js/hello.jade
 - spec/fixtures/js/pastry/tart.js
 - spec/fixtures/js/pastry/tartlet.coffee
+- spec/fixtures/js/raw-2.js
+- spec/fixtures/js/raw.coffee
 - spec/fixtures/js/require-error.js
 - spec/fixtures/js/require.coffee
 - spec/fixtures/js/some.coffee