stack 0.0.7 → 0.0.8

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 7
+:patch: 8

data/lib/stack/generator.rb

@@ -5,6 +5,7 @@ module Stack
     
     attr_accessor :children
     attr_accessor :layouts
+    attr_accessor :articles
     attr_accessor :pages
     
     attr_accessor :remove_first
@@ -19,6 +20,7 @@ module Stack
       self.remove_first = false
       
       self.layouts = (parent) ? parent.layouts.dup : { }
+      self.articles = (parent) ? parent.articles.dup : { }
       
       self.children = [ ]
 
@@ -32,6 +34,7 @@ module Stack
     def process!
       self.processed_at = Time.now
       
+      read_articles
       read_layouts
       read_pages
       
@@ -44,6 +47,12 @@ module Stack
       end
     end
     
+    def read_articles
+      if File.exists?(File.join(self.source, "_articles"))
+        @articles = @articles.merge(read_pages_from_directory("_articles", Stack::Templates::Article))
+      end
+    end
+    
     def read_pages
       @pages = read_pages_from_directory(self.source, Stack::Templates::Page)
     end
@@ -53,24 +62,46 @@ module Stack
       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))
+        gen = Stack::Generator.new(File.join(self.source, dir), File.join(self.target, dir), self)
+        #gen.process!
+        self.children.push(gen)
       end
     end
     
-    def transform!
+    def transform!(match_only = nil)
       if self.remove_first
         FileUtils.rm_r self.target
       end
       
       self.transformed_at = Time.now
       
+      self.articles.each do |name, article|
+        if (match_only)
+          match_only.each { |m|
+            if File.dirname(m.path) == File.dirname(article.path) && File.basename(m.path) == article.basename
+              article.write!
+            end
+          }
+        else
+          article.write!
+        end
+      end
+      
       self.pages.each do |name, page|
-        page.write!
+        if (match_only)
+          match_only.each { |m|
+            if File.dirname(m.path) == File.dirname(page.path) && File.basename(m.path) == page.basename
+              page.write!
+            end
+          }
+        else
+          page.write!
+        end
       end
       
       transform_assets
       
-      self.children.each { |c| c.transform! }
+      self.children.each { |c| c.transform!(match_only) }
     end
     
     def transform_assets
@@ -90,8 +121,20 @@ module Stack
       {
         :processed_at => self.processed_at,
         :transformed_at => self.transformed_at,
-        :time => Time.now
+        :time => Time.now,
+        :articles => self.articles_payload
+      }
+    end
+    
+    def articles_payload
+      a = Array.new
+      
+      self.articles.each { |name, article|
+        article.inspect
+        a.push(article.payload)
       }
+      
+      a
     end
     
     private    

data/lib/stack/runner.rb

@@ -7,6 +7,7 @@ module Stack
     
     def initialize(argv)
       @argv = argv
+
       @options = { }
       
       parse!
@@ -48,6 +49,8 @@ module Stack
           watcher = Stack::Watcher.new(@generator)
           watcher.keep_alive = false
           watcher.observe
+        else
+          #@generator.transform!
         end
         # and a server
         server = Stack::Server.new(@generator)

data/lib/stack/server.rb

@@ -21,6 +21,8 @@ module Stack
         self.http_server.start
       }
       
+      trap("INT") { self.http_server.shutdown }
+      
       self.thread.join()
     end
   end

data/lib/stack/template.rb

@@ -37,6 +37,11 @@ module Stack
       layout_name = _payload[:layout]
       
       if (layout_name and do_layout)
+        if !self.generator.layouts[layout_name]
+          puts "The layout `#{layout_name}` does not exist in `_layouts`."
+          exit
+        end
+        
         # get layout 
         _tpl_payload = self.generator.layouts[layout_name].template_payload
         _tpl_payload.delete(:layout)
@@ -49,6 +54,14 @@ module Stack
         _payload = _payload.merge(_tpl_payload)
       end
       
+      # here we have the payload
+      # look for the permalink?
+      permalink = _payload[:permalink]
+      
+      if (permalink)
+        self.path = permalink
+      end
+      
       #puts _payload.inspect
       #puts "\n\n"
       

data/lib/stack/templates/article.rb

@@ -0,0 +1,32 @@
+module Stack
+  module Templates
+    class Article
+      include Template
+      include Parsable
+      
+      attr_accessor :content
+      
+      def initialize(*args)
+        super
+        
+        parse!
+      end
+      
+      def write!(*args)
+        super
+      end
+      
+      def transform(content = self.raw)
+       self.content = super
+       
+       self.content
+      end
+      
+      def payload
+        super.merge({
+          :content => self.content
+        })
+      end
+    end
+  end
+end

data/lib/stack/watcher.rb

@@ -3,7 +3,8 @@ module Stack
     attr_accessor :source, :target
     attr_accessor :generator
     attr_accessor :directory_watcher
-    attr_accessor :keep_alive
+    attr_accessor :keep_alive, :is_first_observe
+    attr_accessor :thread
     
     def initialize(generator)
       self.generator = generator
@@ -11,6 +12,8 @@ module Stack
       self.target = self.generator.target
       
       self.keep_alive = true
+      
+      require 'directory_watcher'
     end
     
     def observe
@@ -28,20 +31,33 @@ module Stack
       self.directory_watcher.glob = dirs
       
       self.directory_watcher.add_observer do |*args|
-        time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{time}] #{args.size} files changed."
-        self.generator.process!
-        self.generator.transform!
+        if self.is_first_observe
+          self.is_first_observe = false
+        else
+          time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{time}] #{args.size} files changed."
+          self.generator.process!
+        
+          self.generator.transform!
         
-        time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
-        puts "[#{time}] #{args.size} files processed."
+          time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
+          puts "[#{time}] #{args.size} files processed."
+        end
       end
       
-      self.directory_watcher.start
+      #self.directory_watcher.start
       
-      if self.keep_alive
-        loop { sleep 1000 }
-      end
+      self.thread = Thread.new {
+        self.directory_watcher.start
+      }
+      
+      trap("INT") { self.directory_watcher.stop }
+      
+      self.thread.join()
+      
+      #if self.keep_alive
+      #  loop { sleep 1000 }
+      #end
     end
   end
 end

data/lib/stack.rb

@@ -2,7 +2,6 @@
 require 'rubygems'
 
 require 'optparse'
-require 'directory_watcher'
 require 'liquid'
 require 'maruku'
 require 'mash'
@@ -29,6 +28,7 @@ require 'stack/filters/datetime'
 require 'stack/filters/string'
 
 require 'stack/templates/page'
+require 'stack/templates/article'
 require 'stack/templates/layout'
 
 require 'stack/utils/standard'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stack
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - sixones
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 +00:00
+date: 2009-11-02 00:00:00 +00:00
 default_executable: stack
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - lib/stack/runner.rb
 - lib/stack/server.rb
 - lib/stack/template.rb
+- lib/stack/templates/article.rb
 - lib/stack/templates/layout.rb
 - lib/stack/templates/page.rb
 - lib/stack/utils/standard.rb