gumdrop 1.1.1 → 1.1.2

data/.gitignore

@@ -4,4 +4,6 @@ output
 .sass-cache
 *.log
 old_*
-Gemfile.lock
+Gemfile.lock
+templates/blank/output
+templates/default/output

data/ChangeLog.md

@@ -1,3 +1,9 @@
+# v1.1.2
+- Added helper for checksums, good for:
+- Added cache busting support for uris. e.g. "/theme/screen.css?v=HASHHERE445435435ETC"
+- Added support for `Gumdrop#no_render(*paths)`. Treats all matched paths as binary.
+- Fixed sprockets load_paths issue.
+
 # v1.1.1
 - Cleaned up dependencies.
 - Some performance and memory optimizations.

data/Notes.md

@@ -2,4 +2,7 @@
 
 - Flesh out the test/specs
 - Support Compass for sass
-- Support nib for stylus
+- Support nib for stylus
+- Remove `Pageset#uri`? Or else make it work right (including/especially via generators)
+- Update to latest Tilt? Or wait for v2?
+- Add support for template paths. Will load only layouts and partials from those directories.

data/lib/gumdrop/builder.rb

@@ -62,6 +62,7 @@ module Gumdrop
         log.debug "  blackout: #{ uri }" and next if site.in_blacklist? uri
         output_path= site.output_path / content.uri
         if content.binary?
+          # log.info "BINARY: #{content.path}"
           @copy_files << { content.source_path => output_path }
         else
           rendered_content= renderer.draw content

data/lib/gumdrop/cli/internal.rb

@@ -32,6 +32,7 @@ module Gumdrop::CLI
     desc 'server', 'Run development server'
     method_option :browser, aliases:'-b', default:false, desc:"Launch a browser to the site address."
     method_option :port, aliases:'-p', default:4567, desc:"Port to run the server on."
+    method_option :env, default:'production', aliases:'-e'
     def server
       Gumdrop.configure do |c|
         c.server_port= options[:port]

data/lib/gumdrop/content.rb

@@ -75,7 +75,7 @@ module Gumdrop
       @is_binary ||= begin
         if generated? or has_block? or missing?
           false
-        elsif KNOWN_BINARY.include? ext
+        elsif KNOWN_BINARY.include? ext or site.unrenderable? path
           true
         else
           # from ptools
@@ -189,6 +189,8 @@ module Gumdrop
     end
   end
 
+
+
   class ContentList < Hash 
 
     def initialize

data/lib/gumdrop/data.rb

@@ -54,6 +54,18 @@ module Gumdrop
       page_size= opts.fetch(:page_size, 5)
       Util::Pager.new( data, base_path, page_size )
     end
+
+    # Not used internally, but useful for external usage
+    def parse_file(path, target_ext=nil)
+      return nil if path.nil?
+      return nil if File.directory? path
+      _load_from_file path, target_ext
+      # if File.directory? path
+      #   _load_from_directory path
+      # else
+      #   _load_from_file path, target_ext
+      # end
+    end
   
   private
   
@@ -71,8 +83,8 @@ module Gumdrop
       end
     end
 
-    def _load_from_file( filename )
-      ext=File.extname(filename)[1..-1]
+    def _load_from_file( filename, target_ext=nil )
+      ext= target_ext || File.extname(filename)[1..-1]
       provider= Data::Provider.for ext
       case
         when provider.nil?

data/lib/gumdrop/server.rb

@@ -25,14 +25,14 @@ module Gumdrop
       set :port, site.config.server_port if site.config.server_port
       
       if site.config.proxy_enabled
-        require 'gumdrop/server/proxy_handler'
+        require 'gumdrop/util/proxy_handler'
         get     '/-proxy/*' do handle_proxy(params, env) end
         post    '/-proxy/*' do handle_proxy(params, env) end
         put     '/-proxy/*' do handle_proxy(params, env) end
         delete  '/-proxy/*' do handle_proxy(params, env) end
         patch   '/-proxy/*' do handle_proxy(params, env) end
         options '/-proxy/*' do handle_proxy(params, env) end
-        log.info 'Enabled proxy at /-proxy/*'
+        # log.info 'Enabled proxy at /-proxy/*'
       end
 
       get '/*' do

data/lib/gumdrop/site.rb

@@ -16,6 +16,7 @@ module Gumdrop
     log_level: :info,
     ignore: JETSAM_FILES,
     blacklist: [],
+    no_render: [],
     server_timeout: 5,
     server_port: 4567,
     env: :production,
@@ -116,6 +117,12 @@ module Gumdrop
       end
     end
 
+    def unrenderable?(path)
+      config.no_render.any? do |pattern|
+        path.path_match? pattern
+      end
+    end
+
     def source_path
       @source_path ||= source_dir.expand_path(root)
     end
