bunch 0.1.0 → 0.2.0

data/.gitignore

@@ -5,3 +5,6 @@ pkg/*
 .sass-cache
 .yardoc
 doc/*
+*.sublime-workspace
+*.sublime-project
+*.DS_Store

data/bunch.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'mime-types'
 
-  s.add_development_dependency 'coffee-script'
-  s.add_development_dependency 'sass'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rdiscount'
   s.add_development_dependency 'shoulda-context'
   s.add_development_dependency 'mocha'
+
+  s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'sass'
+  s.add_development_dependency 'ejs'
 end

data/example/js/test5/test5a.jst.ejs

@@ -0,0 +1 @@
+11

data/lib/bunch.rb

@@ -22,6 +22,7 @@ require 'bunch/file_node'
 require 'bunch/coffee_node'
 require 'bunch/sass_node'
 require 'bunch/null_node'
+require 'bunch/ejs_node'
 
 module Bunch
   class CompileError < StandardError
@@ -47,8 +48,8 @@ class << Bunch
     end
   end
 
-  def content_for(path)
-    tree_for(normalized_path(path), {}).content
+  def content_for(path, options = {})
+    tree_for(normalized_path(path), options).content
   end
 
   def tree_for(path, options)
@@ -61,6 +62,8 @@ class << Bunch
         Bunch::CoffeeNode.new(path)
       when path =~ /\.s(a|c)ss$/
         Bunch::SassNode.new(path)
+      when path =~ /\.ejs$/
+        Bunch::EJSNode.new(path)
       else
         Bunch::FileNode.new(path)
       end

data/lib/bunch/cache.rb

@@ -3,7 +3,7 @@ module Bunch
   end
 
   class << Cache
-    def initialize
+    def init
       @cache = Hash.new { |h, k| h[k] = {} }
     end
 
@@ -36,5 +36,5 @@ module Bunch
     end
   end
 
-  Cache.initialize
+  Cache.init
 end

data/lib/bunch/cli.rb

@@ -22,7 +22,7 @@ module Bunch
 
     def generate_files
       Bunch.load_ignores(@input)
-      tree = Bunch.tree_for(@input.to_s, @opts)
+      tree = Bunch.tree_for(@input.to_s, @opts.merge(:root => @input.to_s))
 
       if @output
         FileUtils.mkdir_p(@output.to_s)

data/lib/bunch/ejs_node.rb

@@ -0,0 +1,50 @@
+module Bunch
+  class EJSNode < FileNode
+    def initialize(fn)
+      EJSNode.require_ejs
+      @filename = fn
+    end
+
+    def content
+      @content ||= fetch(@filename) {
+        <<-JAVASCRIPT
+          (function() {
+            this.JST || (this.JST = {});
+            this.JST['#{template_name}'] = #{EJS.compile(File.read(@filename))};
+          })();
+        JAVASCRIPT
+      }
+    rescue => e
+      raise CompileError.new(e, @filename)
+    end
+
+    def name
+      File.basename(@filename, '.ejs')
+    end
+
+    def template_name
+      name = @filename.sub(/\.jst\.ejs$/, '')
+
+      if @options[:root]
+        name.sub(/^#{Regexp.escape(@options[:root].to_s)}\//, '')
+      else
+        name
+      end
+    end
+
+    def target_extension
+      '.js'
+    end
+  end
+
+  class << EJSNode
+    def require_ejs
+      unless @required
+        require 'ejs'
+        @required = true
+      end
+    rescue LoadError
+      raise "'gem install ejs' to compile .ejs files."
+    end
+  end
+end

data/lib/bunch/rack.rb

@@ -24,7 +24,7 @@ module Bunch
 
     private
       def content_for(path)
-        Bunch.content_for(path)
+        Bunch.content_for(path, :root => @root)
       end
 
       def headers(mime_type)

data/lib/bunch/version.rb

@@ -1,3 +1,3 @@
 module Bunch
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/rack_test.rb

@@ -13,7 +13,7 @@ class RackTest < Test::Unit::TestCase
       end
 
       should 'combine everything' do
-        assert_equal "1 2 3 4 5 6 7 8 9 10", squeeze(@body)
+        assert squeeze(@body).start_with? "1 2 3 4 5 6 7 8 9 10 (f"
       end
 
       should 'have text/plain content type' do
@@ -27,7 +27,7 @@ class RackTest < Test::Unit::TestCase
       end
 
       should 'combine everything in the correct order' do
-        assert_equal "1 2 3 4 5 6 7 8 9 10", squeeze(@body)
+        assert squeeze(@body).start_with? "1 2 3 4 5 6 7 8 9 10 (f"
       end
 
       should 'have application/javascript content type' do
@@ -67,6 +67,16 @@ class RackTest < Test::Unit::TestCase
         end
       end
     end
+
+    context 'when an EJS template is requested' do
+      setup do
+        perform_request('/test5/test5a.js')
+      end
+
+      should 'have the correct template name' do
+        assert_match @body, %r(this\.JST\[.test5/test5a.\])
+      end
+    end
   end
 
   context 'given a tree of scss files' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-script
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ejs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -158,12 +174,14 @@ files:
 - example/js/test4/test4a.js
 - example/js/test4/test4b.coffee
 - example/js/test4/test4c.coffee
+- example/js/test5/test5a.jst.ejs
 - lib/bunch.rb
 - lib/bunch/abstract_node.rb
 - lib/bunch/cache.rb
 - lib/bunch/cli.rb
 - lib/bunch/coffee_node.rb
 - lib/bunch/directory_node.rb
+- lib/bunch/ejs_node.rb
 - lib/bunch/file_node.rb
 - lib/bunch/middleware.rb
 - lib/bunch/null_node.rb