awestructx 0.4.1.x1 → 0.4.1

data/lib/awestruct/astruct_mixin.rb

@@ -1,6 +1,4 @@
 
-require 'awestruct/dependencies'
-
 module Awestruct
 
   module AStructMixin
@@ -23,7 +21,7 @@ module Awestruct
 
     def [](key)
       r = super( key ) || super( key.to_sym ) || super( key.to_s  )
-      transform_entry( key, r )
+      transform_entry( r )
     end
 
     def method_missing(sym, *args, &blk)
@@ -48,11 +46,8 @@ module Awestruct
       end
     end
 
-    UNTRACKED_KEYS = [
-      :url,
-    ]
 
-    def transform_entry(for_key, entry)
+    def transform_entry(entry)
       r = case(entry)
         when AStructMixin
           entry
@@ -60,15 +55,10 @@ module Awestruct
           #AStruct.new( entry )
           entry.extend( AStructMixin )
         when Array
-          entry.map!{|i| transform_entry( for_key, i)}
+          entry.map!{|i| transform_entry(i)}
         else
           entry
       end
-      if ( self.is_a? Awestruct::Page )
-        unless UNTRACKED_KEYS.include? for_key.to_sym
-          Awestruct::Dependencies.track_dependency( self )
-        end
-      end
       r
     end
 

data/lib/awestruct/cli/auto.rb

@@ -4,31 +4,17 @@ module Awestruct
   module CLI
     class Auto
 
-      def initialize(config)
-        @config = config
+      def initialize(path)
+        @path = path
       end
 
       def run()
         Guard.setup
-        Guard.start( :guardfile_contents=>guardfile_contents,
-                     :watchdir=>@config.dir,
+        Guard.start( :guardfile=>File.dirname(__FILE__) + '/Guardfile', 
+                     :watchdir=>@path,
                      :watch_all_modifications=>true )
       end
 
-      def guardfile_contents
-        ignored = [ 
-          "'.awestruct'",
-          "'#{File.basename( @config.tmp_dir )}'",
-          "'#{File.basename( @config.output_dir )}'",
-        ] 
-        c = ''
-        c += "guard :awestruct do\n"
-        c += "  watch %r(.*)\n"
-        c += "  ignore_paths #{ignored.join(', ')}"
-        c += "end\n"
-        c
-      end
     end
-
   end
 end

data/lib/awestruct/cli/invoker.rb

@@ -3,7 +3,6 @@ require 'awestruct/cli/options'
 require 'awestruct/cli/generate'
 require 'awestruct/cli/auto'
 require 'awestruct/cli/server'
-require 'awestruct/cli/deploy'
 
 require 'pathname'
 
@@ -65,7 +64,6 @@ module Awestruct
 
       def setup_config()
         @config = Awestruct::Config.new( Dir.pwd )
-        @config.track_dependencies = true if ( options.auto )
       end
 
       def invoke_init()
@@ -75,7 +73,6 @@ module Awestruct
       end
 
       def invoke_force()
-        FileUtils.rm_rf( File.join( config.dir, '.awestruct', 'dependency-cache' ) )
         FileUtils.rm_rf( config.output_dir )
       end
 
@@ -84,18 +81,10 @@ module Awestruct
       end
 
       def invoke_deploy()
-        deploy_config = profile[ 'deploy' ]
-
-        if ( deploy_config.nil? )
-          $stderr.puts "No configuration for 'deploy'"
-          return
-        end
-
-        Awestruct::CLI::Deploy.new( config, deploy_config ).run
       end
 
       def invoke_auto()
-        run_in_thread( Awestruct::CLI::Auto.new( config ) )
+        run_in_thread( Awestruct::CLI::Auto.new( config.dir ) )
       end
 
       def invoke_server()

data/lib/awestruct/config.rb

@@ -12,10 +12,6 @@ module Awestruct
     attr_accessor :skin_dir
     attr_accessor :tmp_dir
     attr_accessor :ignore
-    attr_accessor :track_dependencies
-
-    attr_accessor :images_dir
-    attr_accessor :stylesheets_dir
 
     def initialize(dir = Dir.pwd)
       @dir            = Pathname.new( dir ) 
@@ -26,13 +22,7 @@ module Awestruct
       @extension_dir  = Pathname.new( File.join(dir, '_ext') )
       @skin_dir       = Pathname.new( File.join(dir, '_skin') )
       @tmp_dir        = Pathname.new( File.join(dir, '_tmp') ) 
-
-      @images_dir      = Pathname.new( File.join(dir, 'images') ) 
-      @stylesheets_dir = Pathname.new( File.join(dir, 'stylesheets') ) 
-
       @ignore         = File.exists?(ignore_file = File.join(dir, ".awestruct_ignore")) ? Dir[*IO.read(ignore_file).each_line.map(&:strip)] : []
-
-      @track_dependencies = false
     end
 
   end

data/lib/awestruct/engine.rb

@@ -10,7 +10,6 @@ require 'awestruct/page_loader'
 require 'awestruct/extensions/pipeline'
 
 require 'fileutils'
-require 'set'
 
 class OpenStruct
   def inspect
@@ -55,24 +54,9 @@ module Awestruct
       execute_pipeline
       configure_compass
       set_urls( site.pages )
-      build_page_index
       generate_output
     end
 
-    def build_page_index
-      site.pages_by_relative_source_path = {}
-      site.pages.each do |p|
-        if ( p.relative_source_path )
-          site.pages_by_relative_source_path[ p.relative_source_path ] = p
-        end
-      end
-      site.layouts.each do |p|
-        if ( p.relative_source_path )
-          site.pages_by_relative_source_path[ p.relative_source_path ] = p
-        end
-      end
-    end
-
     def set_base_url(base_url, default_base_url)
       if ( base_url )
         site.base_url = base_url
@@ -208,46 +192,28 @@ module Awestruct
         if ( page.stale_output?( generated_path ) )
           generate_page( page, generated_path )
         else
-          generate_page( page, generated_path, false )
+          puts "Up-to-date: #{generated_path}"
         end
       end
     end
 
-    def generate_page(page, generated_path, produce_output=true)
-      if ( produce_output )
-        puts "Generating: #{generated_path}"
-        FileUtils.mkdir_p( File.dirname( generated_path ) )
-        File.open( generated_path, 'w' ) do |file|
-          file << page.rendered_content
-        end
-      elsif ( site.config.track_dependencies )
-        if page.dependencies.load!
-          puts "Cached:     #{generated_path}"
-        else
-          puts "Analyzing:  #{generated_path}"
-          page.rendered_content
-        end
+    def generate_page(page, generated_path)
+      puts "Generating: #{generated_path}"
+      FileUtils.mkdir_p( File.dirname( generated_path ) )
+      File.open( generated_path, 'w' ) do |file|
+        file << page.rendered_content
       end
     end
 
     def generate_page_by_output_path(path)
       full_path = File.join( '', path )
-      page = site.pages.find{|p| p.relative_source_path.to_s==full_path} || site.layouts.find{|p| p.relative_source_path.to_s==full_path}
-      return if page.nil?
-
-      #puts "regen page #{page.inspect}"
-      #puts "page.dependents #{page.dependencies.dependents.inspect}"
-
-      regen_pages = Set.new
-      regen_pages << page unless ( page.output_path.nil? )
-      regen_pages += page.dependencies.dependents
-
-      #puts regen_pages.collect{|e|e.output_path}.inspect
-      regen_pages.each do |p|
-        unless ( p.output_path.nil? || p.__is_layout )
-          generated_path = File.join( site.config.output_dir, p.output_path )
-          generate_page( p, generated_path )
-        end
+      #puts "regen path #{full_path}"
+      page = site.pages.find{|p| p.relative_source_path.to_s==full_path}
+      if ( page.nil? )
+        #puts "Unable to locate page for #{path}"
+      else
+        generated_path = File.join( site.config.output_dir, page.output_path )
+        generate_page(page, generated_path)
       end
     end
 

data/lib/awestruct/extensions/atomizer.rb

@@ -2,8 +2,8 @@ module Awestruct
   module Extensions
     class Atomizer
 
-      def initialize(entries, output_path, opts={})
-        @entries = entries
+      def initialize(entries_name, output_path, opts={})
+        @entries_name = entries_name
         @output_path = output_path
         @num_entries = opts[:num_entries] || 50
         @content_url = opts[:content_url]
@@ -11,7 +11,7 @@ module Awestruct
       end
 
       def execute(site)
-        entries = @entries.is_a?(Array) ? @entries : site.send( @entries ) || []
+        entries = site.send( @entries_name ) || []
         unless ( @num_entries == :all )
           entries = entries[0, @num_entries]
         end

data/lib/awestruct/extensions/minify.rb

@@ -12,10 +12,10 @@ require 'fileutils'
 #
 # These commands must be available on your PATH in order to use them.
 #
-# This class is loaded as a transformer into the Awestruct pipeline. The
+# This class is loaded as a transformer in the Awestruct pipeline. The
 # constructor accepts an array of symbols representing the file types to minimize.
 #
-#   transformer Awestruct::Extensions::Minify.new
+#   extension Awestruct::Extensions::Minify.new
 #
 # This transform recognizes the following symbols:
 #
@@ -57,28 +57,30 @@ module Awestruct
 
       def transform(site, page, input)
         if site.minify
-          ext = File.extname(page.output_path)
-          if !ext.empty?
-            ext_sym = ext[1..-1].to_sym
-            if @types.include?(ext_sym)
-              case ext_sym
-              when :html
-                print "minifying html #{page.output_path}"
-                input = htmlcompressor(page, input, site.minify_html_opts)
-              when :css
-                print "minifying css #{page.output_path}"
-                input = yuicompressor(page, input, :css)
-              when :js
-                print "minifying js #{page.output_path}"
-                input = yuicompressor(page, input, :js)
-              when :png
-                print "minifying png #{page.output_path}"
-                input = pngcrush(page, input)
-              end
+          ext = File.extname(page.output_path)[1..-1].to_sym
+          if @types.include?(ext)
+            case ext
+            when :html
+              print "minifying html #{page.output_path}"
+              htmlcompressor(page, input, site.minify_html_opts)
+            when :css
+              print "minifying css #{page.output_path}"
+              yuicompressor(page, input, :css)
+            when :js
+              print "minifying js #{page.output_path}"
+              yuicompressor(page, input, :js)
+            when :png
+              print "minifying png #{page.output_path}"
+              pngcrush(page, input)
+            else
+              input
             end
+          else
+            input
           end
+        else
+          input
         end
-        input
       end
 
       private

data/lib/awestruct/extensions/posts.rb

@@ -27,22 +27,22 @@ module Awestruct
                 date = Time.parse page.date
               end
               year = date.year
-              month = sprintf( "%02d", date.month )
-              day = sprintf( "%02d", date.day )
+              month = date.month
+              day = date.day
               page.date = Time.utc(year, month, day)
               slug = $1
             end
 
             # if a date was found create a post
             if( year and month and day)
-              page.slug ||= slug
+              page.slug = slug
               #context = OpenStruct.new({
                 #:site=>site,
                 #:page=>page,
               #})
               context = page.create_context
               #page.body = page.render( context )
-              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{page.slug}.html"
+              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{slug}.html"
               #page.layout = 'post'
               posts << page
             end

data/lib/awestruct/extensions/sitemap.rb

@@ -33,7 +33,6 @@ module Awestruct
         page                 = site.engine.load_page( sitemap )
         page.output_path     = 'sitemap.xml'
         page.sitemap_entries = sitemap_pages
-        page.do_not_track_dependencies = true
 
         # Add the sitemap to our site
         site.pages << page

data/lib/awestruct/handler_chains.rb

@@ -1,31 +1,49 @@
 require 'awestruct/handler_chain'
 require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
 require 'awestruct/handlers/markdown_handler'
-require 'awestruct/handlers/orgmode_handler'
-require 'awestruct/handlers/asciidoc_handler'
-require 'awestruct/handlers/restructuredtext_handler'
 require 'awestruct/handlers/textile_handler'
-require 'awestruct/handlers/erb_handler'
 require 'awestruct/handlers/haml_handler'
 require 'awestruct/handlers/sass_handler'
 require 'awestruct/handlers/scss_handler'
-require 'awestruct/handlers/coffeescript_handler'
+require 'awestruct/handlers/layout_handler'
+require 'awestruct/handlers/page_delegating_handler'
 
 module Awestruct
 
   class HandlerChains
 
+
     DEFAULTS = [
-      Awestruct::Handlers::MarkdownHandler::CHAIN,
-      Awestruct::Handlers::TextileHandler::CHAIN,
-      Awestruct::Handlers::ErbHandler::CHAIN,
-      Awestruct::Handlers::OrgmodeHandler::CHAIN,
-      Awestruct::Handlers::AsciidocHandler::CHAIN,
-      Awestruct::Handlers::RestructuredtextHandler::CHAIN,
-      Awestruct::Handlers::HamlHandler::CHAIN,
-      Awestruct::Handlers::SassHandler::CHAIN,
-      Awestruct::Handlers::ScssHandler::CHAIN,
-      Awestruct::Handlers::CoffeescriptHandler::CHAIN,
+      HandlerChain.new( /\.md$/, 
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::MarkdownHandler,
+        Awestruct::Handlers::LayoutHandler
+      ),
+      HandlerChain.new( /\.textile$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::TextileHandler,
+        Awestruct::Handlers::LayoutHandler
+      ),
+      HandlerChain.new( /\.haml$/, 
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::HamlHandler,
+        Awestruct::Handlers::LayoutHandler
+      ),
+      HandlerChain.new( /\.sass$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::SassHandler
+      ),
+      HandlerChain.new( /\.scss$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::ScssHandler
+      ),
       HandlerChain.new( /.*/, Awestruct::Handlers::FileHandler )
     ]
 

data/lib/awestruct/handlers/base_handler.rb

@@ -1,6 +1,5 @@
 
 require 'hashery/open_cascade'
-require 'open3'
 
 module Awestruct
   module Handlers
@@ -83,12 +82,7 @@ module Awestruct
       end
 
       def inherit_front_matter(page)
-        return @delegate.inherit_front_matter(page) if @delegate
-      end
-
-      def dependencies
-        return @delegate.dependencies if @delegate
-        []
+        @delegate.inherit_front_matter(page) if @delegate
       end
 
       def to_chain
@@ -97,15 +91,6 @@ module Awestruct
         chain.flatten
       end
 
-      def execute_shell(command, input=nil)
-        Open3.popen3(command) do |stdin, stdout, _|
-          stdin.puts input unless input.nil?
-          out = stdout.read
-        end
-      rescue Errno::EPIPE
-        ""
-      end
-
     end
   end
 end