stack 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,6 +1,8 @@
 = stack
 
-Description goes here.
+Generates a static site from template files in Liquid, Markdown and Textile, based on Jekyll and Tzatziki.
+
+Within template files, stack allows you to use bi-directional YAML variables and include files.
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -10,9 +10,15 @@ begin
     gem.email = "dev@sixones.com"
     gem.homepage = "http://github.com/sixones/stack"
     gem.authors = ["sixones"]
+    
     gem.files = FileList['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
+    
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    
     gem.add_dependency "liquid", ">= 1.9.0"
+    gem.add_dependency "RedCloth", ">= 4.2.1"
+    gem.add_dependency "maruku", ">= 0.5.9"
+    gem.add_dependency "less", ">= 1.0.0"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 3
+:patch: 4

data/lib/core_ext/hash.rb

@@ -1,3 +1,9 @@
+class String
+  def liquify(payload)
+    return Liquid::Template.parse(self).render(Mash.new(payload))
+  end
+end
+
 class Hash
 
   # Returns a new hash just like this one, but with all the string keys expressed as symbols.

data/lib/stack/generator.rb

@@ -1,9 +1,21 @@
 module Stack
   class Generator
+    attr_accessor :parent
+    attr_accessor :source, :target
+    
+    attr_accessor :children
     attr_accessor :layouts
     attr_accessor :pages
     
-    def initialize
+    def initialize(source, target, parent = nil)
+      self.source = source
+      self.target = target
+      self.parent = parent
+      
+      self.layouts = (parent) ? parent.layouts.dup : { }
+      
+      self.children = [ ]
+
       # read layouts
       # read pages
       # write pages
@@ -14,24 +26,50 @@ module Stack
     def process!
       read_layouts
       read_pages
+      
+      read_children
     end
     
     def read_layouts
-      @layouts = read_pages_from_directory("_layouts", Stack::Templates::Layout)
+      if File.exists?(File.join(self.source, "_layouts"))
+        @layouts = @layouts.merge(read_pages_from_directory("_layouts", Stack::Templates::Layout))
+      end
     end
     
     def read_pages
-      @pages = read_pages_from_directory(Stack::runner.configuration.source, Stack::Templates::Page)
+      @pages = read_pages_from_directory(self.source, Stack::Templates::Page)
+    end
+    
+    def read_children
+      entries = Dir.entries(self.source)
+      directories = entries.select { |e| File.directory?(File.join(self.source, e)) }
+      directories = directories.reject { |d| d[0..0]=~/\.|_/ or d[-1..-1]=="~" }
+      directories.each do |dir|
+        self.children.push(Stack::Generator.new(File.join(self.source, dir), File.join(self.target, dir), self))
+      end
     end
     
     def transform!
-      puts @layouts
-      puts @pages
-      
       self.pages.each do |name, page|
-        puts "Page -> #{name} #{page}"
         page.write!
       end
+      
+      transform_assets
+      
+      self.children.each { |c| c.transform! }
+    end
+    
+    def transform_assets
+      files = Dir.entries(self.source)
+      files = files.reject { |e| File.directory?(File.join(self.source, e)) }
+      files = files.reject { |e| e[0..0]=~/\.|_/ or e[-1..-1]=="~" }
+      files = files.reject { |e| (%w(.yaml .yml)+Stack::EXTENSIONS).include?(File.extname(e)) } # Exception cases
+    
+      FileUtils.mkdir_p(self.target)
+      
+      files.each do |f|
+        FileUtils.cp(File.join(self.source, File.basename(f)), File.join(self.target, File.basename(f)))
+      end
     end
     
     def to_hash
@@ -45,16 +83,18 @@ module Stack
       pages = { }
       
       begin
-        path = (folder == Stack::runner.configuration.source) ? folder : File.join(Stack::runner.configuration.source, folder)
-        entries = Dir.entries(path)
+        path = (folder == self.source) ? folder : File.join(self.source, folder)
+        folder = (folder == self.source) ? folder : ""
         
+        entries = Dir.entries(path)
+
         files = entries.reject { |e| File.directory?(File.join(path, e)) }
         files = files.reject { |e| e[0..0]=~/\.|_/ or e[-1..-1]=="~" }
         files = files.select { |e| Stack::EXTENSIONS.include?(File.extname(e)) }
         
         files.each do |f|
           trans = transformable_klass.new(File.join(path, f), self)
-          pages[f.split(".").first] = trans
+          pages["#{f.split(".").first}"] = trans
         end
       rescue Errno::ENOENT => e
         # Ignore

data/lib/stack/parsable.rb

@@ -6,12 +6,10 @@ module Stack
     
     def parse!(raw_doc = self.raw, defaults = { })
       self.data, self.raw = extract_yaml(raw_doc, nil, defaults)
-      
-      puts self.data
     end
     
     def payload
-      self.data.deep_symbolize.merge(:inline_data => inline_data)
+      self.data.deep_symbolize.merge(:data => inline_data)
     end
     
     def extract_yaml(raw, replace = nil, defaults = { })
@@ -21,13 +19,9 @@ module Stack
       out = raw.dup
       i = -1
       
-      puts "out -> #{out}"
-      
       while out =~ /^(---\s*\n.*?\n?)(---.*?\n)/m
         yaml = $1.dup
-        out = out.gsub(/#{Regexp.escape(yaml)}#{Regexp.escape($2)}/m,((i>-1) ? "{{ document.inline_data[#{i}] | render_table }}" : ""))
-        
-        puts "out2 -> #{out}"
+        out = out.gsub(/#{Regexp.escape(yaml)}#{Regexp.escape($2)}/m,((i>-1) ? "{{ document.data[#{i}] | render_table }}" : ""))
         
         d = YAML.load(yaml)
         

data/lib/stack/runner.rb

@@ -37,7 +37,7 @@ module Stack
     
     # Runs the specified command 
     def run_command
-      @generator = Stack::Generator.new
+      @generator = Stack::Generator.new(Stack::runner.configuration.source, Stack::runner.configuration.target)
       @generator.transform!
     end
   end

data/lib/stack/template.rb

@@ -4,15 +4,25 @@ module Stack
     
     attr_accessor :basename
     attr_accessor :path
+    attr_accessor :original_extension
+    attr_accessor :extension
     
     attr_accessor :raw
     
     def initialize(path, generator = nil)
       self.generator = generator
       self.path = path
+      self.original_extension = "html"
       
       if File.file?(path)
         self.basename = File.basename(path)
+        ext = File.extname(path)
+
+        self.original_extension = ext[1, ext.length]
+        self.extension = self.original_extension
+        
+        puts self.original_extension
+        puts self.extension
         
         read
       end
@@ -26,15 +36,33 @@ module Stack
     
     def render(_payload = { }, do_layout = true)
       _payload = template_payload.deep_merge(_payload)
-
-      content = Liquid::Template.parse(self.raw).render(_payload)
+      
+      layout_name = _payload[:layout]
+      
+      if (layout_name and do_layout)
+        puts "has layout! #{layout_name}"
+        
+        # get layout 
+        _tpl_payload = self.generator.layouts[layout_name].template_payload
+        _tpl_payload.delete(:layout)
+        
+        puts _tpl_payload.inspect
+        puts "\n"
+        
+        _payload = _payload.merge(_tpl_payload)
+      end
+      
+      puts _payload.inspect
+      puts "\n\n"
+      
+      content = Liquid::Template.parse(self.raw).render(Mash.new(_payload))
       content = self.transform(content)
       
-      if (layout_name = _payload[:layout]) and (do_layout)
+      if (layout_name and do_layout)
         _payload.delete(:layout)
         begin
-          _payload = _payload.deep_merge({ "content" => content })
-          puts _payload
+          _payload = _payload.merge({ :content => content })
+
           content = self.generator.layouts[layout_name].render(_payload)
         rescue => e
           STDERR.puts e.to_str
@@ -46,6 +74,7 @@ module Stack
     
     def template_payload
       {
+        :template => self.to_hash,
         :generator => self.generator.to_hash
       }.merge(self.payload)
     end
@@ -54,20 +83,31 @@ module Stack
       raise InterfaceNotProvided
     end
     
+    def to_hash
+      {
+        
+      }.merge(self.payload)
+    end
+    
     def transform(content = self.raw)
       case self.basename
       when /\.textile/
+        self.extension = "html"
         RedCloth.new(content).to_html
-      when /\.(mdown|markdown)/
+      when /\.(mdown|markdown|mkdn|md)/
+        self.extension = "html"
         Maruku.new(content).to_html
+      when /\.(less)/
+        self.extension = "css"
+        Less::Engine.new(content).to_css
+      when /\.(liquid|liq)/
+        self.extension = "html"
       else
         content
       end
     end
     
     def write!(content = self.render)
-      puts write_path
-      
       FileUtils.mkdir_p(File.dirname(write_path))
       out = File.open(write_path, "w+")
       out.rewind
@@ -76,20 +116,19 @@ module Stack
     end
     
     def write_path
-      File.join(Stack::runner.configuration.target, self.write_filename)
+      File.join(self.generator.target, self.write_filename)
     end
     
     def write_basename
-      if basename
-        ext = File.extname(basename)
-        basename[0..(basename.length - ext.length - 1)]
+      if self.basename
+        self.basename.gsub(".#{self.original_extension}", "")
       else
         @write_basename ||= Digest::MD5.hexdigest(self.raw)
       end
     end
     
     def write_filename
-      "#{write_basename}.html"
+      "#{write_basename}.#{self.extension}"
     end
   end
 end

data/lib/stack/templates/page.rb

@@ -9,6 +9,10 @@ module Stack
         
         parse!
       end
+      
+      def payload
+        super
+      end
     end
   end
 end

data/lib/stack.rb

@@ -1,7 +1,13 @@
 # rubygems
 require 'rubygems'
+
 require 'optparse'
+
 require 'liquid'
+require 'maruku'
+require 'mash'
+require 'RedCloth'
+require 'less'
 
 require 'core_ext/hash'
 
@@ -25,8 +31,8 @@ module Stack
   # Array of valid commands stack can use
   COMMANDS = %w(create generate server)
   
-  # Array of valid extensions
-  EXTENSIONS = %w(.html .markdown .mdown)
+  # Array of transformable extensions (these extensions go through the liquid transformer)
+  EXTENSIONS = %w(.html .markdown .mdown .mkdn .md .textile .js .css)
   
   class << self
     attr_accessor :runner
@@ -48,7 +54,7 @@ module Stack
       opts.on("-t", "--target [DIR]", "Directory to use as the target directory") do |l| config[:target] = l unless l.nil? end
       
       opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
-      opts.on_tail("-v", "--version" "Show version") do puts "stack #{Stack::version}"; exit; end
+      opts.on_tail("-v", "--version", "Show version") do puts "stack #{Stack::version}"; exit; end
     end
     
     parser.parse! argv
@@ -61,7 +67,7 @@ module Stack
   # Merges the configuration from YAML file, command line and defaults
   def self.configuration(override)
     config = { }
-    source = File.join(override['source'] || Stack::DEFAULTS[:source])
+    source = File.join(override[:source] || Stack::DEFAULTS[:source])
     
     config_file = File.join(source, "_stack.yml")
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stack
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - sixones
@@ -32,6 +32,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.9.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 4.2.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: less
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: Generates a static site from template files in Liquid, Markdown and Textile.
 email: dev@sixones.com
 executables: