awestruct 0.4.2.x1 → 0.4.2.x2

data/lib/awestruct/cli/deploy.rb

@@ -9,18 +9,17 @@ module Awestruct
       attr_accessor :site_config
       attr_accessor :deploy_config
 
-       def initialize(site_config, deploy_config)
+      def initialize(site_config, deploy_config)
         @site_config   = site_config
         @deploy_config = deploy_config
+        deploy_config[:type] ||= (deploy_config[:host] == :github_pages ? :github_pages : :rsync)
+      end
+
+      def deploy_type
+        deploy_config[:type]
       end
   
       def run()
-        deploy_type = :rsync
-  
-        if ( deploy_config['host'] == 'github_pages' )
-          deploy_type = :github_pages
-        end
-  
         deployer_class = Awestruct::Deployers.instance[ deploy_type ]
   
         if ( deployer_class.nil? )
@@ -30,7 +29,6 @@ module Awestruct
   
         deployer = deployer_class.new( site_config, deploy_config )
         deployer.run
-        
       end
     end
 

data/lib/awestruct/engine.rb

@@ -180,6 +180,7 @@ module Awestruct
     end
 
     def execute_pipeline
+      FileUtils.mkdir_p( site.config.output_dir )
       pipeline.execute( site )
     end
 
@@ -203,6 +204,7 @@ module Awestruct
     end
 
     def generate_output
+      FileUtils.mkdir_p( site.config.output_dir )
       @site.pages.each do |page|
         generated_path = File.join( site.config.output_dir, page.output_path )
         if ( page.stale_output?( generated_path ) )
@@ -217,8 +219,12 @@ module Awestruct
       if ( produce_output )
         puts "Generating: #{generated_path}"
         FileUtils.mkdir_p( File.dirname( generated_path ) )
+
+        c = page.rendered_content
+        c = site.engine.pipeline.apply_transformers( site, page, c )
+
         File.open( generated_path, 'w' ) do |file|
-          file << page.rendered_content
+          file << c
         end
       elsif ( site.config.track_dependencies )
         if page.dependencies.load!

data/lib/awestruct/page.rb

@@ -124,7 +124,7 @@ module Awestruct
       Awestruct::Dependencies.push_page( self ) if context.site.config.track_dependencies
       c = handler.rendered_content( context, with_layouts )
       Awestruct::Dependencies.pop_page if context.site.config.track_dependencies
-      site.engine.pipeline.apply_transformers( site, self, c )
+      c
     end
 
     def content(with_layouts=false)

data/lib/awestruct/pipeline.rb

@@ -17,6 +17,7 @@ module Awestruct
 
     def extension(e)
       @extensions << e
+      e.transform(@transformers) if e.respond_to?('transform')
     end
 
     def helper(h)

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.4.2.x1'
+  VERSION='0.4.2.x2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.4.2.x1
+  version: 0.4.2.x2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 -04:00
+date: 2012-05-04 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70110198942220 !ruby/object:Gem::Requirement
+  requirement: &70243419606300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *70110198942220
+  version_requirements: *70243419606300
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70110198941280 !ruby/object:Gem::Requirement
+  requirement: &70243419604380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70110198941280
+  version_requirements: *70243419604380
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70110198939820 !ruby/object:Gem::Requirement
+  requirement: &70243419602920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70110198939820
+  version_requirements: *70243419602920
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70110198938460 !ruby/object:Gem::Requirement
+  requirement: &70243419601920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70110198938460
+  version_requirements: *70243419601920
 - !ruby/object:Gem::Dependency
   name: hashery
-  requirement: &70110198937220 !ruby/object:Gem::Requirement
+  requirement: &70243419590620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70110198937220
+  version_requirements: *70243419590620
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70110198936300 !ruby/object:Gem::Requirement
+  requirement: &70243419589520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70110198936300
+  version_requirements: *70243419589520
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70110198935540 !ruby/object:Gem::Requirement
+  requirement: &70243419588500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70110198935540
+  version_requirements: *70243419588500
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70110198934560 !ruby/object:Gem::Requirement
+  requirement: &70243419586640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70110198934560
+  version_requirements: *70243419586640
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70110198933580 !ruby/object:Gem::Requirement
+  requirement: &70243419585160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70110198933580
+  version_requirements: *70243419585160
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70110198932820 !ruby/object:Gem::Requirement
+  requirement: &70243419583780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70110198932820
+  version_requirements: *70243419583780
 - !ruby/object:Gem::Dependency
   name: compass-960-plugin
-  requirement: &70110198932020 !ruby/object:Gem::Requirement
+  requirement: &70243419582600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70110198932020
+  version_requirements: *70243419582600
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
-  requirement: &70110198931380 !ruby/object:Gem::Requirement
+  requirement: &70243419581360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70110198931380
+  version_requirements: *70243419581360
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70110198930600 !ruby/object:Gem::Requirement
+  requirement: &70243419580240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70110198930600
+  version_requirements: *70243419580240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70110198929820 !ruby/object:Gem::Requirement
+  requirement: &70243419579100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70110198929820
+  version_requirements: *70243419579100
 - !ruby/object:Gem::Dependency
   name: notifier
-  requirement: &70110198929100 !ruby/object:Gem::Requirement
+  requirement: &70243419578160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70110198929100
+  version_requirements: *70243419578160
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70110198928260 !ruby/object:Gem::Requirement
+  requirement: &70243419576700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70110198928260
+  version_requirements: *70243419576700
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70110198927460 !ruby/object:Gem::Requirement
+  requirement: &70243419570940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70110198927460
+  version_requirements: *70243419570940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70110198925780 !ruby/object:Gem::Requirement
+  requirement: &70243419568940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70110198925780
+  version_requirements: *70243419568940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70110198925040 !ruby/object:Gem::Requirement
+  requirement: &70243419567640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,7 +220,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70110198925040
+  version_requirements: *70243419567640
 description: Awestruct is a framework for creating static HTML sites.
 email: bob@mcwhirter.org
 executables:
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 98458405648043217
+      hash: 2877561268672615847
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: