jammit 0.5.4 → 0.6.0

data/jammit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.5.4'         # Keep version in sync with jammit.rb
+  s.version   = '0.6.0'         # Keep version in sync with jammit.rb
   s.date      = '2010-11-8'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"

data/lib/jammit.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.5.4"
+  VERSION               = "0.6.0"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -50,7 +50,7 @@ module Jammit
                 :embed_assets, :package_assets, :compress_assets, :gzip_assets,
                 :package_path, :mhtml_enabled, :include_jst_script, :config_path,
                 :javascript_compressor, :compressor_options, :css_compressor_options,
-                :template_extension, :template_extension_matcher
+                :template_extension, :template_extension_matcher, :allow_debugging
   end
 
   # The minimal required configuration.
@@ -70,6 +70,7 @@ module Jammit
     @embed_assets           = conf[:embed_assets] || conf[:embed_images]
     @compress_assets        = !(conf[:compress_assets] == false)
     @gzip_assets            = !(conf[:gzip_assets] == false)
+    @allow_debugging        = !(conf[:allow_debugging] == false)
     @mhtml_enabled          = @embed_assets && @embed_assets != "datauri"
     @compressor_options     = symbolize_keys(conf[:compressor_options] || {})
     @css_compressor_options = symbolize_keys(conf[:css_compressor_options] || {})

data/lib/jammit/compressor.rb

@@ -22,7 +22,7 @@ module Jammit
 
     # Font extensions for which we allow embedding:
     EMBED_EXTS      = EMBED_MIME_TYPES.keys
-    EMBED_FONTS     = ['.ttf', '.otf']
+    EMBED_FONTS     = ['.ttf', '.otf', '.woff']
 
     # (32k - padding) maximum length for data-uri assets (an IE8 limitation).
     MAX_IMAGE_SIZE  = 32700
@@ -128,7 +128,7 @@ module Jammit
     # the namespaced prefix. Otherwise, simply use the filename.
     def template_name(path, base_path)
       return File.basename(path, ".#{Jammit.template_extension}") unless base_path
-      path.gsub(/\A#{base_path}\/(.*)\.#{Jammit.template_extension}\Z/, '\1')
+      path.gsub(/\A#{Regexp.escape(base_path)}\/(.*)\.#{Jammit.template_extension}\Z/, '\1')
     end
 
     # In order to support embedded assets from relative paths, we need to
@@ -244,7 +244,7 @@ module Jammit
 
     # `File.read`, but in "binary" mode.
     def read_binary_file(path)
-      File.open(path, 'r:binary') {|f| f.read }
+      File.open(path, 'rb') {|f| f.read }
     end
   end
 

data/lib/jammit/controller.rb

@@ -15,15 +15,16 @@ module Jammit
     # yet been cached. The package will be built, cached, and gzipped.
     def package
       parse_request
+      template_ext = Jammit.template_extension.to_sym
       case @extension
       when :js
         render :js => (@contents = Jammit.packager.pack_javascripts(@package))
-      when Jammit.template_extension.to_sym
+      when template_ext
         render :js => (@contents = Jammit.packager.pack_templates(@package))
       when :css
         render :text => generate_stylesheets, :content_type => 'text/css'
       end
-      cache_package if perform_caching
+      cache_package if perform_caching && (@extension != template_ext)
     rescue Jammit::PackageNotFound
       package_not_found
     end
@@ -87,7 +88,7 @@ end
 # Make the Jammit::Controller available to Rails as a top-level controller.
 ::JammitController = Jammit::Controller
 
-if defined?(Rails) && (Rails.env.development? || Rails.env.test?)
+if defined?(Rails) && Rails.env.development?
   ActionController::Base.class_eval do
     append_before_filter { Jammit.reload! }
   end

data/lib/jammit/helper.rb

@@ -16,7 +16,7 @@ module Jammit
     # compressed CSS, and in development the stylesheet URLs are passed verbatim.
     def include_stylesheets(*packages)
       options = packages.extract_options!
-      return individual_stylesheets(packages, options) unless Jammit.package_assets
+      return individual_stylesheets(packages, options) unless should_package?
       disabled = (options.delete(:embed_assets) == false) || (options.delete(:embed_images) == false)
       return html_safe(packaged_stylesheets(packages, options)) if disabled || !Jammit.embed_assets
       return html_safe(embedded_image_stylesheets(packages, options))
@@ -26,7 +26,7 @@ module Jammit
     # except in development, where it references the individual scripts.
     def include_javascripts(*packages)
       tags = packages.map do |pack|
-        Jammit.package_assets ? Jammit.asset_url(pack, :js) : Jammit.packager.individual_urls(pack.to_sym, :js)
+        should_package? ? Jammit.asset_url(pack, :js) : Jammit.packager.individual_urls(pack.to_sym, :js)
       end
       html_safe(javascript_include_tag(tags.flatten))
     end
@@ -40,6 +40,10 @@ module Jammit
 
     private
 
+    def should_package?
+      Jammit.package_assets && !(Jammit.allow_debugging && params[:debug_assets])
+    end
+
     def html_safe(string)
       string.respond_to?(:html_safe) ? string.html_safe : string
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jammit
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Industrial Strength Asset Packaging for Rails