bunch 0.0.7 → 0.0.8

data/bunch.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'mime-types'
-  s.add_runtime_dependency 'slop'
 
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'mocha'
 end

data/lib/bunch.rb

@@ -1,9 +1,9 @@
 require 'fileutils'
+require 'optparse'
 require 'pathname'
 require 'yaml'
 
 require 'mime/types'
-require 'slop'
 
 begin
   require 'v8'

data/lib/bunch/cli.rb

@@ -45,40 +45,54 @@ module Bunch
 
   class << CLI
     def process!
-      opts = Slop.parse! do
-        banner 'Usage: bunch [options] INPUT_PATH [OUTPUT_PATH]'
-
-        on :s, :server, 'Instead of creating files, use WEBrick to serve files from INPUT_PATH'
-        on :i, :individual, 'Create one output file for each file or directory in the input path (default)', :default => true
-        on :a, :all, 'Create an all.[extension] file combining all inputs'
-        on :h, :help, 'Show this message' do
-          puts self
+      CLI.new(*parse_opts)
+    rescue => e
+      if ENV['BUNCH_DEBUG']
+        raise
+      else
+        $stderr.puts "ERROR: #{e.message}"
+        exit 1
+      end
+    end
+
+    def parse_opts
+      options = {:individual => true}
+
+      opts = OptionParser.new do |opts|
+        opts.banner = 'Usage: bunch [options] INPUT_PATH [OUTPUT_PATH]'
+
+        opts.on '-s', '--server', 'Instead of creating files, use WEBrick to serve files from INPUT_PATH.' do
+          options[:server] = true
+        end
+
+        opts.on '-i', '--[no-]individual', 'Create one output file for each file or directory in the input path (default).' do |i|
+          options[:individual] = i
+        end
+
+        opts.on '-a', '--all', 'Create an all.[extension] file combining all inputs.' do
+          options[:all] = true
+        end
+
+        opts.on_tail '-h', '--help', 'Show this message.' do
+          puts opts
           exit
         end
       end
 
+      opts.parse!
+
       if ARGV.count < 1
-        display_help = true
-        raise "Must give an input path."
+        raise "Must give an input path.\n\n#{opts}"
       end
 
-      if ARGV.count < 2 && opts[:individual] && !opts[:server]
-        display_help = true
+      if ARGV.count < 2 && options[:individual] && !options[:server]
         raise "Must give an output path unless --no-individual or --server is provided."
       end
 
       input  = ARGV.shift
       output = ARGV.shift
 
-      CLI.new(input, output, opts)
-    rescue => e
-      if ENV['BUNCH_DEBUG']
-        raise
-      else
-        $stderr.puts "ERROR: #{e.message}"
-        $stderr.puts "\n#{opts}" if display_help
-        exit 1
-      end
+      [input, output, options]
     end
   end
 end

data/lib/bunch/coffee_node.rb

@@ -1,17 +1,15 @@
 module Bunch
   class CoffeeNode < FileNode
     def initialize(fn)
-      unless defined?(@@coffee_required)
-        require 'coffee-script'
-        @@coffee_required = true
-      end
+      CoffeeNode.require_coffee
       @filename = fn
-    rescue LoadError
-      raise "'gem install coffee-script' to compile .coffee files."
     end
 
     def content
-      @content ||= fetch(@filename) { CoffeeScript.compile(File.read(@filename), :bare => false) }
+      @content ||= fetch(@filename) { CoffeeScript.compile(File.read(@filename), :bare => CoffeeNode.bare) }
+    rescue => e
+      e.message = "processing #{@filename}: #{e.message}"
+      raise e
     end
 
     def name
@@ -22,4 +20,21 @@ module Bunch
       '.js'
     end
   end
+
+  class << CoffeeNode
+    attr_writer :bare
+
+    def require_coffee
+      unless @required
+        require 'coffee-script'
+        @required = true
+      end
+    rescue LoadError
+      raise "'gem install coffee-script' to compile .coffee files."
+    end
+
+    def bare
+      defined?(@bare) ? @bare : (@bare = false)
+    end
+  end
 end

data/lib/bunch/middleware.rb

@@ -2,7 +2,7 @@
 
 module Bunch
   class Middleware
-    attr_accessor :app
+    attr_accessor :app, :endpoint
 
     def initialize(app, options={})
       unless options[:root_url] && options[:path]
@@ -16,7 +16,7 @@ module Bunch
 
     def call(env)
       path = env['PATH_INFO'].to_s
-      script_name = env['SCRIPT_NAME']
+      script_name = env['SCRIPT_NAME'].to_s
 
       if path =~ root_regexp &&
           (rest = $1) &&

data/lib/bunch/sass_node.rb

@@ -1,23 +1,15 @@
 module Bunch
   class SassNode < FileNode
     def initialize(fn)
-      unless defined?(@@sass_required)
-        require 'sass'
-        @@sass_required = true
-      end
-
-      unless defined?(@@sass_style)
-        @@sass_style = ENV['SASS_STYLE'] || 'nested'
-        puts @@sass_style.inspect
-      end
-
+      SassNode.require_sass
       @filename = fn
-    rescue LoadError
-      raise "'gem install sass' to compile .sass and .scss files."
     end
 
     def content
-      @content ||= fetch(@filename) { Sass::Engine.for_file(@filename, :style => @@sass_style.to_sym).render }
+      @content ||= fetch(@filename) { Sass::Engine.for_file(@filename, :style => SassNode.style).render }
+    rescue => e
+      e.message = "processing #{@filename}: #{e.message}"
+      raise e
     end
 
     def name
@@ -28,4 +20,21 @@ module Bunch
       '.css'
     end
   end
+
+  class << SassNode
+    attr_writer :style
+
+    def require_sass
+      unless @required
+        require 'sass'
+        @required = true
+      end
+    rescue LoadError
+      raise "'gem install sass' to compile .sass and .scss files."
+    end
+
+    def style
+      @style ||= (env = ENV['SASS_STYLE']) ? env.to_sym : :nested
+    end
+  end
 end

data/lib/bunch/version.rb

@@ -1,3 +1,3 @@
 module Bunch
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/middleware_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class MiddlewareTest < Test::Unit::TestCase
+  context 'the Middleware class' do
+    setup do
+      @app = Bunch::Middleware.new(nil,
+        :root_url => '/javascripts',
+        :path => '/example/js'
+      )
+      @mock = mock
+      @mock.expects(:call).returns([200, {}, ['hello']])
+    end
+
+    should 'ignore requests without the correct url' do
+      @app.app = @mock
+      perform_request('/not_javascripts/hello.html')
+      assert_equal @body, 'hello'
+    end
+
+    should 'pass on requests with the correct url' do
+      @app.endpoint = @mock
+      perform_request('/javascripts/hello.js')
+      assert_equal @body, 'hello'
+    end
+  end
+end

data/test/rack_test.rb

@@ -1,4 +1,83 @@
 require 'test_helper'
 
 class RackTest < Test::Unit::TestCase
+  context 'given a tree of js and coffee files' do
+    setup do
+      @app = Bunch::Rack.new('example/js')
+      Bunch::CoffeeNode.bare = true
+    end
+
+    context 'when / is requested' do
+      setup do
+        perform_request
+      end
+
+      should 'combine everything' do
+        assert_equal "1 2 3 4 5 6 7 8 9 10", squeeze(@body)
+      end
+
+      should 'have text/plain content type' do
+        assert_equal 'text/plain', @headers['Content-Type']
+      end
+    end
+
+    context 'when /all.js is requested' do
+      setup do
+        perform_request('/.js')
+      end
+
+      should 'combine everything in the correct order' do
+        assert_equal "1 2 3 4 5 6 7 8 9 10", squeeze(@body)
+      end
+
+      should 'have application/javascript content type' do
+        assert_equal "application/javascript", @headers['Content-Type']
+      end
+    end
+
+    context 'with a subfolder of js files' do
+      setup do
+        perform_request('/test2.js')
+      end
+
+      should 'combine everything in that folder and nothing else' do
+        assert_equal "2 3 4", squeeze(@body)
+        assert %w(1 5 6 7 8 9 10).all? { |n| !@body.include?(n) }
+      end
+    end
+
+    context 'with a subfolder containing another folder' do
+      context 'when the outer folder is requested' do
+        setup do
+          perform_request('/test3.js')
+        end
+
+        should 'combine the contents of both folders in the correct order' do
+          assert_equal "5 6 7", squeeze(@body)
+        end
+      end
+
+      context 'when the inner folder is requested' do
+        setup do
+          perform_request('/test3/test3b.js')
+        end
+
+        should 'only render the inner folder' do
+          assert_equal "6 7", squeeze(@body)
+        end
+      end
+    end
+  end
+
+  context 'given a tree of scss files' do
+    setup do
+      @app = Bunch::Rack.new('example/css')
+      perform_request('/all.css')
+    end
+
+    should 'work' do
+      assert_equal "body { a: 1 } body { b: 2 } body { c: 3 }", squeeze(@body)
+      assert_equal "text/css", @headers['Content-Type']
+    end
+  end
 end

data/test/test_helper.rb

@@ -2,3 +2,20 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'bunch'
 require 'test/unit'
+require 'mocha'
+require 'shoulda-context'
+
+# collapse whitespace and remove semicolons
+def squeeze(js)
+  js.tr("\n;", ' ').strip.squeeze
+end
+
+# perform a request for the given path and set @status, @headers, and @body.
+def perform_request(path='/')
+  env = {
+    'REQUEST_METHOD' => 'GET',
+    'PATH_INFO' => path
+  }
+  out = @app.call(env)
+  @status, @headers, @body = out[0], out[1], out[2].join
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70318786120460 !ruby/object:Gem::Requirement
+  requirement: &70109863646520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318786120460
+  version_requirements: *70109863646520
 - !ruby/object:Gem::Dependency
-  name: slop
-  requirement: &70318786100960 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &70109863645580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70318786100960
+  version_requirements: *70109863645580
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70318786099000 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: &70109863644420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318786099000
+  version_requirements: *70109863644420
 - !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &70318786097560 !ruby/object:Gem::Requirement
+  name: shoulda-context
+  requirement: &70109863643200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70109863643200
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70109863642720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318786097560
+  version_requirements: *70109863642720
 description: Directory-structure-based asset bundling.
 email:
 - rfitz@academia.edu
@@ -99,6 +110,7 @@ files:
 - lib/bunch/rack.rb
 - lib/bunch/sass_node.rb
 - lib/bunch/version.rb
+- test/middleware_test.rb
 - test/rack_test.rb
 - test/test_helper.rb
 homepage: ''
@@ -121,11 +133,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bunch
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Directory-structure-based asset bundling.
 test_files:
+- test/middleware_test.rb
 - test/rack_test.rb
 - test/test_helper.rb
 has_rdoc: