tipsy 0.0.4 → 0.0.5

data/lib/tipsy/runners/compiler.rb

@@ -1,4 +1,5 @@
 require 'find'
+require 'tipsy/view'
 
 module Tipsy
   module Runners
@@ -8,12 +9,11 @@ module Tipsy
       attr_reader :source_path, :dest_path, :scope
       
       def initialize
-        @source_path = config.public_path
-        @dest_path   = config.compile_to
+        @source_path = normalize_path(config.public_path)
+        @dest_path   = normalize_path(config.compile_to)
         excluded     = [excludes, config.compile.preserve].flatten.uniq
         @_excludes   = excluded
         clean_existing!
-        
         [:public, :images, :assets, :templates].each do |m|
           send(:"compile_#{m}!")
         end
@@ -26,14 +26,22 @@ module Tipsy
         Tipsy::Site.config
       end
       
+      def skip_path?(src)
+        return false unless scope == :clean || scope == :public
+      end
+
       def skip_file?(src)
         return false unless scope == :clean || scope == :public
-        check = case scope
-        when :clean  then config.compile.preserve
-        when :public then config.compile.skip
-        else []
+        if scope == :public
+          checks   = config.compile.skip
+          relative = ::Pathname.new(src).relative_path_from(::Pathname.new(source_path))
+          reldir   = relative.dirname.to_s
+          return checks.detect{ |path| path == src || path == relative.to_s || reldir.to_s == path }
+        end
+        config.compile.preserve.detect do |path| 
+          relative = src.to_s.gsub(Tipsy::Site.public_path, '').sub(/^\//, '')
+          File.basename(src) == path || relative == path
         end
-        check.detect{ |path| File.basename(src) == path }
       end
       
       alias :skip_path? :skip_file?
@@ -43,33 +51,23 @@ module Tipsy
       def clean_existing!
         @scope = :clean
         return true unless ::File.directory?(dest_path)
-        ::Find.find(dest_path) do |path|
-          next if path == config.compile_to
-          if ::File.directory?(path)
-            if skip_path?(path)
-              ::Find.prune
-            elsif empty_dir?(path)
-              rm_rf(path)
-              ::Find.prune
-            else
-              next
-            end
-          elsif ::File.exists?(path)
-            unlink(path) unless skip_file?(path)
-          end
+        tree = Tipsy::Utils::Tree.new(dest_path, source_path)
+        tree.collect!
+        tree.files.each do |file|
+          unlink(file)
         end
-
-        Dir["#{dest_path}/**/**"].select{ |path| File.directory?(path) }.each do |dir|
-          next if config.compile_to == dir
+        
+        tree.folders.map(&:to_s).sort{ |d1,d2| d2.size<=>d1.size }.each do |dir|
           rm_rf(dir) if empty_dir?(dir)
         end
-        
       end
       
       def compile_public!
         @scope = :public
         log_action("copy", "public files")
-        copy_tree(source_path, dest_path)
+        tree = Tipsy::Utils::Tree.new(source_path, dest_path)
+        tree.excludes |= config.compile.skip
+        tree.copy!
       end
       
       def compile_images!
@@ -89,7 +87,7 @@ module Tipsy
         config.compile.assets.each do |file|
           handler.each_logical_path do |path|
             should_compile = path.is_a?(Regexp) ? file.match(path) : File.fnmatch(file.to_s, path)
-            next unless should_compile?
+            next unless should_compile
 
             if asset = handler.find_asset(path)
               log_action("compile", asset.logical_path)            
@@ -106,6 +104,7 @@ module Tipsy
           dir == '.' || dir == ".." || dir[0] == "." || !::File.directory?(dir)
         end
         dirs = dirs.reject do |dir|
+          
           # Skip folders that only have partials or all files/dirs excluded
           ::Dir.entries(dir).reject{ |f| f.to_s[0] == "_" || excluded?(f) }.empty?
         end.push(File.join(Tipsy.root, "views"))
@@ -121,21 +120,23 @@ module Tipsy
             route    = "/#{route.to_s}" unless route.absolute?
             route    = File.join(route.to_s, tpl.split(".").first) unless tpl.to_s.match(/^index/i)
             request  = MockRequest.new(route.to_s)
-            view     = Tipsy::View::Base.new(request, MockResponse.new)            
+            view     = ::Tipsy::View::Base.new(request, MockResponse.new)            
 
             compiled = view.render
             next if view.template.nil?
             proper_name = proper_template_name(view.template)
+            tpl_path    = ::Pathname.new(view.template)
+            relation    = tpl_path.dirname.relative_path_from(::Pathname.new(view_path))
             
             if ::File.directory?(File.join(view_path, request.path))
-              write_to = ::File.join(request.path, proper_name)
+              write_to = ::File.join(request.path, proper_name)                            
             else
               write_to = "#{request.path}#{::File.extname(proper_template_name(view.template))}"
             end
             
+            mkdir_p(::File.join(dest_path, relation.to_s)) unless relation.to_s == "." || relation.to_s == ".."
             log_action("render", request.path)
-            mkdir_p ::File.join(config.compile_to, write_to)
-            make_file(::File.join(config.compile_to, write_to), compiled)
+            make_file(::File.join(config.compile_to, write_to), compiled.body)
           end
         end
       end

data/lib/tipsy/utils/system.rb

@@ -26,7 +26,7 @@ module Tipsy
       # 
       def copy_file(source, destination)
         return true if skip_file?(source)
-        log_action("create", destination)
+        log_action("copy", destination)
         ::FileUtils.cp(source, destination)
       end
 
@@ -35,8 +35,8 @@ module Tipsy
       #
       def copy_folder(dirname)
         return true if skip_path?(dirname)
-        log_action("create", dirname)
-        ::FileUtils.mkdir(dirname)
+        log_action("copy", dirname)
+        ::FileUtils.mkdir_p(dirname)
       end
 
       ##
@@ -49,7 +49,8 @@ module Tipsy
       end
       
       def make_file(path, content)
-        ::File.new(path, 'w').puts(content)
+        ::FileUtils.touch(path) unless ::File.exists?(path)
+        ::File.open(path, 'w').puts(content)
       end
       
       def rm_rf(path)
@@ -107,7 +108,13 @@ module Tipsy
       end
       
       def log_action(name, action)
-        ::Tipsy.logger.action(name, action)
+        ::Tipsy.logger.action(name, action.to_s.gsub(Tipsy.root, ""))
+      end
+      
+      def normalize_path(pname)
+        pname = ::Pathname.new(pname) if pname.is_a?(String)
+        return pname if pname.absolute?
+        ::Pathname.new(::File.join(Tipsy.root, pname.to_s))
       end
       
     end

data/lib/tipsy/utils/system_test.rb

@@ -91,11 +91,11 @@ module Tipsy
       private
       
       def set_created(path)
-        (@creations ||= []) << path
+        (@creations ||= []) << path.to_s
       end
       
       def set_deleted(path)
-        (@deletions ||= []) << path
+        (@deletions ||= []) << path.to_s
       end
       
     end

data/lib/tipsy/utils/tree.rb

@@ -0,0 +1,67 @@
+require 'find'
+require 'pathname'
+
+module Tipsy
+  module Utils
+    ##
+    # Class for processing file trees. Copies a source tree to a destination tree
+    # excluding specific files and directories.
+    # 
+    class Tree
+      include Tipsy::Utils::System
+      
+      attr_reader :source_path, :dest_path, :folders, :files
+      attr_accessor :excludes
+      
+      def initialize(src, dest, excl = nil)
+        @source_path = normalize_path(::Pathname.new(src))
+        @dest_path   = normalize_path(::Pathname.new(dest))
+        @excludes = (excl || ['.svn', '.git', '.gitignore', '.sass-cache', 'config.erb', '.rb', '.DS_Store'])
+      end
+      
+      def collect!
+        @folders, @files = [], []
+        ::Find.find(source_path.to_s).each do |path|
+          next if path == source_path.to_s
+          if excluded?(path) || excluded_path?(path)
+            ::Find.prune if ::File.directory?(path)
+            next
+          end
+          if ::File.directory?(path)
+            @folders << normalize_path(::Pathname.new(path))
+          else
+            @files << normalize_path(::Pathname.new(path))
+          end
+        end
+      end
+      
+      def copy!
+        collect! if folders.nil? || files.nil?
+        folders.each do |folder|
+          mkdir_p(folder.to_s.gsub(source_path.to_s, dest_path.to_s))
+        end
+        files.each do |file|
+          copy_file(file.to_s, file.to_s.gsub(source_path.to_s, dest_path.to_s))
+        end
+      end
+
+      def excluded_path?(src)
+        path = ::Pathname.new(src)
+        rel  = path.relative_path_from(source_path).to_s
+        excludes.detect{ |route| route == src || route == rel.to_s }
+      end
+
+      def excluded?(file, against = nil)
+        against ||= excludes
+        return true if file.to_s == '.' || file.to_s == '..' || against.include?(file)
+        check = ::Pathname.new(file)
+        return true if against.include?(check.basename.to_s)
+        !against.detect do |exc| 
+          (check.basename == exc || check.extname == exc)
+        end.nil?
+      end
+      
+    end
+  end
+end
+    

data/lib/tipsy/version.rb

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

data/lib/tipsy.rb

@@ -21,6 +21,7 @@ module Tipsy
     autoload :System,     'tipsy/utils/system'
     autoload :SystemTest, 'tipsy/utils/system_test'
     autoload :Logger,     'tipsy/utils/logger'
+    autoload :Tree,       'tipsy/utils/tree'
   end
   
   module Compressors

data/test/root/config.rb

@@ -0,0 +1 @@
+compile.preserve

data/test/runner/compiler_test.rb

@@ -5,16 +5,17 @@ class CompilerTest < ActiveSupport::TestCase
   
   def setup
     Tipsy::Runners::Compiler.send(:include, Tipsy::Utils::SystemTest)
+    Tipsy::Utils::Tree.send(:include, Tipsy::Utils::SystemTest)
     @compiler = Tipsy::Runners::Compiler.new
     Tipsy::Site.configure!
   end
   
   test "Ensure source path is set" do
-    compiler.source_path.should == Tipsy::Site.config.public_path    
+    compiler.source_path.should == Pathname.new(Tipsy::Site.config.public_path)    
   end
   
   test "Ensure destination path is set" do
-    compiler.dest_path.should == Tipsy::Site.config.compile_to
+    compiler.dest_path.should == Pathname.new(Tipsy::Site.config.compile_to)
   end
   
   test "An option exists to skip specific files and folders on compile" do
@@ -25,19 +26,7 @@ class CompilerTest < ActiveSupport::TestCase
   test "Ensure skipped directory is not removed" do
     compiler.was_deleted?(File.join(Tipsy::Site.compile_to, ".svn")).should == false
   end
-  
-  test "Ensure un-skipped files are removed" do
-    compiler.was_deleted?(File.join(Tipsy::Site.compile_to, "sub-path-with-skip", "fake.txt")).should == true
-  end
-  
-  test "Ensure un-skipped files in folders are removed" do
-    compiler.was_deleted?(File.join(Tipsy::Site.compile_to, "sub-path", "fake.txt")).should == true
-  end
-  
-  test "Ensure un-skipped directories are removed" do
-    compiler.was_deleted?(File.join(Tipsy::Site.compile_to, "sub-path")).should == true
-  end
-  
+   
   test "Ensure templates are created" do
     compiler.was_created?(File.join(Tipsy::Site.compile_to, "sub", "page.html")).should == true
   end

data/test/unit/utils/tree_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class TreeTest < ActiveSupport::TestCase
+  attr_reader :tree
+  
+  def setup
+    @tree = Tipsy::Utils::Tree.new(File.join(Tipsy.root, 'public'), File.join(Tipsy.root, 'compiled'))
+    @tree.excludes << 'skipped.txt'
+    @tree.excludes << "normal/sub/skipped"
+    @tree.collect!
+  end
+
+  test "Folders are excluded by name" do
+    tree.folders.map(&:to_s).include?(File.join(tree.source_path, 'sub','skipped')).should == false
+  end
+  
+  test "Folders above excluded folders are preserved" do
+    tree.folders.map(&:to_s).include?(File.join(tree.source_path, 'normal', 'sub')).should == true
+  end
+  
+  test "Files are excluded by name" do
+    tree.files.map(&:to_s).include?(File.join(tree.source_path, 'normal', 'skipped.txt')).should == false
+  end
+  
+  test "Folders of excluded files are preserved" do
+    tree.folders.map(&:to_s).include?(File.join(tree.source_path, 'normal')).should == true
+  end
+
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipsy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70264932961280 !ruby/object:Gem::Requirement
+  requirement: &70117518099000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932961280
+  version_requirements: *70117518099000
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70264932960720 !ruby/object:Gem::Requirement
+  requirement: &70117518098060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932960720
+  version_requirements: *70117518098060
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70264932949400 !ruby/object:Gem::Requirement
+  requirement: &70117518097160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932949400
+  version_requirements: *70117518097160
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70264932948880 !ruby/object:Gem::Requirement
+  requirement: &70117518095800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932948880
+  version_requirements: *70117518095800
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70264932948300 !ruby/object:Gem::Requirement
+  requirement: &70117518094340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932948300
+  version_requirements: *70117518094340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70264932947720 !ruby/object:Gem::Requirement
+  requirement: &70117518093420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932947720
+  version_requirements: *70117518093420
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70264932947120 !ruby/object:Gem::Requirement
+  requirement: &70117518092460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932947120
+  version_requirements: *70117518092460
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &70264932946540 !ruby/object:Gem::Requirement
+  requirement: &70117518091560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932946540
+  version_requirements: *70117518091560
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70264932945980 !ruby/object:Gem::Requirement
+  requirement: &70117518090840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70264932945980
+  version_requirements: *70117518090840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70264932945420 !ruby/object:Gem::Requirement
+  requirement: &70117518089860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70264932945420
+  version_requirements: *70117518089860
 description: Tipsy is a mini Rack application for working with static websites using
   Tilt, and Sprockets.
 email:
@@ -171,6 +171,7 @@ files:
 - lib/tipsy/utils/logger.rb
 - lib/tipsy/utils/system.rb
 - lib/tipsy/utils/system_test.rb
+- lib/tipsy/utils/tree.rb
 - lib/tipsy/version.rb
 - lib/tipsy/view.rb
 - lib/tipsy/view/base.rb
@@ -178,10 +179,10 @@ files:
 - lib/tipsy/view/path.rb
 - test/fixtures/capture.html.erb
 - test/helpers/tag_test.rb
-- test/root/compiled/fake.txt
-- test/root/compiled/sub-path-with-skip/fake.txt
-- test/root/compiled/sub-path/fake.txt
+- test/root/config.rb
 - test/root/layouts/default.html.erb
+- test/root/public/normal/skipped.txt
+- test/root/public/skipped/file.txt
 - test/root/views/index.html.erb
 - test/root/views/page.html.erb
 - test/root/views/sub/page.html.erb
@@ -191,6 +192,7 @@ files:
 - test/unit/site_test.rb
 - test/unit/tipsy_test.rb
 - test/unit/utils/system_test.rb
+- test/unit/utils/tree_test.rb
 - test/view/base_test.rb
 - test/view/path_test.rb
 - tipsy.gemspec
@@ -221,10 +223,10 @@ summary: A mini Rack application server for developing static sites.
 test_files:
 - test/fixtures/capture.html.erb
 - test/helpers/tag_test.rb
-- test/root/compiled/fake.txt
-- test/root/compiled/sub-path-with-skip/fake.txt
-- test/root/compiled/sub-path/fake.txt
+- test/root/config.rb
 - test/root/layouts/default.html.erb
+- test/root/public/normal/skipped.txt
+- test/root/public/skipped/file.txt
 - test/root/views/index.html.erb
 - test/root/views/page.html.erb
 - test/root/views/sub/page.html.erb
@@ -234,5 +236,6 @@ test_files:
 - test/unit/site_test.rb
 - test/unit/tipsy_test.rb
 - test/unit/utils/system_test.rb
+- test/unit/utils/tree_test.rb
 - test/view/base_test.rb
 - test/view/path_test.rb