gumdrop 0.6.1 → 0.6.2

data/.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
 *.gem
-examples/**/output
+output
 .sass-cache
-old_examples

data/ChangeLog.md

@@ -1,3 +1,9 @@
+# v0.6.2
+- Consolidated stitch support code into single file
+- Bugfix: Generates better relative paths for Content objects
+- Cleaned up paths in Content
+- Updated project templates
+
 # v0.6.1
 - Content filters are run for dev server requests now too.
 - Added config.env, defaults to 'production' (override from cli with -e)

data/Readme.md

@@ -180,3 +180,10 @@ Here's the `Gumdrop` file created by the default template:
 - Partials
 - Config and using in pages
 - Project Templates
+
+# Todo / Ideas / Changes
+- New/Update Doc site.
+- Need test coverage.
+- Some kind of admin? What would that even do?
+    - If you could specify a 'prototype' for data collections, could be cool.
+- Add YamlDoc support for nodes? (Tilt compiler? or in Content)

data/gumdrop.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
 
    s.authors = ["Matt McCray"]
    s.email = %q{matt@elucidata.net}
-   s.summary = %q{A sweet 'n simple cms/prototyping tool.}
+   s.summary = %q{The sweet 'n simple cms/prototyping tool.}
    s.homepage = %q{https://github.com/darthapo/gumdrop}
-   s.description = %q{A sweet 'n simple cms/prototyping tool for creating static html websites and webapps.}
+   s.description = %q{The sweet 'n simple cms/prototyping tool for creating static html websites and webapps.}
 
    s.files         = `git ls-files`.split("\n")
    s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/gumdrop/content.rb

@@ -3,32 +3,32 @@ module Gumdrop
   
   class Content
     
-    attr_accessor :path, :level, :filename, :source_filename, :type, :ext, :uri, :slug, :template, :params, :site, :ignored
+    attr_accessor :path, 
+                  :level, 
+                  :filename, 
+                  :source_filename, 
+                  :type, 
+                  :ext, 
+                  :uri, 
+                  :slug, 
+                  :template, 
+                  :params, 
+                  :site, 
+                  :ignored, 
+                  :full_path
     
     def initialize(path, site, params={})
       @site= site
       @params= HashObject.new params
-      @path= path
-      @level= (@path.split('/').length - 2)
-      @source_filename= File.basename path
+      @full_path= path
       @ignored= false
-
-      filename_parts= @source_filename.split('.')
-      ext= filename_parts.pop
-      while !Tilt[ext].nil?
-        ext= filename_parts.pop
-      end
-      filename_parts << ext # push the last file ext back on there!
-      @filename= filename_parts.join('.')
-
-      path_parts= @path.split('/')
-      path_parts.shift
-      path_parts.pop
-      path_parts.push @filename
-
+      @path= get_source_path
+      @level= (@path.split('/').length - 1)
+      @source_filename= File.basename path
+      @filename= get_target_filename
       @type= File.extname @source_filename
       @ext= File.extname @filename
-      @uri= path_parts.join('/')
+      @uri= get_uri
       @slug=@uri.gsub('/', '-').gsub(@ext, '')
       @template= unless Tilt[path].nil?
         Tilt.new path
@@ -67,21 +67,21 @@ module Gumdrop
     
     def copyTo(output, layout=nil, opts={})
       do_copy= if File.exists? output
-        !FileUtils.identical? @path, output
+        !FileUtils.identical? @full_path, output
       else
         true
       end
       if do_copy
         @site.report "   Copying: #{@uri}", :warning
-        FileUtils.cp_r @path, output, opts
+        FileUtils.cp_r @full_path, output, opts
       else
         @site.report "    (same): #{@uri}", :info
       end
     end
     
     def mtime
-      if File.exists? @path
-        File.new(@path).mtime
+      if File.exists? @full_path
+        File.new(@full_path).mtime
       else
         Time.now
       end
@@ -94,6 +94,36 @@ module Gumdrop
     def to_s
       @uri
     end
+  
+  private
+
+    def get_source_path
+      path= @full_path.sub @site.src_path, ''
+      if path[0] == '/'
+        path[1..-1] 
+      else
+        path
+      end
+    end
+
+    def get_target_filename
+      filename_parts= @source_filename.split('.')
+      ext= filename_parts.pop
+      while !Tilt[ext].nil?
+        ext= filename_parts.pop
+      end
+      filename_parts << ext # push the last file ext back on there!
+      filename_parts.join('.')
+    end
+
+    def get_uri
+      uri= File.join File.dirname(@path), @filename #  path_parts.join('/')
+      if uri.starts_with? './'
+        uri[2..-1]
+      else
+        uri
+      end
+    end
     
   end
   

data/lib/gumdrop/generator.rb

@@ -17,6 +17,7 @@ module Gumdrop
       @pages= []
     end
     
+    # This should probably not be accessible to the generators
     def execute
       if @content.is_a? Proc
         run_dsl_from_proc @content
@@ -41,9 +42,9 @@ module Gumdrop
       name= name[1..-1] if name.starts_with?('/')
       opts= params.reverse_merge(opts)
       filepath= if @base_path.empty?
-        "/#{name}"
+        File.join @site.src_path, name
       else
-        "/#{@base_path}/#{name}"
+        File.join @site.src_path, @base_path, @name
       end
       content= GeneratedContent.new(filepath, block, @site, opts)
       if opts.has_key? :template and !opts[:template].nil?
@@ -74,8 +75,7 @@ module Gumdrop
     end
     
     def stitch(name, opts)
-      require 'gumdrop/stitch_ex'
-      require 'gumdrop/stitch_compilers'
+      require 'gumdrop/stitch_support'
       content= Stitch::Package.new(opts).compile
       page name do
         case opts[:compress]
@@ -120,6 +120,8 @@ module Gumdrop
         end
       end
     end
+
+  private
     
     def run_dsl_from_source(source)
       # puts source

data/lib/gumdrop/site.rb

@@ -21,9 +21,7 @@ module Gumdrop
     
     attr_reader :opts,
                 :root_path, 
-                :root_path_parts,
                 :src_path,
-                :src_path_parts,
                 :blacklist,
                 :greylist,
                 :redirects,
@@ -41,7 +39,6 @@ module Gumdrop
     def initialize(sitefile, opts={})
       @sitefile        = File.expand_path sitefile
       @root_path       = File.dirname @sitefile
-      @root_path_parts = @root_path.split('/')
       @opts            = opts
       reset_all()
     end
@@ -175,14 +172,12 @@ module Gumdrop
       #puts "Running in: #{root}"
       Dir.glob("#{src_path}/**/*", File::FNM_DOTMATCH).each do |path|
         unless File.directory? path or @config.ignore.include?( File.basename(path) )
-          file_path = (path.split('/') - @root_path_parts).join '/'
-          node= Content.new(file_path, self)
+          node= Content.new(path, self)
           path= node.to_s
           if blacklist.any? {|pattern| path_match path, pattern }
             report "-excluding: #{path}", :info
           else
             node.ignored= greylist.any? {|pattern| path_match path, pattern }
-
             # Sort out Layouts, Generators, and Partials
             if File.extname(path) == ".template"
               layouts[path]= node
@@ -203,7 +198,6 @@ module Gumdrop
           end
         end
       end
-      
     end
 
     def run_generators

data/lib/gumdrop/{stitch_compilers.rb → stitch_support.rb}

@@ -1,4 +1,19 @@
+
 require 'stitch-rb'
+# require 'stitch'
+
+class Stitch::Source
+  # Patch for gumdrop style filenames
+  def name
+    name = path.relative_path_from(root)
+    name = name.dirname + name.basename(".*")
+    name.to_s.gsub(".js", '')
+  end
+end
+
+
+# Custom Compilers
+
 
 class SerenadeCompiler < Stitch::Compiler
   
@@ -14,6 +29,7 @@ class SerenadeCompiler < Stitch::Compiler
   
 end
 
+# Not so sure on this one...
 class HoganCompiler < Stitch::Compiler
   # List of supported extensions
   extensions :mustache

data/lib/gumdrop/version.rb

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

data/lib/gumdrop.rb

@@ -24,8 +24,13 @@ module Gumdrop
       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/default/source/theme/templates/site.template.slim

@@ -18,7 +18,7 @@ html lang="en"
         nav
           ul
             li
-              a href==uri('/') Home
+              a href==uri('/index.html') Home
     article
       div.row
         div.col.span-8

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Matt McCray
@@ -95,7 +95,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-description: A sweet 'n simple cms/prototyping tool for creating static html websites and webapps.
+description: The sweet 'n simple cms/prototyping tool for creating static html websites and webapps.
 email: matt@elucidata.net
 executables: 
 - gumdrop
@@ -108,7 +108,6 @@ files:
 - ChangeLog.md
 - Gemfile
 - License
-- Notes.md
 - Rakefile
 - Readme.md
 - bin/gumdrop
@@ -123,8 +122,7 @@ files:
 - lib/gumdrop/proxy_handler.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/site.rb
-- lib/gumdrop/stitch_compilers.rb
-- lib/gumdrop/stitch_ex.rb
+- lib/gumdrop/stitch_support.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb
 - specs/content_spec.rb
@@ -200,6 +198,6 @@ rubyforge_project: gumdrop
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A sweet 'n simple cms/prototyping tool.
+summary: The sweet 'n simple cms/prototyping tool.
 test_files: []
 

data/Notes.md

@@ -1,38 +0,0 @@
-# Future Features/Changes
-- Some kind of admin? What would that even do?
-  - If you could specify a 'prototype' for data collections, could be cool.
-- Multiple source_dir?
-  - `set :source_dir, ['./source/a', './source/b']
-  - What would happen with conflicts, last one in wins?
-- Multiple data_dir too?
-- Add YamlDoc support for nodes? (Tilt compiler? or in Content)
-- configure block for each env/mode?
-
-# TODO:
-- New/Update Doc Site
-- API for retrieving pages and pages under a path (simple query)
-- Need test coverage.
-
-- Extract Build class into a Site class that can be instansiated (so multiple site can be loaded/run in memory)
-
-
-# Possible New Internals
-- Gumdrop (module)
-  - Site (class)
-    - SiteFileDSL (was DSL)
-    - Node (was Content)
-    - NodeGenerator (was Generator)
-  - Data (module)
-    - Manager (was DataManager)
-    - Collection
-    - Object
-    - Pager
-  - Server (module)
-    - NodeHandler
-    - ProxyHandler
-  - Render (module)
-    - Context
-    - ViewHelpers
-    - StitchCompilers
-  - Utils (module)
-    - Logging

data/lib/gumdrop/stitch_ex.rb

@@ -1,14 +0,0 @@
-
-require 'stitch'
-
-
-class Stitch::Source
-  # Patch for gumdrop style filenames
-  def name
-    name = path.relative_path_from(root)
-    name = name.dirname + name.basename(".*")
-    name.to_s.gsub(".js", '')
-  end
-end
-
-