massimo 0.6.2 → 0.6.3

data/lib/massimo/javascript.rb

@@ -1,24 +1,44 @@
 module Massimo
   class Javascript < Massimo::Resource
     def render
-      case source_path.extname.to_s
-      when '.coffee'
-        require 'coffee-script' unless defined?(CoffeeScript)
-        CoffeeScript.compile(content, Massimo.config.options_for(:coffee_script))
-      else
-        require 'sprockets' unless defined?(Sprockets)
-        options = Massimo.config.options_for(:sprockets).merge(
-          :assert_root  => Massimo.config.output_path,
-          :source_files => [ source_path.to_s ]
-        )
-        secretary = Sprockets::Secretary.new(options)
-        secretary.install_assets
-        secretary.concatenation.to_s
-      end
+      compress(compile)
     end
     
     def extension
       @extension ||= '.js'
     end
+    
+    protected
+    
+      def compile
+        case source_path.extname.to_s
+        when '.coffee'
+          require 'coffee-script' unless defined?(CoffeeScript)
+          CoffeeScript.compile(content, Massimo.config.options_for(:coffee_script))
+        else
+          require 'sprockets' unless defined?(Sprockets)
+          options = Massimo.config.options_for(:sprockets).merge(
+            :assert_root  => Massimo.config.output_path,
+            :source_files => [ source_path.to_s ]
+          )
+          secretary = Sprockets::Secretary.new(options)
+          secretary.install_assets
+          secretary.concatenation.to_s
+        end
+      end
+    
+      def compress(javascript)
+        case Massimo.config.javascripts_compressor.to_s
+        when 'min', 'jsmin'
+          require 'jsmin' unless defined?(JSMin)
+          JSMin.minify(javascript).strip
+        when 'pack', 'packr'
+          require 'packr' unless defined?(Packr)
+          options = { :shrink_vars => true }.merge Massimo.config.options_for(:packr)
+          Packr.pack(javascript, options)
+        else
+          javascript
+        end
+      end
   end
 end

data/lib/massimo.rb

@@ -12,7 +12,7 @@ module Massimo
   autoload :View,       'massimo/view'
   autoload :Watcher,    'massimo/watcher'
   
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
   
   class << self
     def site

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Pete Browne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 -05:00
+date: 2010-05-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -145,9 +145,23 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: unindent
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -158,11 +172,11 @@ dependencies:
         - beta
         version: 3.0.0.beta
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: less
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -172,11 +186,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: coffee-script
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -186,11 +200,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: sprockets
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -200,25 +214,25 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: unindent
+  name: growl
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 9
         - 0
-        version: 0.9.0
+        version: 1.0.0
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: growl
+  name: jsmin
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -228,7 +242,21 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: packr
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  type: :development
+  version_requirements: *id017
 description: Massimo builds HTML, Javascript, and CSS Files from your source.
 email: me@petebrowne.com
 executables: