bunch 0.0.6 → 0.0.7

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 .sass-cache
+.yardoc
+doc/*

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown --private

data/README.md

@@ -0,0 +1,4 @@
+Bunch: (Almost) configuration-free asset bundling.
+==================================================
+
+<img src="http://i.imgur.com/QqufL.png">

data/Rakefile

@@ -1 +1,18 @@
 require "bundler/gem_tasks"
+
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError
+end
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task :default => :test

data/bunch.gemspec

@@ -1,23 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "bunch/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'bunch/version'
 
 Gem::Specification.new do |s|
-  s.name        = "bunch"
+  s.name        = 'bunch'
   s.version     = Bunch::VERSION
-  s.authors     = ["Ryan Fitzgerald"]
-  s.email       = ["rfitz@academia.edu"]
-  s.homepage    = ""
+  s.authors     = ['Ryan Fitzgerald']
+  s.email       = ['rfitz@academia.edu']
+  s.homepage    = ''
   s.summary     = %q{Directory-structure-based asset bundling.}
   s.description = %q{Directory-structure-based asset bundling.}
 
-  s.rubyforge_project = "bunch"
+  s.rubyforge_project = 'bunch'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
-  s.add_runtime_dependency "mime-types"
-  s.add_runtime_dependency "slop"
+  s.add_runtime_dependency 'mime-types'
+  s.add_runtime_dependency 'slop'
+
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'rdiscount'
 end

data/lib/bunch.rb

@@ -14,7 +14,9 @@ end
 require 'bunch/version'
 require 'bunch/rack'
 require 'bunch/middleware'
-require 'bunch/caching'
+require 'bunch/cache'
+
+require 'bunch/abstract_node'
 require 'bunch/directory_node'
 require 'bunch/file_node'
 require 'bunch/coffee_node'
@@ -41,7 +43,7 @@ class << Bunch
     end
   end
 
-  private
+  protected
     def normalized_path(path)
       case
       when File.exist?(path)
@@ -57,14 +59,3 @@ class << Bunch
       end
     end
 end
-
-#class Module
-#  def benchmark(meth)
-#    alias_method "#{meth}_old", meth
-#    define_method meth do |*args, &blk|
-#      t = Time.now
-#      send "#{meth}_old", *args, &blk
-#      STDERR.puts "Called #{meth} in #{Time.now - t}."
-#    end
-#  end
-#end

data/lib/bunch/abstract_node.rb

@@ -0,0 +1,23 @@
+module Bunch
+  class AbstractNode
+    def content
+      raise NotImplementedError
+    end
+    alias name content
+    alias target_extension content
+
+    def write_to_dir(dir)
+      write_to_file(File.join(dir, name))
+    end
+
+    def write_to_file(fn)
+      out_file = "#{fn}#{target_extension}"
+      File.open(out_file, 'w') { |f| f.write(content) }
+    end
+
+    protected
+      def fetch(fn, &blk)
+        Cache.fetch(fn, &blk)
+      end
+  end
+end

data/lib/bunch/cache.rb

@@ -0,0 +1,40 @@
+module Bunch
+  module Cache
+  end
+
+  class << Cache
+    def initialize
+      @cache = Hash.new { |h, k| h[k] = {} }
+    end
+
+    def stored?(fn)
+      @cache.keys.include?(fn)
+    end
+
+    def read(fn)
+      @cache[fn][:content]
+    end
+
+    def mtime(fn)
+      @cache[fn][:mtime]
+    end
+
+    def write(fn, mtime, content)
+      @cache[fn] = {:mtime => mtime, :content => content}
+    end
+
+    def fetch(fn, &blk)
+      current_mtime = File.mtime(fn)
+
+      if stored?(fn) && mtime(fn) == current_mtime
+        read(fn)
+      else
+        content = blk.call
+        write(fn, current_mtime, content)
+        content
+      end
+    end
+  end
+
+  Cache.initialize
+end

data/lib/bunch/cli.rb

@@ -5,10 +5,6 @@ module Bunch
       @output = output ? Pathname.new(output) : nil
       @opts   = opts
 
-      if @opts[:profile]
-        require 'profile'
-      end
-
       if @opts[:server]
         run_server
       else
@@ -33,7 +29,7 @@ module Bunch
 
       if @opts[:all]
         if @output
-          write("all.#{tree.target_extension}", tree.content)
+          tree.write_to_file(@output.join('all'))
         else
           puts tree.content
         end
@@ -41,15 +37,10 @@ module Bunch
 
       if @opts[:individual]
         tree.children.each do |child|
-          write("#{child.name}.#{child.target_extension}", child.content)
+          child.write_to_dir(@output)
         end
       end
     end
-
-    private
-      def write(fn, content)
-        File.open(@output.join(fn), 'w') { |f| f.write(content) }
-      end
   end
 
   class << CLI
@@ -60,7 +51,6 @@ module Bunch
         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 :p, :profile
         on :h, :help, 'Show this message' do
           puts self
           exit

data/lib/bunch/coffee_node.rb

@@ -1,7 +1,5 @@
 module Bunch
-  class CoffeeNode
-    include Caching
-
+  class CoffeeNode < FileNode
     def initialize(fn)
       unless defined?(@@coffee_required)
         require 'coffee-script'
@@ -21,11 +19,7 @@ module Bunch
     end
 
     def target_extension
-      'js'
-    end
-
-    def inspect
-      @filename.inspect
+      '.js'
     end
   end
 end

data/lib/bunch/directory_node.rb

@@ -1,5 +1,5 @@
 module Bunch
-  class DirectoryNode
+  class DirectoryNode < AbstractNode
     attr_reader :root
 
     def initialize(fn)
@@ -30,8 +30,10 @@ module Bunch
         exts = children.map(&:target_extension).compact.uniq
         if exts.count == 1
           exts.first
+        elsif exts.count > 1
+          raise "Directory #{name} contains non-homogeneous nodes: #{exts.inspect}"
         else
-          raise "Directory contains non-homogeneous nodes: #{exts.inspect}"
+          nil
         end
       end
     end
@@ -44,6 +46,11 @@ module Bunch
       File.basename(@root)
     end
 
+    def write_to_file(dir)
+      return if filenames.count == 0
+      super
+    end
+
     def inspect
       "#<DirectoryNode @root=#{@root.inspect} @children=#{children.inspect}>"
     end

data/lib/bunch/file_node.rb

@@ -1,15 +1,16 @@
 module Bunch
-  class FileNode
-    attr_reader :name, :target_extension
+  class FileNode < AbstractNode
+    attr_accessor :name, :target_extension
 
     def initialize(fn)
       @filename = fn
 
-      if fn =~ %r(\.([^.]*)$)
+      if fn =~ /\.[^.]*$/
         @name = File.basename($`)
-        @target_extension = $1
+        @target_extension = $&
       else
         @name = File.basename(@filename)
+        @target_extension = nil
       end
     end
 

data/lib/bunch/middleware.rb

@@ -33,9 +33,47 @@ module Bunch
       end
     end
 
-    private
+    protected
       def root_regexp
          Regexp.new("^#{Regexp.quote(@root_url).gsub('/', '/+')}(.*)")
       end
   end
+
+  class << Middleware
+    # Binds an instance of `Bunch::Middleware` in front of any instance
+    # of the given middleware class. Whenever `klass` is instantiated,
+    # any calls to `klass#call` will first pass through the single
+    # instance of `Middleware` created by this method.
+    #
+    # You can compose any number of `Middleware` instances in front
+    # of the same class.
+    #
+    # In practice, the purpose of this is to allow Bunch to take
+    # precedence over `Rails::Rack::Static` in a Rails 2 context.
+    # Since the server's instance of `Rails::Rack::Static` isn't part of
+    # the `ActionController` stack, it isn't possible to use
+    # Rails' normal middleware tools to insert Bunch in front of it,
+    # which means any files in `public` would be served preferentially.
+    #
+    # @param [Class] klass Any Rack middleware class.
+    # @param [Hash] options The options that would normally be passed to
+    #   `Bunch::Middleware#initialize`.
+    #
+    # @example
+    #   if Rails.env.development?
+    #     Bunch::Middleware.insert_before Rails::Rack::Static,
+    #       root_url: '/javascripts', path: 'app/scripts', no_cache: true
+    #   end
+    def insert_before(klass, options={})
+      instance = new(nil, options)
+
+      klass.class_eval do
+        unbound_call = instance_method(:call)
+        define_method(:call) do |env|
+          instance.app = unbound_call.bind(self)
+          instance.call(env)
+        end
+      end
+    end
+  end
 end

data/lib/bunch/rack.rb

@@ -20,11 +20,6 @@ module Bunch
       [500, headers('text/plain'), [error_log(e)]]
     end
 
-    private
-      def headers(mime_type)
-        @headers.merge('Content-Type' => mime_type.to_s)
-      end
-
     private
       def content_for(path)
         Bunch.content_for(path)

data/lib/bunch/sass_node.rb

@@ -1,19 +1,23 @@
 module Bunch
-  class SassNode
-    include Caching
-
+  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
+
       @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, {}).render }
+      @content ||= fetch(@filename) { Sass::Engine.for_file(@filename, :style => @@sass_style.to_sym).render }
     end
 
     def name
@@ -21,11 +25,7 @@ module Bunch
     end
 
     def target_extension
-      'css'
-    end
-
-    def inspect
-      @filename.inspect
+      '.css'
     end
   end
 end

data/lib/bunch/version.rb

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

data/test/rack_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class RackTest < Test::Unit::TestCase
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'bunch'
+require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70177706384580 !ruby/object:Gem::Requirement
+  requirement: &70318786120460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177706384580
+  version_requirements: *70318786120460
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70177706384160 !ruby/object:Gem::Requirement
+  requirement: &70318786100960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177706384160
+  version_requirements: *70318786100960
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70318786099000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70318786099000
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &70318786097560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70318786097560
 description: Directory-structure-based asset bundling.
 email:
 - rfitz@academia.edu
@@ -42,7 +64,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - Gemfile
+- README.md
 - Rakefile
 - bin/bunch
 - bunch.gemspec
@@ -65,7 +89,8 @@ files:
 - example/js/test4/test4b.coffee
 - example/js/test4/test4c.coffee
 - lib/bunch.rb
-- lib/bunch/caching.rb
+- lib/bunch/abstract_node.rb
+- lib/bunch/cache.rb
 - lib/bunch/cli.rb
 - lib/bunch/coffee_node.rb
 - lib/bunch/directory_node.rb
@@ -74,6 +99,8 @@ files:
 - lib/bunch/rack.rb
 - lib/bunch/sass_node.rb
 - lib/bunch/version.rb
+- test/rack_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -98,5 +125,7 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Directory-structure-based asset bundling.
-test_files: []
+test_files:
+- test/rack_test.rb
+- test/test_helper.rb
 has_rdoc: 

data/lib/bunch/caching.rb

@@ -1,42 +0,0 @@
-module Bunch
-  module Caching
-    class << self
-      def initialize_cache
-        @cache = Hash.new { |h, k| h[k] = {} }
-      end
-
-      def stored?(fn)
-        @cache.keys.include?(fn)
-      end
-
-      def read(fn)
-        @cache[fn][:content]
-      end
-
-      def mtime(fn)
-        @cache[fn][:mtime]
-      end
-
-      def write(fn, mtime, content)
-        @cache[fn] = {:mtime => mtime, :content => content}
-      end
-
-      def fetch(fn, &blk)
-        current_mtime = File.mtime(fn)
-
-        if stored?(fn) && mtime(fn) == current_mtime
-          read(fn)
-        else
-          content = blk.call
-          write(fn, current_mtime, content)
-          content
-        end
-      end
-    end
-    initialize_cache
-
-    def fetch(filename, &blk)
-      Bunch::Caching.fetch(filename, &blk)
-    end
-  end
-end