@@ -354,7 +361,7 @@ module Gumdrop
       end      
     end
 
-    # Specified paths will not be renderd to output (matching against
+    # Specified paths will not be rendered to output (matching against
     # the source tree).
     def blacklist(*paths)
       paths.each do |path|
@@ -366,6 +373,18 @@ module Gumdrop
       end      
     end
 
+    # Specified paths will be treated as binary files and copied, not
+    # rendered.
+    def no_render(*paths)
+      paths.each do |path|
+        if path.is_a? Array
+          config.no_render.concat path
+        else
+          config.no_render << path
+        end
+      end      
+    end
+
   protected
 
     # Walks up the filesystem, starting from Dir.pwd, looking for

data/lib/gumdrop/support/sprockets.rb

@@ -7,8 +7,9 @@ module Gumdrop::Support
       require 'sprockets'
       source_path = source_file || opt[:main] || opt[:from]
       env = ::Sprockets::Environment.new site.root
+      env.append_path File.expand_path(File.join site.source_path, File.dirname(source_path))
       env.append_path site.source_path
-      env.append_path File.dirname(source_path)
+      # env.append_path File.dirname(source_path)
       [opts[:paths]].flatten.each do |path|
         env.append_path(path) unless path.nil?
       end

data/lib/gumdrop/support/stitch.rb

@@ -22,7 +22,9 @@ module Gumdrop::Support
       stitch_opts= {} #{ root: content.source_path }
       stitch_opts.merge! opts
       stitch_opts[:paths] ||= []
-      stitch_opts[:paths] << File.dirname(path)
+      if stitch_opts.fetch(:autorootpath, true)
+        stitch_opts[:paths] << File.dirname(path) 
+      end
       ::Stitch::Package.new(stitch_opts).compile
     rescue LoadError
       raise StandardError, "Stitch can't be loaded. Please add it to your Gemfile."

data/lib/gumdrop/util/pager.rb

@@ -22,6 +22,10 @@ module Gumdrop::Util
       @current_page= nil
     end
 
+    def current
+      @pages.fetch(@current_page, nil)
+    end
+
     def length
       @pages.length
     end

data/lib/gumdrop/util/proxy_handler.rb

@@ -98,7 +98,7 @@ module Gumdrop
       status = response.code # http status code
       protocol = proxy[:secure] ? 'https' : 'http'
 
-      log.log "~ PROXY: #{http_method.upcase} #{status} #{url} -> #{protocol}://#{http_host}:#{http_port}#{http_path}\n"
+      log.info "~ PROXY: #{http_method.upcase} #{status} #{url} -> #{protocol}://#{http_host}:#{http_port}#{http_path}\n"
 
       # display and construct specific response headers
       response_headers = {}

data/lib/gumdrop/util/view_helpers.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 module Gumdrop
   
   module Util
@@ -31,6 +33,31 @@ module Gumdrop
           raise StandardError, "Textile is not available: Include a Textile engine in your Gemfile!"
         end
       end
+
+      def uri_fresh(path)
+        if (path[0] == '/')
+          internal_path= path[1..-1]
+        else
+          internal_path= path
+          path= "/#{path}"
+        end
+        "#{ path }?v=#{ checksum_for internal_path }"
+      end
+
+      def cache_bust(path)
+        uri_fresh(path)
+      end
+
+      def checksum_for(path)
+        path= path[1..-1] if path[0] == '/'
+        @_checksum_cache ||= {}
+        if @_checksum_cache.has_key? path
+          @_checksum_cache[path]
+        else
+          content= render path
+          @_checksum_cache[path]= Digest::MD5.hexdigest( content )
+        end
+      end
       
       def config
         site.config

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION= "1.1.1"
+  VERSION= "1.1.2"
 
 end

data/templates/default/Gemfile

@@ -8,7 +8,8 @@ source "http://rubygems.org"
 # For template support:
 # gem "less"
 # gem "haml"
-gem "slim"
+# gem "slim"
+gem "erubis"
 gem "sass"
 gem "coffee-script"
 
@@ -17,8 +18,8 @@ gem "coffee-script"
 #gem 'yui-compressor'
 #gem 'packr'
 gem 'jsmin'
-gem 'stitch-rb'
-#gem 'sprockets'
+gem 'sprockets'
+# gem 'stitch-rb'
 
 # For markdown support, a couple of options:
 gem "kramdown" #, :git => "git://github.com/darthapo/kramdown.git" #(github code-fence support)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -360,3 +360,4 @@ signing_key:
 specification_version: 3
 summary: The sweet 'n simple cms and prototyping tool.
 test_files: []
+has_rdoc: false