tipsy 0.0.5 → 0.0.6

data/lib/tipsy/compressors/css_compressor.rb

@@ -4,7 +4,8 @@ module Tipsy
   module Compressors
     class CssCompressor
       def compress(css)
-        Sass::Engine.new(css, :syntax => :scss, :cache => false, :read_cache => false, :style => :compressed).render
+        css_style = Tipsy::Site.config.compile.compress_css ? :compressed : :nested
+        Sass::Engine.new(css, :syntax => :scss, :cache => false, :read_cache => false, :line_comments => false, :style => css_style).render
       end
     end
   end

data/lib/tipsy/compressors/javascript_compressor.rb

@@ -11,6 +11,7 @@ module Tipsy
     
     module Closure
       def compress(js)
+        return js unless Tipsy::Site.config.compile.compress_javascripts
         return js if js.to_s.blank?
         post_data = {
           'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
@@ -24,6 +25,7 @@ module Tipsy
     
     module Uglifier
       def compress(js)
+        return js unless Tipsy::Site.config.compile.compress_javascripts
         ::Uglifier.compile(js, :max_line_length => 500, :squeeze => true, :copyright => false)
       end
     end

data/lib/tipsy/handler/asset.rb

@@ -20,9 +20,12 @@ module Tipsy
       
       class << self
         def map!
-          fpaths = [:javascripts_path, :css_path, :images_path].collect{ |p| File.basename(Tipsy::Site.send(p)) }
+          fpaths = [:javascripts_path, :css_path, :images_path].collect do |p| 
+            path = ::Pathname.new(Tipsy::Site.send(p))
+            (path.absolute? ? path.to_s : path.to_s.sub(/^\//,''))
+          end
           fpaths.inject({}) do |hash, path|
-            hash.merge!("/#{path}" => self.new)
+            hash.merge!("#{path}" => self.new)
           end
         end
       end

data/lib/tipsy/handler/static.rb

@@ -17,6 +17,15 @@ module Tipsy
 
       def call(env)
         pathinfo = env['PATH_INFO']
+        
+        if(File.basename(pathinfo) == "favicon.ico")
+          resp = static.call(env.merge!({ 'PATH_INFO' => pathinfo }))
+          unless 404 == resp[0]
+            resp[1].merge!({ "Pragma" => "nocache", "Cache-Control" => "max-age=0" })
+            return resp
+          end
+        end
+        
         found    = nil
         try_files.each do |path|
           response = static.call(env.merge!({ 'PATH_INFO' => pathinfo + path }))

data/lib/tipsy/runner.rb

@@ -65,7 +65,7 @@ module Tipsy
     # @usage From the command line, run `tipsy compile`
     # 
     def compile
-      Tipsy::Runners::Compiler.new
+      Tipsy::Runners::Compiler.new(args, @site)
     end
     
     

data/lib/tipsy/runners/compiler.rb

@@ -6,9 +6,10 @@ module Tipsy
     class Compiler
       include Tipsy::Utils::System
       
-      attr_reader :source_path, :dest_path, :scope
+      attr_reader :source_path, :dest_path, :scope, :site
       
-      def initialize
+      def initialize(args, site)
+        @site        = site
         @source_path = normalize_path(config.public_path)
         @dest_path   = normalize_path(config.compile_to)
         excluded     = [excludes, config.compile.preserve].flatten.uniq
@@ -113,7 +114,7 @@ module Tipsy
 
         dirs.each do |path|          
           templates_in_path(path).each do |tpl|
-            next if ::File.directory?(File.join(path, tpl))
+            next if ::File.directory?(File.join(path, tpl)) || ::File.basename(tpl).to_s[0] == "_"
             
             route    = ::Pathname.new(path.gsub("#{Tipsy.root}/views", ""))
             route    = "/" if route.blank?

data/lib/tipsy/site.rb

@@ -41,7 +41,9 @@ module Tipsy
     config.compile.assets    = ['screen.css', 'site.js']
     config.compile.preserve  = [".svn", ".gitignore", ".git"]
     config.compile.skip      = []
-    
+
+    config.compile.compress_css = true
+    config.compile.compress_javascripts = true
     
     config.compile.enable_rewrite = true
     config.compile.rewrite_mode   = :htaccess

data/lib/tipsy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tipsy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70117518099000 !ruby/object:Gem::Requirement
+  requirement: &70338554616740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518099000
+  version_requirements: *70338554616740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70117518098060 !ruby/object:Gem::Requirement
+  requirement: &70338554616140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518098060
+  version_requirements: *70338554616140
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70117518097160 !ruby/object:Gem::Requirement
+  requirement: &70338554615580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518097160
+  version_requirements: *70338554615580
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70117518095800 !ruby/object:Gem::Requirement
+  requirement: &70338554615020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518095800
+  version_requirements: *70338554615020
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70117518094340 !ruby/object:Gem::Requirement
+  requirement: &70338554614560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518094340
+  version_requirements: *70338554614560
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70117518093420 !ruby/object:Gem::Requirement
+  requirement: &70338554613980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518093420
+  version_requirements: *70338554613980
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70117518092460 !ruby/object:Gem::Requirement
+  requirement: &70338554613420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518092460
+  version_requirements: *70338554613420
 - !ruby/object:Gem::Dependency
   name: hike
-  requirement: &70117518091560 !ruby/object:Gem::Requirement
+  requirement: &70338554612860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518091560
+  version_requirements: *70338554612860
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70117518090840 !ruby/object:Gem::Requirement
+  requirement: &70338554612340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70117518090840
+  version_requirements: *70338554612340
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70117518089860 !ruby/object:Gem::Requirement
+  requirement: &70338554611840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70117518089860
+  version_requirements: *70338554611840
 description: Tipsy is a mini Rack application for working with static websites using
   Tilt, and Sprockets.
 email: