bunch 0.0.4 → 0.0.5

data/lib/bunch.rb

@@ -12,30 +12,49 @@ rescue LoadError
 end
 
 require 'bunch/version'
+require 'bunch/rack'
+require 'bunch/caching'
 require 'bunch/directory_node'
 require 'bunch/file_node'
 require 'bunch/coffee_node'
 require 'bunch/sass_node'
-require 'bunch/rack'
 
 module Bunch
 end
 
 class << Bunch
-  def Tree(fn)
+  def content_for(path)
+    tree_for(normalized_path(path)).content
+  end
+
+  def tree_for(path)
     case
-    when !File.exist?(fn)
-      raise Errno::ENOENT, fn
-    when File.directory?(fn)
-      Bunch::DirectoryNode.new(fn)
-    when fn =~ /\.coffee$/
-      Bunch::CoffeeNode.new(fn)
-    when fn =~ /\.s(a|c)ss$/
-      Bunch::SassNode.new(fn)
+    when File.directory?(path)
+      Bunch::DirectoryNode.new(path)
+    when path =~ /\.coffee$/
+      Bunch::CoffeeNode.new(path)
+    when path =~ /\.s(a|c)ss$/
+      Bunch::SassNode.new(path)
     else
-      Bunch::FileNode.new(fn)
+      Bunch::FileNode.new(path)
     end
   end
+
+  private
+    def normalized_path(path)
+      case
+      when File.exist?(path)
+        path
+      when File.exist?(chopped_path = path.sub(%r(\.[^.]*$), ''))
+        chopped_path
+      when File.basename(path).start_with?('all.') && File.exist?(dir_path = File.dirname(path))
+        dir_path
+      when (path_w_different_extension = Dir["#{chopped_path}.*"].first)
+        path_w_different_extension
+      else
+        raise Errno::ENOENT, path.to_s
+      end
+    end
 end
 
 #class Module

data/lib/bunch/caching.rb

@@ -0,0 +1,42 @@
+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

data/lib/bunch/cli.rb

@@ -25,7 +25,7 @@ module Bunch
     end
 
     def generate_files
-      tree = Bunch::Tree(@input.to_s)
+      tree = Bunch.tree_for(@input.to_s)
 
       if @output
         FileUtils.mkdir_p(@output.to_s)
@@ -33,22 +33,22 @@ module Bunch
 
       if @opts[:all]
         if @output
-          write("all.#{tree.target_extension}", tree.contents)
+          write("all.#{tree.target_extension}", tree.content)
         else
-          puts tree.contents
+          puts tree.content
         end
       end
 
       if @opts[:individual]
         tree.children.each do |child|
-          write("#{child.name}.#{child.target_extension}", child.contents)
+          write("#{child.name}.#{child.target_extension}", child.content)
         end
       end
     end
 
     private
-      def write(fn, contents)
-        File.open(@output.join(fn), 'w') { |f| f.write(contents) }
+      def write(fn, content)
+        File.open(@output.join(fn), 'w') { |f| f.write(content) }
       end
   end
 

data/lib/bunch/coffee_node.rb

@@ -1,5 +1,7 @@
 module Bunch
   class CoffeeNode
+    include Caching
+
     def initialize(fn)
       unless defined?(@@coffee_required)
         require 'coffee-script'
@@ -10,8 +12,8 @@ module Bunch
       raise "'gem install coffee-script' to compile .coffee files."
     end
 
-    def contents
-      @contents ||= CoffeeScript.compile(File.read(@filename), :bare => false)
+    def content
+      @content ||= fetch(@filename) { CoffeeScript.compile(File.read(@filename), :bare => false) }
     end
 
     def name

data/lib/bunch/directory_node.rb

@@ -12,7 +12,7 @@ module Bunch
 
     def children
       @children ||= begin
-        children = filenames.map &Bunch.method(:Tree)
+        children = filenames.map &Bunch.method(:tree_for)
         ordering_file = @root.join('_.yml')
 
         if File.exist?(ordering_file)
@@ -36,8 +36,8 @@ module Bunch
       end
     end
 
-    def contents
-      @contents ||= children.map(&:contents).join
+    def content
+      @content ||= children.map(&:content).join
     end
 
     def name

data/lib/bunch/file_node.rb

@@ -13,7 +13,7 @@ module Bunch
       end
     end
 
-    def contents
+    def content
       File.read(@filename)
     end
 

data/lib/bunch/rack.rb

@@ -15,7 +15,7 @@ module Bunch
       path = @root.join(env['PATH_INFO'].sub(/^\//, '')).to_s
       type = MIME::Types.type_for(path).first || 'text/plain'
 
-      [200, headers(type), [generate(path)]]
+      [200, headers(type), [content_for(path)]]
     rescue => e
       [500, headers('text/plain'), [error_log(e)]]
     end
@@ -25,23 +25,13 @@ module Bunch
         @headers.merge('Content-Type' => mime_type.to_s)
       end
 
-      def generate(path)
-        case
-        when File.exist?(path)
-          contents(path)
-        when File.exist?(chopped_path = path.sub(%r(\.[^.]*$), ''))
-          contents(chopped_path)
-        when File.basename(path).start_with?('all.')
-          contents(File.dirname(path))
-        when (path_w_different_extension = Dir["#{chopped_path}.*"].first)
-          contents(path_w_different_extension)
-        else
-          raise Errno::ENOENT, path.to_s
-        end
+    private
+      def content_for(path)
+        Bunch.content_for(path)
       end
 
-      def contents(path)
-        Bunch::Tree(path.to_s).contents
+      def headers(mime_type)
+        @headers.merge('Content-Type' => mime_type.to_s)
       end
 
       def error_log(e)

data/lib/bunch/sass_node.rb

@@ -1,5 +1,7 @@
 module Bunch
   class SassNode
+    include Caching
+
     def initialize(fn)
       unless defined?(@@sass_required)
         require 'sass'
@@ -10,8 +12,8 @@ module Bunch
       raise "'gem install sass' to compile .sass and .scss files."
     end
 
-    def contents
-      @contents ||= Sass::Engine.for_file(@filename, {}).render
+    def content
+      @content ||= fetch(@filename) { Sass::Engine.for_file(@filename, {}).render }
     end
 
     def name

data/lib/bunch/version.rb

@@ -1,3 +1,3 @@
 module Bunch
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70349040409660 !ruby/object:Gem::Requirement
+  requirement: &70263668761740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349040409660
+  version_requirements: *70263668761740
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70349040409240 !ruby/object:Gem::Requirement
+  requirement: &70263668761320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70349040409240
+  version_requirements: *70263668761320
 description: Directory-structure-based asset bundling.
 email:
 - rfitz@academia.edu
@@ -65,6 +65,7 @@ files:
 - example/js/test4/test4b.coffee
 - example/js/test4/test4c.coffee
 - lib/bunch.rb
+- lib/bunch/caching.rb
 - lib/bunch/cli.rb
 - lib/bunch/coffee_node.rb
 - lib/bunch/directory_node.rb