tipsy 0.0.2 → 0.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipsy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-08 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70124632101280 !ruby/object:Gem::Requirement
+  requirement: &70121952819080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632101280
+  version_requirements: *70121952819080
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70124632100660 !ruby/object:Gem::Requirement
+  requirement: &70121952807700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632100660
+  version_requirements: *70121952807700
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70124632100080 !ruby/object:Gem::Requirement
+  requirement: &70121952807120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632100080
+  version_requirements: *70121952807120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70124632099500 !ruby/object:Gem::Requirement
+  requirement: &70121952806540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632099500
+  version_requirements: *70121952806540
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70124632098860 !ruby/object:Gem::Requirement
+  requirement: &70121952806020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,40 +65,62 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632098860
+  version_requirements: *70121952806020
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70121952805500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70121952805500
 - !ruby/object:Gem::Dependency
-  name: compass
-  requirement: &70124632098360 !ruby/object:Gem::Requirement
+  name: sprockets
+  requirement: &70121952804900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '11.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632098360
+  version_requirements: *70121952804900
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70124632097860 !ruby/object:Gem::Requirement
+  name: hike
+  requirement: &70121952804320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632097860
+  version_requirements: *70121952804320
 - !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: &70124632091080 !ruby/object:Gem::Requirement
+  name: erubis
+  requirement: &70121952803760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.12
+        version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70124632091080
+  version_requirements: *70121952803760
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70121952803200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: *70121952803200
 description: Tipsy is a mini Rack application for working with static websites using
   Tilt, and Sprockets.
 email:
@@ -113,53 +135,64 @@ files:
 - README.md
 - Rakefile
 - bin/tipsy
+- lib/templates/server/htaccess.erb
+- lib/templates/site/Gemfile
+- lib/templates/site/assets/stylesheets/_config.css.scss
+- lib/templates/site/assets/stylesheets/screen.css.scss
+- lib/templates/site/config.rb
+- lib/templates/site/deploy.yml
+- lib/templates/site/layouts/default.html.erb
+- lib/templates/site/views/index.html.erb
 - lib/tipsy.rb
-- lib/tipsy/application.rb
-- lib/tipsy/builder.rb
-- lib/tipsy/builders/base.rb
-- lib/tipsy/builders/export.rb
-- lib/tipsy/builders/project.rb
-- lib/tipsy/builders/remote.rb
-- lib/tipsy/compressors/css.rb
-- lib/tipsy/compressors/javascript.rb
+- lib/tipsy/compressors/css_compressor.rb
+- lib/tipsy/compressors/javascript_compressor.rb
+- lib/tipsy/configuration.rb
+- lib/tipsy/handler/all.rb
+- lib/tipsy/handler/asset.rb
+- lib/tipsy/handler/erb.rb
+- lib/tipsy/handler/php.rb
+- lib/tipsy/handler/sass.rb
+- lib/tipsy/handler/sass/importer.rb
+- lib/tipsy/handler/sass/resolver.rb
+- lib/tipsy/handler/static.rb
 - lib/tipsy/helpers.rb
 - lib/tipsy/helpers/asset_paths.rb
 - lib/tipsy/helpers/asset_tags.rb
 - lib/tipsy/helpers/capture.rb
+- lib/tipsy/helpers/rendering.rb
 - lib/tipsy/helpers/sass.rb
 - lib/tipsy/helpers/tag.rb
-- lib/tipsy/logger.rb
-- lib/tipsy/project/Gemfile
-- lib/tipsy/project/assets/javascripts/site.js
-- lib/tipsy/project/assets/stylesheets/screen.css.scss
-- lib/tipsy/project/config.erb
-- lib/tipsy/project/helpers/site_helper.rb
-- lib/tipsy/project/views/_layout.html.erb
-- lib/tipsy/sass/template.rb
+- lib/tipsy/runner.rb
+- lib/tipsy/runners/compiler.rb
+- lib/tipsy/runners/deployer.rb
+- lib/tipsy/runners/generator.rb
 - lib/tipsy/server.rb
+- lib/tipsy/site.rb
+- lib/tipsy/utils/logger.rb
+- lib/tipsy/utils/system.rb
+- lib/tipsy/utils/system_test.rb
 - lib/tipsy/version.rb
 - lib/tipsy/view.rb
-- test/fixtures/about.html
-- test/fixtures/contact.html
-- test/fixtures/index.html
-- test/functional/page_test.rb
-- test/root/.gitignore
-- test/root/development/assets/javascripts/test.js
-- test/root/development/assets/stylesheets/screen.css.scss
-- test/root/development/config.rb
-- test/root/development/views/_layout.html.erb
-- test/root/development/views/index.html.erb
-- test/root/test/assets/javascripts/test.js
-- test/root/test/assets/stylesheets/screen.css.scss
-- test/root/test/config.rb
-- test/root/test/views/_layout.html.erb
-- test/root/test/views/about/index.html
-- test/root/test/views/contact.html
-- test/root/test/views/index.html.erb
+- lib/tipsy/view/base.rb
+- lib/tipsy/view/context.rb
+- 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/layouts/default.html.erb
+- test/root/views/index.html.erb
+- test/root/views/page.html.erb
+- test/root/views/sub/page.html.erb
+- test/root/views/sub/tertiary/index.html.erb
+- test/runner/compiler_test.rb
 - test/test_helper.rb
-- test/unit/helpers/asset_paths_test.rb
-- test/unit/helpers_test.rb
-- test/unit/server_test.rb
+- test/unit/site_test.rb
+- test/unit/tipsy_test.rb
+- test/unit/utils/system_test.rb
+- test/view/base_test.rb
+- test/view/path_test.rb
 - tipsy.gemspec
 homepage: https://github.com/kurbmedia/tipsy
 licenses: []
@@ -186,24 +219,20 @@ signing_key:
 specification_version: 3
 summary: A mini Rack application server for developing static sites.
 test_files:
-- test/fixtures/about.html
-- test/fixtures/contact.html
-- test/fixtures/index.html
-- test/functional/page_test.rb
-- test/root/.gitignore
-- test/root/development/assets/javascripts/test.js
-- test/root/development/assets/stylesheets/screen.css.scss
-- test/root/development/config.rb
-- test/root/development/views/_layout.html.erb
-- test/root/development/views/index.html.erb
-- test/root/test/assets/javascripts/test.js
-- test/root/test/assets/stylesheets/screen.css.scss
-- test/root/test/config.rb
-- test/root/test/views/_layout.html.erb
-- test/root/test/views/about/index.html
-- test/root/test/views/contact.html
-- test/root/test/views/index.html.erb
+- 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/layouts/default.html.erb
+- test/root/views/index.html.erb
+- test/root/views/page.html.erb
+- test/root/views/sub/page.html.erb
+- test/root/views/sub/tertiary/index.html.erb
+- test/runner/compiler_test.rb
 - test/test_helper.rb
-- test/unit/helpers/asset_paths_test.rb
-- test/unit/helpers_test.rb
-- test/unit/server_test.rb
+- test/unit/site_test.rb
+- test/unit/tipsy_test.rb
+- test/unit/utils/system_test.rb
+- test/view/base_test.rb
+- test/view/path_test.rb

data/lib/tipsy/application.rb

@@ -1,86 +0,0 @@
-require 'rack'
-
-##
-# Base class for all applications. Handles configuration of options, 
-# and processing of command line arguments.
-# 
-module Tipsy
-  class Application
-    
-    class_attribute :config, :instance_writer => false    
-    attr_reader :app
-        
-    def self.create(name = nil)
-      raise "Missing project name for 'tipsy new'" unless name
-      Tipsy::Builder.build!(:project, name)
-    end
-    
-    def self.build
-      Tipsy::Builder.build!(:export)
-    end
-    
-    def self.deploy
-      Tipsy::Builder.build!(:remote)
-    end
-    
-    def self.initialize!
-      self.config = Tipsy.options
-      begin
-        require File.join(Tipsy.root, 'config.rb')
-      rescue LoadError
-        puts "To configure additional settings, create a config.rb in your root path. (#{Tipsy.root})"
-      end
-    end
-    
-    def self.run
-      initialize!
-      self.new
-    end
-    
-    def initialize
-      require 'tipsy/helpers/sass'
-      @app = Tipsy::Server.init!
-      
-      Tipsy.logger.info("Tipsy #{Tipsy::VERSION} running on #{config.address}:#{config.port}")
-      
-      begin run_thin
-      rescue LoadError
-        begin run_mongrel
-        rescue LoadError
-          run_webrick
-        end
-      end      
-    end
-    
-    private
-
-    def server_opts
-      { :Port => config.port, :Host => config.address }
-    end
-    
-    def run_thin
-      handler = Rack::Handler.get('thin')
-      handler.run app, server_opts do |server|
-        puts "Running Tipsy with Thin (#{Thin::VERSION::STRING})."
-      end
-      exit(0)
-    end
-    
-    def run_mongrel
-      handler = Rack::Handler.get('mongrel')
-      handler.run app, server_opts do |server|
-        puts "Running Tipsy with Mongrel (#{Mongrel::Const::MONGREL_VERSION})."
-      end
-      exit(0)
-    end
-    
-    def run_webrick
-      handler = Rack::Handler.get('webrick')
-      handler.run app, server_opts do |server|
-        puts "Running Tipsy with Webrick. To use Mongrel or Thin (recommended), add them to your Gemfile"
-        trap("INT"){ server.shutdown }
-      end
-    end
-    
-  end
-end

data/lib/tipsy/builder.rb

@@ -1,26 +0,0 @@
-require 'active_support/inflector'
-
-##
-# Handles building source files into a final project, for 
-# either deployment or output to a directory
-# 
-module Tipsy
-  module Builder
-    
-    autoload :Base,           'tipsy/builders/base'
-    autoload :ProjectBuilder, 'tipsy/builders/project'
-    autoload :ExportBuilder,  'tipsy/builders/local'
-    autoload :RemoteBuilder,  'tipsy/builders/remote'
-    
-    def self.build!(type = :project, *args)
-      handler = case type
-        when :project then ProjectBuilder.new(*args)
-        when :export  then ExportBuilder.new(*args)
-        when :remote  then RemoteBuilder.new(*args)
-        else raise 'No builder specified'
-      end
-      handler.build!
-    end
-    
-  end
-end

data/lib/tipsy/builders/base.rb

@@ -1,64 +0,0 @@
-module Tipsy
-  module Builder
-    class Base      
-      attr_reader :source_path, :dest_path
-      
-      def excludes
-        @excludes ||= ['.git', '.gitignore', '.sass-cache', 'config.erb', '*.rb', '.', '..']
-      end
-      
-      def build!
-        process_location(source_path, dest_path)
-      end
-      
-      protected
-      
-      def excluded?(file)
-        return true if excludes.include?(file)
-        excludes.detect{ |exc| File.basename(exc).to_s.match(exc) }.nil?
-      end
-      
-      def log_action(action, name)
-        name = name.gsub(dest_path, '').sub(/^\//, '')
-        Tipsy.logger.log_action(action, name)
-      end
-      
-      ##
-      # By default make_file copies from one location to another
-      # Overridden in non-local scenarios
-      # 
-      def make_file(source, destination)
-        log_action("create", destination)
-        FileUtils.cp(source, destination)
-      end
-      
-      ##
-      # By default make_folder makes a matching folder in destination from source
-      # Overridden in non-local scenarios
-      #
-      def make_folder(dirname)
-        log_action("create", dirname)
-        FileUtils.mkdir(dirname)
-      end
-      
-      ##
-      # Iterate through a file tree and process each file and folder.
-      # 
-      def process_location(src, dest)
-        Dir.foreach(src) do |file|
-          next if excluded?(file)
-          source       = File.join(src, file)
-          destination  = File.join(dest, file)
-          
-          if File.directory?(source)
-            make_folder(destination)
-            process_location(source, destination)
-          else
-            make_file(source, destination)
-          end
-        end
-      end
-      
-    end
-  end
-end

data/lib/tipsy/builders/export.rb

@@ -1,16 +0,0 @@
-module Tipsy
-  module Builder
-    class ExportBuilder < Base
-      
-      def initialize
-        @source_path = Tipsy.root
-        @dest_path   = Tipsy.options.build_path
-      end
-      
-      def build!
-        FileUtils.mkdir(dest_path) unless File.exists?(dest_path) && File.directory?(dest_path)
-      end
-      
-    end
-  end
-end

data/lib/tipsy/builders/project.rb

@@ -1,40 +0,0 @@
-require 'fileutils'
-require 'erb'
-
-module Tipsy
-  module Builder
-    class ProjectBuilder < Base
-      attr_reader :project
-      
-      def initialize(name)
-        @project      = name.camelize
-        @dest_path    = File.join(Tipsy.root, name.underscore)
-        @source_path  = File.expand_path("../../project", __FILE__)        
-      end
-      
-      def build!
-
-        FileUtils.mkdir(dest_path) unless File.exists?(dest_path)
-        super
-        cvars = Conf.new
-        cvars.root      = dest_path
-        cvars.classname = @project              
-        template = File.read(File.join(source_path, 'config.erb'))
-        config   = ERB.new(template).result(cvars.get_binding)
-
-        File.open(File.join(dest_path, 'config.rb'), 'w'){ |io| io.write(config) }
-        log_action('create', File.join(dest_path, 'config.rb'))
-        
-        Tipsy.logger.info("\n   Project #{project} created in #{dest_path}.")
-        Tipsy.logger.info("   Run 'tipsy' from the root folder to start the server.\n\n")
-        
-      end
-      
-      class Conf
-        attr_accessor :classname, :root
-        def get_binding; binding; end
-      end
-      
-    end
-  end
-end

data/lib/tipsy/builders/remote.rb

@@ -1,14 +0,0 @@
-module Tipsy
-  module Builder
-    
-    class RemoteBuilder < Base
-      
-      def initialize
-        @source_path = Tipsy.root
-        @dest_path   = ''
-      end
-      
-    end
-    
-  end
-end

data/lib/tipsy/compressors/javascript.rb

@@ -1,25 +0,0 @@
-##
-# Interface to Google's Online Closure Compiler. 
-# Uglifier is recommended (gem install uglifier) however to support environments where Node.js
-# is unavailable this can be used as a fallback.
-# 
-require 'net/http'
-require 'uri'
-
-module Tipsy
-  module Compressors
-    # http://closure-compiler.appspot.com/compile
-    class JavascriptCompressor
-      def compress(js)
-        return js if js.to_s.blank?
-        post_data = {
-          'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
-          'js_code'           => js.to_s,
-          'output_format'     => 'text'
-        }
-        request = Net::HTTP.post_form(URI.parse('http://closure-compiler.appspot.com/compile'), post_data)
-        request.body.to_s
-      end
-    end
-  end
-end

data/lib/tipsy/logger.rb

@@ -1,62 +0,0 @@
-require 'logger'
-
-module Tipsy
-  class Logger
-    
-    COLOR_VALUES = {
-      :clear  => 0,
-      :red    => 31,
-      :green  => 32,
-      :yellow => 33
-    }
-    
-    attr_accessor :cache
-    attr_reader :stdout
-    
-    def initialize(o)
-      @stdout = o
-      @cache  = []
-    end
-    
-    def append(msg)
-      @cache << msg
-    end
-    
-    def flush!
-      cache.each{ |c| print c }
-    end
-    
-    def log_action(name, action)
-      print colorize(:green, (name.rjust(12, ' ') << " "), :clear, action)
-    end
-    
-    def info(msg)
-      print msg
-    end
-    
-    def warn(msg)
-      print colorize(:yellow, "Warning: ", :clear, msg)
-    end
-    
-    def error
-      print colorize(:red, "Error: ", :clear, msg)
-    end
-    
-    def colorize(*args)
-      output = args.inject([]) do |arr, option|
-        unless option.is_a?(Symbol) && COLOR_VALUES[option]
-          arr << option
-        else
-          arr << "\e[#{COLOR_VALUES[option]}m"
-        end
-        arr
-      end
-      output.push("\e[0m").join("")
-    end
-    
-    def print(msg)
-      puts msg
-    end
-   
-  end
-end

data/lib/tipsy/project/Gemfile

@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-gem "rack", "~> 1.2"
-gem "tilt", "~> 1.3"
-gem "i18n", "~> 0.5"
-gem "sass", "~> 3.1"
-gem "activesupport", ">= 3.0"
-gem 'sprockets', '~> 2.0.0.beta.12'

data/lib/tipsy/project/config.erb

@@ -1,19 +0,0 @@
-class <%= classname %> < Tipsy::Application
-
-	# Configure assets to be precompiled
-	config.assets.precompile << "site.js"
-	config.assets.precompile << "screen.css"
-	
-	# Add assets to the load path
-	# config.assets.paths << "/some/path"
-	
-	# The path where build files will go when compiled
-	# config.build_path = <%= File.join(root, 'build') %>
-	
-	# The path where public files exist (default root/public)
-	# config.public_path = <%= File.join(root, 'public') %>
-	
-	# The path where assets will be stored on build (default public_path/assets)
-	# config.asset_path = <%= File.join(root, 'assets') %>
-	
-end

data/lib/tipsy/project/helpers/site_helper.rb

@@ -1,4 +0,0 @@
-module SiteHelper
-  # Add your helper methods here. You may also add additional helpers to your helpers folder.
-  # Helpers should use Rails style naming conventions (site_helper.rb = SiteHelper)
-end