awestruct 0.4.2.x2 → 0.4.2.x3

data/lib/awestruct/cli/options.rb

@@ -21,7 +21,7 @@ module Awestruct
       attr_accessor :script
 
       def initialize()
-        @generate  = true
+        @generate  = nil
         @server    = false
         @port      = 4242
         @bind_addr = '0.0.0.0'
@@ -74,6 +74,7 @@ module Awestruct
       
           opts.on( '--deploy', 'Deploy site' ) do |deploy|
             self.deploy = deploy
+            self.generate = false if self.generate.nil?
           end
       
           opts.on( '-a', '--auto', 'Auto-generate when changes are noticed' ) do |a|
@@ -108,6 +109,7 @@ module Awestruct
         end
 
         opts.parse!(args)
+        self.generate = true if self.generate.nil?
         self
       end # parse()
 

data/lib/awestruct/handlers/base_handler.rb

@@ -63,7 +63,7 @@ module Awestruct
       end
 
       def content_syntax
-        return @delegate.raw_content if @delegate
+        return @delegate.content_syntax if @delegate
         :none
       end
 

data/lib/awestruct/handlers/interpolation_handler.rb

@@ -19,8 +19,9 @@ module Awestruct
         content = content.gsub( /\\\\#/, '\\#' )
         content = content.gsub( '@', '\@' )
         content = "%@#{content}@"
+        c = context.instance_eval( content )
+        c
 
-        context.instance_eval( content )
       end
 
     end

data/lib/awestruct/handlers/markdown_handler.rb

@@ -41,7 +41,7 @@ module Awestruct
       end
 
       def rendered_content(context, with_layouts=true)
-        doc = RDiscount.new( raw_content )
+        doc = RDiscount.new( delegate.rendered_content( context, with_layouts ) )
         doc.to_html
       end
 

data/lib/awestruct/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.4.2.x2
+  version: 0.4.2.x3
   prerelease: 6
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70243419606300 !ruby/object:Gem::Requirement
+  requirement: &70174209636120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *70243419606300
+  version_requirements: *70174209636120
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70243419604380 !ruby/object:Gem::Requirement
+  requirement: &70174209635000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70243419604380
+  version_requirements: *70174209635000
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70243419602920 !ruby/object:Gem::Requirement
+  requirement: &70174209633860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70243419602920
+  version_requirements: *70174209633860
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70243419601920 !ruby/object:Gem::Requirement
+  requirement: &70174209633120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70243419601920
+  version_requirements: *70174209633120
 - !ruby/object:Gem::Dependency
   name: hashery
-  requirement: &70243419590620 !ruby/object:Gem::Requirement
+  requirement: &70174209632100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70243419590620
+  version_requirements: *70174209632100
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70243419589520 !ruby/object:Gem::Requirement
+  requirement: &70174209629420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70243419589520
+  version_requirements: *70174209629420
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70243419588500 !ruby/object:Gem::Requirement
+  requirement: &70174209619840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70243419588500
+  version_requirements: *70174209619840
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70243419586640 !ruby/object:Gem::Requirement
+  requirement: &70174209618900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70243419586640
+  version_requirements: *70174209618900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70243419585160 !ruby/object:Gem::Requirement
+  requirement: &70174209617880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70243419585160
+  version_requirements: *70174209617880
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70243419583780 !ruby/object:Gem::Requirement
+  requirement: &70174209616820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70243419583780
+  version_requirements: *70174209616820
 - !ruby/object:Gem::Dependency
   name: compass-960-plugin
-  requirement: &70243419582600 !ruby/object:Gem::Requirement
+  requirement: &70174209615880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70243419582600
+  version_requirements: *70174209615880
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
-  requirement: &70243419581360 !ruby/object:Gem::Requirement
+  requirement: &70174209614420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70243419581360
+  version_requirements: *70174209614420
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70243419580240 !ruby/object:Gem::Requirement
+  requirement: &70174209613600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70243419580240
+  version_requirements: *70174209613600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70243419579100 !ruby/object:Gem::Requirement
+  requirement: &70174209612380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70243419579100
+  version_requirements: *70174209612380
 - !ruby/object:Gem::Dependency
   name: notifier
-  requirement: &70243419578160 !ruby/object:Gem::Requirement
+  requirement: &70174209590280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70243419578160
+  version_requirements: *70174209590280
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70243419576700 !ruby/object:Gem::Requirement
+  requirement: &70174209587980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70243419576700
+  version_requirements: *70174209587980
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70243419570940 !ruby/object:Gem::Requirement
+  requirement: &70174209586960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243419570940
+  version_requirements: *70174209586960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243419568940 !ruby/object:Gem::Requirement
+  requirement: &70174209585760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70243419568940
+  version_requirements: *70174209585760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70243419567640 !ruby/object:Gem::Requirement
+  requirement: &70174209584580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,7 +220,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70243419567640
+  version_requirements: *70174209584580
 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: 2877561268672615847
+      hash: 4580824399229246162
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: