gumdrop 0.7.1 → 0.7.2

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.7.2
+- Now supports :packr as a type of compression for stitch/sprockets (be sure it's in your Gemfile)
+- Cleaned up generator internals
+
 # v0.7.1
 - Ignore/skip (greylist/blacklist) will now include/skip generated content too.
 - Quiet mode will actually be quiet.

data/License

@@ -7,12 +7,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/gumdrop/generator.rb

@@ -88,90 +88,70 @@ module Gumdrop
       env = Sprockets::Environment.new @site.root_path
       env.append_path @site.src_path
       opts[:paths].each do |path|
-        # path = File.expand_path path
-        # puts ">>>> adding path #{path}"
         env.append_path(path)
       end
       
       content= env[ opts[:src] ].to_s
-      # pp env
-      # pp opts[:src]
-      # pp env[ opts[:src] ]
-      # puts "RENDERED OUTPUT!"
-      # pp content
       page name do
-        case opts[:compress]
-
-        when true, :jsmin
-          require 'jsmin'
-          JSMin.minify content
-
-        when :yuic
-          require "yui/compressor"
-          compressor = YUI::JavaScriptCompressor.new(:munge => opts[:obfuscate])
-          compressor.compress(content)
-
-        when :uglify
-          require "uglifier"
-          Uglifier.compile( content, :mangle=>opts[:obfuscate])
-
-        when false
-          content
-
-        else
-          # UNKNOWN Compressor type!
-          @site.report "Unknown javascript compressor type! (#{ opts[:compressor] })", :warning
-          content
-        end
-      end
-      
-      if opts[:prune] and opts[:root]
-        sp = File.expand_path( @site.config.source_dir )
-        rp = File.expand_path(opts[:root])
-        relative_root = rp.gsub(sp, '')[1..-1]
-        rrlen= relative_root.length - 1
-        @site.node_tree.keys.each do |path|
-          if path[0..rrlen] == relative_root and name != path
-            @site.node_tree.delete path
-          end
-        end
+        compress_output(content, opts)
       end
+      keep_src(name, content, opts)
+      prune_src(name, opts)
     end
     
     def stitch(name, opts)
       require 'gumdrop/stitch_support'
       content= Stitch::Package.new(opts).compile
       page name do
-        case opts[:compress]
+        compress_output(content, opts)
+      end
+      keep_src(name, content, opts)
+      prune_src(name, opts)
+    end
+    
+    
+  private
+  
+    def compress_output(content, opts)
+      case opts[:compress]
 
-        when true, :jsmin
-          require 'jsmin'
-          JSMin.minify content
+      when true, :jsmin
+        require 'jsmin'
+        JSMin.minify content
 
-        when :yuic
-          require "yui/compressor"
-          compressor = YUI::JavaScriptCompressor.new(:munge => opts[:obfuscate])
-          compressor.compress(content)
+      when :yuic
+        require "yui/compressor"
+        compressor = YUI::JavaScriptCompressor.new(:munge => opts[:obfuscate])
+        compressor.compress(content)
 
-        when :uglify
-          require "uglifier"
-          Uglifier.compile( content, :mangle=>opts[:obfuscate])
+      when :uglify
+        require "uglifier"
+        Uglifier.compile( content, :mangle=>opts[:obfuscate])
 
-        when false
-          content
+      when :packr
+        require 'packr'
+        Packr.pack(content, :shrink_vars => true, :base62 => false, :private=>false)
 
-        else
-          # UNKNOWN Compressor type!
-          @site.report "Unknown javascript compressor type! (#{ opts[:compressor] })", :warning
-          content
-        end
+      when false
+        content
+
+      else
+        # UNKNOWN Compressor type!
+        @site.report "Unknown javascript compressor type! (#{ opts[:compressor] })", :warning
+        content
       end
+    end
+    
+    def keep_src(name, content, opts)
       if opts[:keep_src] or opts[:keep_source]
         ext= File.extname name
         page name.gsub(ext, "#{opts.fetch(:source_postfix, '-src')}#{ext}") do
           content
         end
       end
+    end
+    
+    def prune_src(name, opts)
       if opts[:prune] and opts[:root]
         sp = File.expand_path( @site.config.source_dir )
         rp = File.expand_path(opts[:root])

data/lib/gumdrop/site.rb

@@ -209,7 +209,7 @@ module Gumdrop
           node= Content.new(path, self)
           path= node.to_s
           if blacklist.any? {|pattern| path_match path, pattern }
-            report "-excluding: #{path}", :info
+            report " excluding: #{path}", :info
           else
             node.ignored= greylist.any? {|pattern| path_match path, pattern }
             # Sort out Layouts, Generators, and Partials

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION = "0.7.1" unless defined?(::Gumdrop::VERSION)
+  VERSION = "0.7.2" unless defined?(::Gumdrop::VERSION)
   
 end

data/templates/backbone/Gemfile

@@ -19,6 +19,7 @@ gem "coffee-script"
 # For JavaScript stitching and compressing:
 #gem 'uglifier'
 #gem 'yui-compressor'
+#gem 'packr'
 gem 'jsmin'
 gem 'stitch-rb'
 #gem 'sprockets'

data/templates/default/Gemfile

@@ -19,6 +19,7 @@ gem "coffee-script"
 # For JavaScript stitching and compressing:
 #gem 'uglifier'
 #gem 'yui-compressor'
+#gem 'packr'
 gem 'jsmin'
 gem 'stitch-rb'
 #gem 'sprockets'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Matt McCray