awestruct 0.5.4 → 0.5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5fd572c73f3b019598a5f63b741c5d0df96fcd0
-  data.tar.gz: 76e36c5b3f687e42c7d819f3a5e21b9ab938a027
+  metadata.gz: 66f88d160a376bb1a078f1795dc89ffa8fcf4257
+  data.tar.gz: 3736615ca5762046254b07f5863919a6456fddcc
 SHA512:
-  metadata.gz: d904e79ab4c23037895cd7b1a916b08c7e2d8b0d21abcf5de54fb2d2981427b2d5a354d26af7cfda9eab520d89ea3f3c60537ed5b8e7717751a68337a787635c
-  data.tar.gz: 1e3dd26392ccc0179eee5b29573a0a6b358e35eb8e12b758d5ab4cc10eb827c002352bc3934a38b2541d58b399c3024fbb12f2dc19941176397f847d9da0fd58
+  metadata.gz: d885b5bb8e255378237ca0cb383fd39d9853dde62bf8c74d4f7e04ae5423aaa8af53c6889cd518e048e54b7e38781e11a4690974f2b4aedbca049514fa00d0d0
+  data.tar.gz: aba99bcefb9e7c2880da23d32dd84e70f37e51fc47b7c81e5b80d71956266e17c7c8b3178e60ec17348f722b9955ee42e100f73c3eadf1f639a18987735178f7

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2014-04-07'
+  s.date          = '2014-04-09'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']

data/lib/awestruct/cli/auto.rb

@@ -44,9 +44,10 @@ module Awestruct
                 generate_thread = Thread.new {
                   begin
 
+                    # TODO: Have to figure something out for extensions and other files without an output path
+                    #       Probably add another method in engin to to do the regen w/o mucking with site.pages and run through things again
                     page = engine.page_by_output_path(path)
                     if ( page )
-
                       pages = engine.generate_page_and_dependencies( page )
 
                       if ( guard )

data/lib/awestruct/compass/default_configuration.rb

@@ -1,9 +1,8 @@
-require 'compass/configuration/defaults'
+require 'compass'
 
 module Awestruct
   module Compass
-    class DefaultConfiguration
-      #include ::Compass::Configuration::Defaults
+    class DefaultConfiguration < ::Compass::Configuration::Data
 
       attr_reader :site
 
@@ -11,97 +10,121 @@ module Awestruct
         @site = site
       end
 
-      #def top_level
-        #self
-      #end
-
-      def project_type
+      def default_project_type
         :stand_alone
       end
 
-      def environment
+      def default_environment
         site.profile
       end
 
-      def project_path
+      def default_project_path
         site.config.dir
       end
 
-      def sass_dir
+      def default_sass_dir
         File.join site.config.dir, 'stylesheets'
       end
 
-      def http_path
+      def default_http_path
         site.base_url
       end
 
-      def css_dir
+      def default_css_dir
         site.css_dir
       end
 
-      def javascripts_dir
+      def default_javascripts_dir
         File.join site.config.dir, 'javascripts'
       end
 
-      def http_javascripts_dir
+      def default_http_javascripts_dir
         File.join http_path, 'javascripts' 
       end
 
-      def http_stylesheets_dir
+      def default_http_stylesheets_dir
         File.join http_path, 'stylesheets'
       end
 
-      def images_dir
+      def default_images_dir
         File.join site.config.dir, 'images'
       end
 
-      def generated_images_dir
+      def default_generated_images_dir
         File.join site.output_path, 'images'
       end
 
-      def http_generated_images_dir
+      def default_http_generated_images_dir
         File.join http_path, 'images'
       end
 
-      def sprite_load_path
+      def default_sprite_load_path
         [images_path]
       end
 
-      def images_path
+      def default_images_path
         File.join project_path, 'images'
       end
 
-      def http_images_dir
+      def default_http_images_dir
         File.join http_path, 'images'
       end
 
-      def fonts_dir
+      def default_fonts_dir
         File.join site.config.dir, 'fonts'
       end
 
-      def http_fonts_dir
+      def default_http_fonts_dir
         File.join http_path, 'fonts'
       end
 
       def line_comments
-        site.key?(:compass_line_comments) ? !!site.compass_line_comments : !site.profile.eql?('production') 
+        if self.inherited_data && self.inherited_data.is_a?(::Compass::Configuration::FileData)
+          return self.inherited_data.line_comments
+        end
+        if site.profile.eql? 'production'
+          return false
+        else
+          if site.key? :compass_line_comments
+            return site.compass_line_comments 
+          end
+          if site.key?(:scss) && site.scss.key?(:line_comments)
+            return site.scss.line_comments
+          end
+          if site.key?(:sass) && site.sass.key?(:line_comments)
+            return site.sass.line_comments
+          end
+          true
+        end
       end
 
       def output_style
-        site.key?(:compass_output_style) ? site.compass_output_style.to_sym : site.profile.eql?('production') ? :compressed : :expanded 
-      end
-
-      def relative_assets
+        if self.inherited_data && self.inherited_data.is_a?(::Compass::Configuration::FileData)
+          return self.inherited_data.output_style
+        end
+        if site.profile.eql? 'production'
+          return :compressed
+        else
+          if site.key? :compass_output_style
+            return site.compass_output_style
+          end
+          if (site.key? :scss) && (site.scss.key? :style)
+            return site.scss.style
+          end
+          if (site.key? :sass) && (site.sass.key? :style)
+            return site.sass.style
+          end
+        end
+        :expanded
+      end
+
+      def default_relative_assets
         false
       end
 
-      def cache_dir
+      def default_cache_dir
         File.join site.config.dir, '.sass-cache'
       end
-
-      def inherit_from! data
-        return
-      end
     end 
   end
 end

data/lib/awestruct/config/default-site.yml

@@ -1,6 +1,13 @@
 encoding: UTF-8
 interpolate: false
 
+scss:
+  :line_numbers: true
+  :style: expanded
+sass:
+  :line_numbers: true
+  :style: expanded
+
 content_syntax:
   coffee: coffeescript
   md: markdown

data/lib/awestruct/dependencies.rb

@@ -40,9 +40,6 @@ module Awestruct
     def self.pop_page
       page = @pages.pop
       $LOG.debug "pop #{page.output_path} #{@pages.empty?}" if $LOG.debug?
-      if ( @pages.empty? && ! page.nil? )
-        page.dependencies.persist!
-      end
     end
 
 

data/lib/awestruct/engine.rb

@@ -240,40 +240,20 @@ module Awestruct
     end
 
     def configure_compass 
-      site.images_dir      = File.join( site.config.output_dir, 'images' )
-      site.fonts_dir       = File.join( site.config.output_dir, 'fonts' )
-      site.stylesheets_dir = File.join( site.config.output_dir, 'stylesheets' )
-      site.javascripts_dir = File.join( site.config.output_dir, 'javascripts' )
+      site.images_dir      = File.join( site.config.dir, 'images' )
+      site.fonts_dir       = File.join( site.config.dir, 'fonts' )
+      site.stylesheets_dir = File.join( site.config.dir, 'stylesheets' )
+      site.javascripts_dir = File.join( site.config.dir, 'javascripts' )
 
+      default_config = Awestruct::Compass::DefaultConfiguration.new(site)
       compass_config_file = File.join(site.config.config_dir, 'compass.rb')
       if (File.exists? compass_config_file)
-        compass_configuration = ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
-        compass_configuration.inherit_from! ::Awestruct::Compass::DefaultConfiguration.new(site) 
-        ::Compass.add_configuration compass_configuration
-      else
-        ::Compass.configuration.inherit_from! ::Awestruct::Compass::DefaultConfiguration.new(site)
+        default_config.inherit_from! ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
       end 
 
-      # TODO: Should we add an on_stylesheet_error block?
+      ::Compass.add_configuration default_config
 
-      # port old style configuration to new Tilt-based configuration
-      # TODO consider deprecating the old config mechanism and move to default-site.yml
-      [:scss, :sass].each do |sass_ext|
-        if !site.key? sass_ext
-          sass_config = {}
-          site[sass_ext] = sass_config
-        else
-          sass_config = site[sass_ext]
-        end
-
-        if !sass_config.has_key?(:line_numbers) || site.profile.eql?('production')
-          sass_config[:line_numbers] = ::Compass.configuration.line_comments
-        end
-
-        if !sass_config.has_key?(:style) || site.profile.eql?('production')
-          sass_config[:style] = ::Compass.configuration.output_style
-        end
-      end
+      # TODO: Should we add an on_stylesheet_error block?  
     end
 
     def load_pages
@@ -318,11 +298,13 @@ module Awestruct
 
     # path - relative to output dir
     def page_by_output_path(path)
-      site.pages.find { |p|
-          p.source_path.to_s == path
-        } || site.layouts.find { |p|
-          p.source_path.to_s == path
-        }
+      if (path.include? '_layout')
+        site.layouts.find { |p| p.source_path.to_s == path }
+      elsif (path.include? '_partial')
+        site.partials.find { |p| p.source_path.to_s == path }
+      else
+        site.pages.find { |p| p.source_path.to_s == path }
+      end
     end
 
     def generate_page_and_dependencies(page)
@@ -331,31 +313,33 @@ module Awestruct
         return
       end
 
-      if !page.output_path.nil?
+      if !page.output_path.nil? && !page.is_partial? && !page.__is_layout
         generate_page_internal(page)
       end
 
       pages = [ page ]
 
-      pages.each do |page|
-        $LOG.debug "--------------------" if $LOG.debug?
-        $LOG.debug "Page: #{page.output_path} #{page.relative_source_path} #{page.__is_layout ? 'Layout':''}" if $LOG.debug?
-        $LOG.debug "Detected change in content (#{page.dependencies.content_hash})" if page.dependencies.has_changed_content if $LOG.debug?
-        $LOG.debug "!! Detected change in front matter. To fully reflect the change you'll need to restart Awestruct (#{page.dependencies.key_hash})" if page.dependencies.has_changed_keys if $LOG.debug?
-        $LOG.debug "No changes detected" unless page.dependencies.has_changed_content or page.dependencies.has_changed_keys if $LOG.debug?
-        $LOG.debug "Dependencies Matrix: (non unique source path)" if $LOG.debug?
-        $LOG.debug "\t Outgoing dependencies:" if $LOG.debug?
-        $LOG.debug "\t\t Content -> #{page.dependencies.dependencies.size}" if $LOG.debug?
-        $LOG.debug "\t\t Key     -> #{page.dependencies.key_dependencies.size}" if $LOG.debug?
-        $LOG.debug "\t Incoming dependencies:" if $LOG.debug?
-        $LOG.debug "\t\t Content <- #{page.dependencies.dependents.size}" if $LOG.debug?
-        $LOG.debug "\t\t Key     <- #{page.dependencies.key_dependents.size}" if $LOG.debug?
-        $LOG.debug "--------------------" if $LOG.debug?
+      pages.each do |p|
+        if $LOG.debug?
+          $LOG.debug "--------------------"
+          $LOG.debug "Page: #{p.output_path} #{p.relative_source_path} #{p.__is_layout ? 'Layout':''}"
+          $LOG.debug "Detected change in content (#{p.dependencies.content_hash})" if p.dependencies.has_changed_content
+          $LOG.debug "!! Detected change in front matter. To fully reflect the change you'll need to restart Awestruct (#{p.dependencies.key_hash})" if p.dependencies.has_changed_keys
+          $LOG.debug "No changes detected" unless p.dependencies.has_changed_content or p.dependencies.has_changed_keys
+          $LOG.debug "Dependencies Matrix: (non unique source path)"
+          $LOG.debug "\t Outgoing dependencies:"
+          $LOG.debug "\t\t Content -> #{p.dependencies.dependencies.size}"
+          $LOG.debug "\t\t Key     -> #{p.dependencies.key_dependencies.size}"
+          $LOG.debug "\t Incoming dependencies:"
+          $LOG.debug "\t\t Content <- #{p.dependencies.dependents.size}"
+          $LOG.debug "\t\t Key     <- #{p.dependencies.key_dependents.size}"
+          $LOG.debug "--------------------"
+        end
       end
 
       regen_pages = Set.new
 
-      if page.dependencies.has_changed_content or page.__is_layout
+      if page.dependencies.has_changed_content || page.__is_layout || page.is_partial?
         regen_pages += page.dependencies.dependents
       end
 
@@ -372,7 +356,17 @@ module Awestruct
 
       $LOG.debug "Starting regeneration of content dependent pages:" if regen_pages.size > 0 && $LOG.debug?
 
+      old_site_pages = site.pages
+      site.pages = regen_pages
+
+      @pipeline = Pipeline.new
+      load_yamls
+      load_pipeline
+      execute_pipeline
+      @site.pages = old_site_pages
+
       regen_pages.each do |p|
+        puts "Regenerating page #{p.output_path}"
         generate_page_internal(p)
         pages << p
       end

data/lib/awestruct/extensions/partial.rb

@@ -11,7 +11,6 @@ module Awestruct
         end
 
         page = site.engine.load_site_page( filename )
-
         return nil if !page
 
         params.each do |k,v|
@@ -19,15 +18,31 @@ module Awestruct
         end if params
 
         page.send("output_page=", self[:page])
-
-        begin
-          page.content
-        rescue Exception => e
-          ExceptionHelper.log_error "Error occurred while rendering partial #{filename} contained in #{self[:page].source_path}"
-          ExceptionHelper.backtrace e 
+        page.partial = true
+
+        from_site = site.partials.find {|p| p.source_path == page.source_path}
+
+        # Setup dependency tracking
+        if from_site
+          from_site.dependencies.add_dependent self[:page]
+          self[:page].dependencies.add_dependency from_site
+          Awestruct::Dependencies.track_dependency(from_site)
+        else
+          page.dependencies.add_dependent self[:page]
+          self[:page].dependencies.add_dependency page
+          Awestruct::Dependencies.track_dependency(page)
+          site.partials << page
+
+          begin
+            page.content
+          rescue Exception => e
+            ExceptionHelper.log_error "Error occurred while rendering partial #{filename} contained in #{self[:page].source_path}"
+            ExceptionHelper.backtrace e 
+          end
         end
-      end
 
+      end
     end
   end
 end
+

data/lib/awestruct/handlers/base_tilt_handler.rb

@@ -134,13 +134,19 @@ module Awestruct
           }
           return template.render(context)
         rescue LoadError => e
-          ExceptionHelper.log_message "Could not load template library required for rendering #{File.join site.dir, relative_source_path}."
-          ExceptionHelper.log_message "Please see #{File.join site.dir, output_path} for more information"
-          return ExceptionHelper.html_error_report e, relative_source_path
+          error_page = context[:page]
+          ExceptionHelper.log_message "Could not load template library required for rendering #{File.join site.dir, error_page.source_path}."
+          ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
+          return ExceptionHelper.html_error_report e, error_page.source_path
         rescue Exception => e
-          ExceptionHelper.log_message "An error during rendering #{File.join site.dir, relative_source_path} occurred."
-          ExceptionHelper.log_message "Please see #{File.join site.dir, output_path} for more information"
-          return ExceptionHelper.html_error_report e, relative_source_path
+          error_page = context[:page]
+          if error_page[:__is_layout] == true
+            ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred." 
+          else
+            ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred." 
+          end
+          ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
+          return ExceptionHelper.html_error_report e, error_page.source_path
         end
       end
     end

data/lib/awestruct/page.rb

@@ -12,6 +12,7 @@ module Awestruct
     attr_accessor :site
     attr_accessor :handler
     attr_reader   :dependencies
+    attr_writer   :partial
 
     def initialize(site, handler=nil)
       @site          = site
@@ -92,6 +93,8 @@ module Awestruct
     def stale_output?(output_path)
       return true if ! File.exist?( output_path )
       return true if input_mtime > File.mtime( output_path )
+      return true if stale?
+      # TODO: Add stale callback and execute it
       false
     end
 
@@ -177,5 +180,9 @@ module Awestruct
       self.object_id == other_page.object_id
     end
 
+    def is_partial?
+      @partial
+    end
+
   end
 end

data/lib/awestruct/site.rb

@@ -10,8 +10,9 @@ module Awestruct
     attr_reader :tmp_dir
     attr_reader :timestamp
 
-    attr_reader :pages
+    attr_accessor :pages
     attr_reader :layouts
+    attr_reader :partials
 
     attr_reader :config
     attr_reader :engine
@@ -20,6 +21,7 @@ module Awestruct
       @engine = engine
       @pages = []
       @layouts = Layouts.new
+      @partials = []
       @config = config
       self.encoding = false
       @timestamp = Time.now.to_i

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.4'
+  VERSION = '0.5.4.1'
 end

data/spec/awestruct/handlers/tilt_handler_spec.rb

@@ -44,7 +44,7 @@ describe Awestruct::Handlers::TiltHandler do
   end
 
   def create_context
-    Hashery::OpenCascade[ { :site=>@site } ]
+    Hashery::OpenCascade[ { :site=>@site, page: {:source_path => '', :output_path => ''} } ]
   end
 
   it "should provide default configuration options from site based on output_extension" do

data/spec/engine_spec.rb

@@ -104,12 +104,7 @@ describe Awestruct::Engine do
     expect( Compass.configuration.line_comments ).to eq false
     expect( Compass.configuration.output_style ).to eq :compressed
     expect( Compass.configuration.http_path ).to be nil
-    expect( Compass.configuration.relative_assets ).to eq false
-
-    engine.site.sass.line_numbers.should == false
-    engine.site.sass.style.should == :compressed
-    engine.site.scss.line_numbers.should == false
-    engine.site.scss.style.should == :compressed
+    expect( Compass.configuration.relative_assets ).to eq false 
   end
 
   it "should include line comments in compass by default in development mode" do
@@ -120,10 +115,8 @@ describe Awestruct::Engine do
     engine.load_user_site_yaml( 'development' )
     engine.configure_compass
 
-    engine.site.sass.line_numbers.should == true
-    engine.site.sass.style.should == :expanded
-    engine.site.scss.line_numbers.should == true
-    engine.site.scss.style.should == :expanded
+    expect( Compass.configuration.line_comments ).to eq true
+    expect( Compass.configuration.output_style ).to eq :expanded
   end
 
   it "wip should accept site.compass_line_comments and site.compass_output_style to configure behavior" do
@@ -134,10 +127,21 @@ describe Awestruct::Engine do
     engine.load_user_site_yaml( 'staging' )
     engine.configure_compass
 
-    engine.site.sass.line_numbers.should == false
-    engine.site.sass.style.should == :compact
-    engine.site.scss.line_numbers.should == false
-    engine.site.scss.style.should == :compact
+    expect( Compass.configuration.line_comments ).to eq false
+    expect( Compass.configuration.output_style ).to eq :compact
+  end
+
+  it "with a _config/compass.rb file, it should override defaults" do
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = test_data_dir 'engine-compass' 
+    config = Awestruct::Config.new( opts )
+    engine = Awestruct::Engine.new(config)
+    engine.configure_compass
+
+    expect( Compass.configuration.line_comments ).to eq false
+    expect( Compass.configuration.output_style ).to eq :compressed
+    expect( Compass.configuration.disable_warnings ).to eq true
+    expect( Compass.configuration.fonts_dir ).to eq 'my-fonts'
   end
 
 end

data/spec/support/test-data/engine-compass/_config/arbitrary.yml

@@ -0,0 +1,2 @@
+
+name: randomness

data/spec/support/test-data/engine-compass/_config/compass.rb

@@ -0,0 +1,4 @@
+disable_warnings = true
+line_comments = false
+output_style = :compressed
+fonts_dir = 'my-fonts'

data/spec/support/test-data/engine-compass/_config/other.yml

@@ -0,0 +1 @@
+tags: [ 'a', 'b', 'c' ]

data/spec/support/test-data/engine-compass/_config/site.yml

@@ -0,0 +1,26 @@
+profiles:
+  development:
+    show_drafts: false
+    cook: microwave
+    base_url: http://localhost:4242
+  production:
+    show_drafts: true
+    cook: oven
+    asciidoctor:
+      :eruby: erb
+      :attributes:
+        imagesdir: /img
+  staging:
+    compass_line_comments: off
+    compass_output_style: :compact
+    base_url: http://stage.example.com
+
+title: Awestruction!
+intl_name: Internéšnl
+
+asciidoctor:
+  :safe: 0
+  :eruby: erubis
+  :attributes:
+    imagesdir: /assets/images
+    idprefix: ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.4.1
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -412,8 +412,11 @@ files:
 - spec/support/shared_handler_example.rb
 - spec/support/test-config/_config/site.yml
 - spec/support/test-data/.awestruct_ignore
+- spec/support/test-data/engine-compass/_config/arbitrary.yml
+- spec/support/test-data/engine-compass/_config/compass.rb
+- spec/support/test-data/engine-compass/_config/other.yml
+- spec/support/test-data/engine-compass/_config/site.yml
 - spec/support/test-data/engine/_config/arbitrary.yml
-- spec/support/test-data/engine/_config/compass.rb
 - spec/support/test-data/engine/_config/other.yml
 - spec/support/test-data/engine/_config/site.yml
 - spec/support/test-data/front-matter-empty.txt