gumdrop 0.3.6 → 0.3.7

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.3.7
+- Added lib_dir and source_dir to config for more customization possibilities
+- Added blacklisting example to templates
+
 # v0.3.6
 - Correctly added deps to gemspec for i18n and bundle. *ahem*
 - Version bump

data/lib/gumdrop.rb

@@ -12,6 +12,8 @@ DEFAULT_OPTIONS= {
   root: ".",
   log_level: :info,
   output_dir: "./output",
+  lib_dir: "./lib",
+  source_dir: "./source",
   log: 'logs/build.log'
 }
 
@@ -58,11 +60,12 @@ module Gumdrop
       Gumdrop.config.merge! opts
       
       root= File.expand_path Gumdrop.config.root
-      src= File.join root, 'source'
-      $: << "#{root}/lib"
-      if File.exists? "#{root}/lib/view_helpers.rb"
+      src= File.expand_path Gumdrop.config.source_dir #File.join root, 'source'      
+      lib_path= File.expand_path Gumdrop.config.lib_dir
+      $: << lib_path # "#{root}/lib"
+      if File.exists? File.join(lib_path,"view_helpers.rb")
         # In server mode, we want to reload it every time... right?
-        load "#{root}/lib/view_helpers.rb"
+        load File.join(lib_path,"view_helpers.rb")
       end
 
       @site        = Hash.new {|h,k| h[k]= nil }
@@ -86,10 +89,14 @@ module Gumdrop
       @content_filters= []
       @blacklist      = []
       
-      if File.exists? "#{root}/lib/site.rb"
+      if File.exists? File.join(lib_path, "site.rb")  # "#{root}/lib/site.rb"
         # In server mode, we want to reload it every time... right?
-        source= IO.readlines("#{root}/lib/site.rb").join('')
+        source= IO.readlines( File.join(lib_path,"site.rb") ).join('')
         DSL.class_eval source
+        # TODO: Find a good place to define where source folder should be defined.
+        # In case the source folder has changed.
+        src= File.expand_path Gumdrop.config.source_dir #File.join root, 'source'      
+        @source_path= src.split '/'
       end
 
       Build.run root, src, opts

data/lib/gumdrop/build.rb

@@ -65,6 +65,7 @@ module Gumdrop
     def render
       unless opts[:dry_run]
         output_base_path= File.expand_path(Gumdrop.config.output_dir)
+        Gumdrop.report "[Compiling to #{output_base_path}]", :info
         Gumdrop.site.keys.sort.each do |path|
           node= Gumdrop.site[path]
           output_path= File.join(output_base_path, node.to_s)

data/lib/gumdrop/content.rb

@@ -11,7 +11,7 @@ module Gumdrop
       @level= (@path.split('/').length - 2)
       @source_filename= File.basename path
       filename_parts= @source_filename.split('.')
-      @filename= filename_parts[0..1].join('.')      
+      @filename= filename_parts[0..1].join('.') # TODO: Fix this! breaks on files like jquery-1.7.1.min.js ...  becomes jquery-1
       path_parts= @path.split('/')
       path_parts.shift
       path_parts.pop

data/lib/gumdrop/generator.rb

@@ -65,7 +65,7 @@ module Gumdrop
         end
       end
       if opts[:prune] and opts[:root]
-        sp = File.expand_path('./source')
+        sp = File.expand_path( Gumdrop.config.source_dir )
         rp = File.expand_path(opts[:root])
         relative_root = rp.gsub(sp, '')[1..-1]
         rrlen= relative_root.length - 1

data/lib/gumdrop/server.rb

@@ -46,7 +46,8 @@ module Gumdrop
           content.render
         else
           Gumdrop.log.info "[#{$$}]  *Static: #{file_path}"
-          send_file "source/#{file_path}"
+          source_base_path= File.expand_path(Gumdrop.config.source_dir)
+          send_file File.join( source_base_path, file_path)
         end
       else
         Gumdrop.log.error "[#{$$}]  *Missing: #{file_path}"

data/lib/gumdrop/template/backbone/lib/site.rb

@@ -46,6 +46,9 @@ generate do
 
 end
 
+# Example of skipping a source file from compilation (stitch ignores this setting)
+# skip 'file-to-ignore.html'
+
 # Example of using a content filter to compress CoffeeScript/JS output
 # require 'jsmin'
 # content_filter do |content, info|

data/lib/gumdrop/template/default/lib/site.rb

@@ -36,7 +36,7 @@ Slim::Engine.set_default_options pretty:true
 #     """
 #   end
 #
-#   stitch 'app.js', :paths=>['source/app_src'], :root=>'source/app_src', :compress=>true, :prune=>true # Prune will remove the source files from the output tree -- you can add :dependencies=>['dir'] too
+#   stitch 'app.js', :identifier=>'app', :paths=>['source/app_src'], :root=>'source/app_src', :compress=>true, :prune=>true # Prune will remove the source files from the output tree -- you can add :dependencies=>['dir'] too
 #
 #   # Maybe for a tumblr-like pager
 #   pager= Gumdrop.data.pager_for :posts, base_path:'posts/page', page_size:5
@@ -45,3 +45,6 @@ Slim::Engine.set_default_options pretty:true
 #   end
 #   
 # end
+
+# Example of skipping a source file from compilation (stitch ignores this setting)
+# skip 'file-to-ignore.html'

data/lib/gumdrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70270329173780 !ruby/object:Gem::Requirement
+  requirement: &70326608344860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329173780
+  version_requirements: *70326608344860
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70270329172920 !ruby/object:Gem::Requirement
+  requirement: &70326608344040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329172920
+  version_requirements: *70326608344040
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70270329171720 !ruby/object:Gem::Requirement
+  requirement: &70326608342600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329171720
+  version_requirements: *70326608342600
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70270329170680 !ruby/object:Gem::Requirement
+  requirement: &70326608341700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329170680
+  version_requirements: *70326608341700
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70270329169640 !ruby/object:Gem::Requirement
+  requirement: &70326608340560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329169640
+  version_requirements: *70326608340560
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70270329168420 !ruby/object:Gem::Requirement
+  requirement: &70326608339560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329168420
+  version_requirements: *70326608339560
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70270329167340 !ruby/object:Gem::Requirement
+  requirement: &70326608338420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329167340
+  version_requirements: *70326608338420
 - !ruby/object:Gem::Dependency
   name: bundle
-  requirement: &70270329165840 !ruby/object:Gem::Requirement
+  requirement: &70326608336800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70270329165840
+  version_requirements: *70326608336800
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables: