gumdrop 0.6.4 → 0.7.0

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.7.0
+- Initial support for sprockets js generator
+
 # v0.6.4
 - Callbacks are cleared on each `Site#rescan()` to prevent duplicates.
 - Callback blocks are called with `site` as the parameter.

data/lib/gumdrop/data_manager.rb

@@ -44,6 +44,25 @@ module Gumdrop
       Pager.new( data, base_path, page_size )
     end
   
+    # Exposing these publicly because, well, they're useful:
+    def load_from_file( filename )
+      ext=File.extname(filename)
+      if ext == '.yamldoc' or ext == '.ymldoc'
+        load_from_yamldoc filename
+      elsif ext == '.yamldb' or ext == '.ymldb'
+        load_from_yamldb filename
+      elsif ext == '.yaml' or ext == '.yml' or ext == '.json'
+        hashes2ostruct( YAML.load_file(filename)  )
+      else
+        # raise "Unknown data type (#{ext}) for #{filename}"
+        Gumdrop.report "Unknown data type (#{ext}) for #{filename}", :warning
+        nil
+      end
+    end
+    def load_yamldoc(filename, source=nil)
+      load_from_yamldoc filename, source
+    end
+
   
   private
   
@@ -61,21 +80,6 @@ module Gumdrop
       end
     end
 
-    def load_from_file( filename )
-      ext=File.extname(filename)
-      if ext == '.yamldoc' or ext == '.ymldoc'
-        load_from_yamldoc filename
-      elsif ext == '.yamldb' or ext == '.ymldb'
-        load_from_yamldb filename
-      elsif ext == '.yaml' or ext == '.yml' or ext == '.json'
-        hashes2ostruct( YAML.load_file(filename)  )
-      else
-        # raise "Unknown data type (#{ext}) for #{filename}"
-        Gumdrop.report "Unknown data type (#{ext}) for #{filename}", :warning
-        nil
-      end
-    end
-
     def load_from_yamldb( filename )
       docs=[]
       File.open(filename, 'r') do |f|
@@ -86,8 +90,8 @@ module Gumdrop
       docs
     end
 
-    def load_from_yamldoc( filename )
-      source = File.read(filename)
+    def load_from_yamldoc( filename, source=nil )
+      source = File.read(filename) if source.nil?
 
       if source =~ /^(\s*---(.+)---\s*)/m
         yaml = $2.strip

data/lib/gumdrop/generator.rb

@@ -78,6 +78,62 @@ module Gumdrop
       end
     end
     
+    def sprockets(name, opts)
+      require 'gumdrop/sprockets_support'
+      # require 'pp'
+      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
+      end
+    end
+    
     def stitch(name, opts)
       require 'gumdrop/stitch_support'
       content= Stitch::Package.new(opts).compile

data/lib/gumdrop/server.rb

@@ -11,7 +11,7 @@ module Gumdrop
     site_file= Gumdrop.fetch_site_file
     unless site_file.nil?
       site= Site.new site_file
-      site.scan()
+      site.rescan()
 
       set :port, site.config.server_port if site.config.server_port
       
@@ -48,7 +48,7 @@ module Gumdrop
             content_type :js if content.ext == '.js' # Meh?
             content_type :xml if content.ext == '.xml' # Meh?
             output= content.render 
-            site.content_filters.each {|f| output= f.call(output, self) }
+            site.content_filters.each {|f| output= f.call(output, content) }
             output
           else
             site.report "[#{$$}]  *Static: #{file_path}"

data/lib/gumdrop/sprockets_support.rb

@@ -0,0 +1,3 @@
+require 'sprockets'
+
+# Any sprockets extentions/helpers

data/lib/gumdrop/version.rb

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

data/lib/gumdrop.rb

@@ -23,14 +23,14 @@ module Gumdrop
       site_file= Gumdrop.fetch_site_file
       unless site_file.nil?
         site= Site.new site_file, opts
-
+  
         old= Dir.pwd
         Dir.chdir site.root_path
-
+  
         site.build
         
         Dir.chdir old
-
+  
         puts "Done."
       else
         puts "Not in a valid Gumdrop site directory."

data/templates/backbone/Gemfile

@@ -21,6 +21,7 @@ gem "coffee-script"
 #gem 'yui-compressor'
 gem 'jsmin'
 gem 'stitch-rb'
+#gem 'sprockets'
 
 # For markdown support, a couple of options:
 # gem "rdiscount"

data/templates/backbone/config.ru

@@ -1,5 +1,8 @@
+Encoding.default_external = 'UTF-8'
+
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

data/templates/default/Gemfile

@@ -21,6 +21,7 @@ gem "coffee-script"
 #gem 'yui-compressor'
 gem 'jsmin'
 gem 'stitch-rb'
+#gem 'sprockets'
 
 # For markdown support, a couple of options:
 # gem "rdiscount"

data/templates/default/config.ru

@@ -1,5 +1,8 @@
+Encoding.default_external = 'UTF-8'
+
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 4
-  version: 0.6.4
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matt McCray
@@ -123,6 +123,7 @@ files:
 - lib/gumdrop/proxy_handler.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/site.rb
+- lib/gumdrop/sprockets_support.rb
 - lib/gumdrop/stitch_support.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb