awestruct 0.5.6.beta8 → 0.5.6.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8d2495c7be41463bac737e49d8dca28bf76af3
-  data.tar.gz: 6f60f7e695ef3c1531c99f946fc0a1203775c6e5
+  metadata.gz: ca256f329051e03285724bbdd41dde4562ce6ce6
+  data.tar.gz: 995924213e455a5840477dacda5263c860f44225
 SHA512:
-  metadata.gz: ed6f840947b88fa82175af61ac409e5d28ad640cf10cbb0fddb1b932b9c8685d11a93b2406d311e2a4b2009ab953d927e3d525073de245c0bd580e1d0b1f09fd
-  data.tar.gz: dfa0cf671a112d65e40967a53e9e86d4823c05cbed74273b4080d15c3fe57818eeaeb5940e6e6becb1765e9c80b406f84734f8a0e07339475659483de30cc6fd
+  metadata.gz: 1ac323c0af741443132a7e8c1fa15a7e2d35e82af15c0333ddc38997ff9743311843a3acf09afebb007f5908d2835dae488ec4f29dcf59eeeaca3c6e1bbf719f
+  data.tar.gz: 5841d1ab558f57cd09a8bcf51ab91d4e98a709fe76f6e6fe4a086240d823615a0d88740d58071418a2734ec0eee18a39b01fe3dc345df4a8162ef3c5561f8f6a

data/Gemfile

@@ -2,10 +2,8 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'hashery', '~> 2.1.1'
-  gem 'rspec', '~> 2.14.1'
-  gem 'rake', '~> 10.2.2'
-  gem 'guard-rspec', '~> 4.2.0', :require => false
   gem 'pry', :require => false
+  gem 'rake', :require => false
   #gem 'pry-byebug', :require => false
 end
 
@@ -14,7 +12,7 @@ group :test do
   gem 'rack-test', '~> 0.6.2'
   gem 'tilt', '~> 2.0.1'
   gem 'coffee-script', '~> 2.2.0'
-  gem 'asciidoctor', '~> 0.1.4'
+  gem 'asciidoctor', '1.5.2'
   gem 'slim', '~> 2.0.2'
   gem 'kramdown', '~> 1.3.3'
   gem 'therubyracer', '~> 0.12.1', :platforms => :ruby

data/Rakefile

@@ -40,7 +40,7 @@ else
   desc 'Run all specs'
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.pattern = 'spec/**/*_spec.rb'
-    t.rspec_opts = ['-cfs']
+    t.rspec_opts = ['-c']
   end
 end
 

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          = '2015-01-12'
+  s.date          = '2015-07-24'
 
   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']
@@ -32,22 +32,26 @@ Any markup languages you are using and its dependencies.
 Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if you're running on MRI. JRuby should be using haml 4.0.0+ with Kramdown.'
   EOS
 
-  s.add_dependency 'haml', '~> 4.0.5'
-  s.add_dependency 'asciidoctor' # we're pretty good about backwards compat
-  s.add_dependency 'tilt', '~> 2.0.1'
-  s.add_dependency 'compass', '~> 1.0.1'
-  s.add_dependency 'compass-960-plugin', '~> 0.10.4'
-  s.add_dependency 'bootstrap-sass', '~> 3.2.0.2'
-  s.add_dependency 'zurb-foundation', '~> 4.3.2'
+  s.add_dependency 'haml', '~> 4.0', '>= 4.0.5'
+  s.add_dependency 'asciidoctor', '~> 1.5', '>= 1.5.2'
+  s.add_dependency 'tilt', '~> 2.0', '>= 2.0.1'
   s.add_dependency 'mime-types', '~> 2.1'
-  s.add_dependency 'rest-client', '~> 1.7.2'
-  s.add_dependency 'ruby-s3cmd', '~> 0.1.5'
-  s.add_dependency 'listen', '~> 2.7.1'
-  s.add_dependency 'rack', '~> 1.5.2'
-  s.add_dependency 'git', '~> 1.2.6'
-  s.add_dependency 'guard-livereload', '~> 2.1.2'
-  s.add_dependency 'colorize', '~> 0.7.1'
-  s.add_dependency 'parallel', '> 1.1.1'
-
-  s.add_development_dependency 'nokogiri', '~> 1.5.10'
+  s.add_dependency 'rest-client', '~> 1.7', '>= 1.7.2'
+  s.add_dependency 'listen', '~> 2.7', '>= 2.7.1'
+  s.add_dependency 'rack', '~> 1.5', '>= 1.5.2'
+  s.add_dependency 'git', '~> 1.2', '>= 1.2.6'
+  s.add_dependency 'guard-livereload', '~> 2.1', '>= 2.1.2'
+  s.add_dependency 'colorize', '~> 0.7', '>= 0.7.1'
+  s.add_dependency 'oga', '~> 0.3'
+  s.add_dependency 'sass', '~> 3.2'
+  s.add_dependency 'compass', '~> 1', '>= 1.0.1'
+  s.add_dependency 'parallel', '~> 1.1', '> 1.1.1'
+
+  s.add_development_dependency 'nokogiri', '~> 1.5.0','>= 1.5.10'
+  s.add_development_dependency 'compass-960-plugin', '~> 0.10','>= 0.10.4'
+  s.add_development_dependency 'bootstrap-sass', '~> 3', '>= 3.2.0.2'
+  s.add_development_dependency 'zurb-foundation', '~> 4.3.2', '>= 4.3.2'
+  s.add_development_dependency 'simplecov', '~> 0.9'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'guard-rspec', '~> 4.0'
 end

data/lib/awestruct/cli/auto.rb

@@ -18,12 +18,18 @@ module Awestruct
         generate_thread = nil
         current_path = nil
 
-        guard = if ( @config.options.livereload )
-          guard = Guard::LiveReload.new
-          guard.start
-          guard
-        else
-          nil
+        begin
+          guard = if ( @config.options.livereload )
+            Guard.init({})
+            guard = Guard::LiveReload.new
+            guard.start
+            guard
+          else
+            nil
+          end
+        rescue => e
+          puts e
+          puts e.backtrace
         end
 
         force_polling = ( RUBY_PLATFORM =~ /mingw/ ? true : false )
@@ -45,26 +51,24 @@ module Awestruct
 
               generate_thread = Thread.new {
                 begin
-                  if ( File.extname(path) == '.sass' || File.extname(path) == '.scss' )
-                    # TODO use sass here, eventually, as soon as I can figure out how to get it and sprites to work
-                    ::Compass::Commands::UpdateProject.new(engine.site.dir, {}).perform
-                    # fixes the nil later on, there's an outstanding bug that css 
-                    # pages aren't output in the correct directory
-                    pages = [] 
-                  else
-                    page = engine.page_by_source_path(path)
-                    pages = []
-                    if ( page )
+                  page = engine.page_by_source_path(path)
+                  pages = []
+                  if ( page )
+                    unless ( guard )
                       pages = engine.generate_page_and_dependencies( page )
                     else
-                      if File.exist? path
-                      # chances are this is an extension or yaml file
-                        pages = engine.run_auto_for_non_page(path)
-                      end
+                      pages = engine.page_dependencies( page )
+                    end
+                  else
+                    if File.exist? path
+                    # chances are this is an extension or yaml file
+                      pages = engine.run_auto_for_non_page(path, !@config.options.generate_on_access)
                     end
                   end
 
-                  $LOG.info "Regeneration finished." if $LOG.info?
+                  unless ( guard )
+                    $LOG.info "Regeneration finished." if $LOG.info?
+                  end
 
                   if ( guard )
                     urls = pages.map do |p|

data/lib/awestruct/cli/generate.rb

@@ -6,11 +6,12 @@ module Awestruct
   module CLI
     class Generate
 
-      def initialize(config, profile=nil, base_url=nil, default_base_url=Options::DEFAULT_BASE_URL, force=false)
+      def initialize(config, profile=nil, base_url=nil, default_base_url=Options::DEFAULT_BASE_URL, force=false, generate=true)
         @profile          = profile
         @base_url         = base_url
         @default_base_url = default_base_url
         @force            = force
+        @generate         = generate
         @engine           = Awestruct::Engine.new( config )
       end
 
@@ -18,7 +19,7 @@ module Awestruct
         begin
           base_url = @base_url || @default_base_url
           $LOG.info "Generating site: #{base_url}" if $LOG.info?
-          @engine.run( @profile, @base_url, @default_base_url, @force )
+          @engine.run( @profile, @base_url, @default_base_url, @force, @generate )
         rescue =>e
           ExceptionHelper.log_building_error e, ''
           return false

data/lib/awestruct/cli/init.rb

@@ -18,7 +18,6 @@ module Awestruct
         copy_file('_ext/pipeline.rb', Init.framework_path('base_pipeline.rb'))
         copy_file('.awestruct_ignore', Init.framework_path('base_awestruct_ignore'))
         copy_file('Rakefile', Init.framework_path('base_Rakefile'))
-        copy_file('Gemfile', Init.framework_path('base_Gemfile'))
         mkdir('stylesheets')
       }
 
@@ -31,6 +30,8 @@ module Awestruct
       def run()
         manifest = Manifest.new(BASE_MANIFEST)
         scaffold_name = @framework
+        manifest.template_file('Gemfile', Init.framework_path('base_Gemfile'), {:framework => @framework})
+
         lib = nil
         case @framework
           when 'compass'

data/lib/awestruct/cli/invoker.rb

@@ -3,6 +3,7 @@ require 'logger'
 require 'awestruct/logger'
 require 'awestruct/cli/options'
 require 'awestruct/util/exception_helper'
+require 'erb'
 
 module Awestruct
   module CLI
@@ -72,7 +73,7 @@ module Awestruct
           abort( "No config file at #{site_yaml_file}" )
         end
 
-        site_yaml = YAML.load( File.read( site_yaml_file ) )
+        site_yaml = YAML.load( ERB.new(File.read( site_yaml_file )).result )
 
         if ( !site_yaml )
           abort( "Failed to parse #{site_yaml_file}" )
@@ -122,7 +123,7 @@ module Awestruct
 
       def invoke_generate()
         base_url = profile['base_url'] || options.base_url
-        @success = Awestruct::CLI::Generate.new( config, options.profile, base_url, Options::DEFAULT_BASE_URL, options.force ).run
+        @success = Awestruct::CLI::Generate.new( config, options.profile, base_url, Options::DEFAULT_BASE_URL, options.force, !options.generate_on_access ).run
       end
 
       def invoke_deploy()
@@ -144,7 +145,7 @@ module Awestruct
       end
 
       def invoke_server()
-        run_in_thread( Awestruct::CLI::Server.new( options.output_dir, options.bind_addr, options.port ) )
+        run_in_thread( Awestruct::CLI::Server.new( options.output_dir, options.bind_addr, options.port, options.generate_on_access ) )
       end
 
 

data/lib/awestruct/cli/manifest.rb

@@ -1,6 +1,9 @@
 require 'sass/callbacks'
 require 'compass'
 require 'compass/commands'
+require 'erb'
+require 'rubygems/specification'
+require 'ostruct'
 
 # TODO: We could create our own installer and use that
 
@@ -22,6 +25,10 @@ module Awestruct
         steps << MkDir.new(path)
       end
 
+      def template_file(path, input_path, state = {})
+        steps << TemplateFile.new(path, input_path, state.merge(load_gem))
+      end
+
       def copy_file(path, input_path, opts = {})
         steps << CopyFile.new(path, input_path, opts)
       end
@@ -68,6 +75,18 @@ module Awestruct
         end
       end
 
+      private
+
+      def load_gem
+        spec = {:dependencies => {}}
+        gem_spec = Gem::Specification::load(
+          File.join(File.dirname(__FILE__), "../../../", "awestruct.gemspec"))
+
+        gem_spec.dependencies.each { |d| spec[:dependencies][d.name] = d}
+        spec[:awestruct_version] = gem_spec.version
+        spec
+      end
+
       ##
       ##
       ##
@@ -202,6 +221,28 @@ module Awestruct
 
       end
 
+      class TemplateFile
+        def initialize(path, input_path, state = {})
+          @path = path
+          @input_path = input_path
+          @state = state
+        end
+
+        def perform(dir)
+
+          rendered = ERB.new(File.read(@input_path), nil, '<>').result(
+            OpenStruct.new(@state).instance_eval { binding })
+
+          p = File.join(dir, @path)
+          $LOG.info "Create file: #{p}" if $LOG.info?
+          File.open(p, 'w') { |f| f.write(rendered) }
+        end
+
+        def unperform(dir)
+          # nothing
+        end
+      end
+
       class InstallCompass
         def initialize(framework='compass')
           @framework = framework

data/lib/awestruct/cli/options.rb

@@ -16,6 +16,7 @@ module Awestruct
       DEFAULT_BIND_ADDR = '0.0.0.0'
       DEFAULT_PORT = 4242
       DEFAULT_BASE_URL = %(http://#{LOCAL_HOSTS[DEFAULT_BIND_ADDR] || DEFAULT_BIND_ADDR}:#{DEFAULT_PORT})
+      DEFAULT_GENERATE_ON_ACCESS = false
 
       attr_accessor :generate
       attr_accessor :server
@@ -36,6 +37,7 @@ module Awestruct
       attr_accessor :output_dir
       attr_accessor :livereload
       attr_accessor :debug
+      attr_accessor :generate_on_access
 
       def initialize()
         @generate   = nil
@@ -56,6 +58,7 @@ module Awestruct
         @livereload = false
         @source_dir = Dir.pwd
         @output_dir = File.expand_path '_site'
+        @generate_on_access = DEFAULT_GENERATE_ON_ACCESS
       end
 
       def self.parse!(args)
@@ -92,12 +95,13 @@ module Awestruct
           opts.on( '-u', '--url URL', 'Set site.base_url' ) do |url|
             self.base_url = url
           end
-          opts.on( '-d', '--dev',     "Run site in development mode (--auto, --server, --port #{DEFAULT_PORT} and --profile development)" ) do |url|
+          opts.on( '-d', '--dev',     "Run site in development mode (--auto, --server, --port #{DEFAULT_PORT}, --profile development, --livereload and --generate_on_access)" ) do |url|
             self.server   = true
             self.auto     = true
             self.port     = DEFAULT_PORT
             self.profile  = 'development'
             self.livereload = true
+            self.generate_on_access = true
           end
           opts.on( '-a', '--auto', 'Auto-generate when changes are noticed' ) do |a|
             self.auto = a
@@ -105,6 +109,11 @@ module Awestruct
           end
           opts.on( '--[no-]livereload', 'Support for browser livereload' ) do |livereload|
             self.livereload = livereload
+            self.generate_on_access = true  if self.livereload
+          end
+
+          opts.on( '--[no-]generate-on-access', 'Support for calling generate on HTTP access' ) do |generate_on_access|
+            self.generate_on_access = generate_on_access
           end
 
           opts.on( '-P', '--profile PROFILE', 'Activate a configuration profile' ) do |profile|

data/lib/awestruct/cli/server.rb

@@ -1,27 +1,57 @@
 require 'rack'
+require 'rack/builder'
 require 'rack/server'
 require 'awestruct/rack/app'
+require 'awestruct/rack/generate'
+require 'awestruct/cli/options'
 
 module Awestruct
   module CLI
     class Server
       attr_reader :server
 
-      def initialize(path, bind_addr=Options::DEFAULT_BIND_ADDR, port=Options::DEFAULT_PORT)
+      def initialize(path, bind_addr=Options::DEFAULT_BIND_ADDR, port=Options::DEFAULT_PORT, generate_on_access=Options::DEFAULT_GENERATE_ON_ACCESS)
         @path      = path
         @bind_addr = bind_addr
         @port      = port
+        @generate_on_access = generate_on_access
       end
 
       def run
+        unless port_open? (Options::LOCAL_HOSTS[@bind_addr] || @bind_addr), @port
+          $LOG.error "#{Options::LOCAL_HOSTS[@bind_addr] || @bind_addr}:#{@port} not available for server" if $LOG.error?
+          abort
+        end
         url = %(http://#{Options::LOCAL_HOSTS[@bind_addr] || @bind_addr}:#{@port})
         msg = %(Starting preview server at #{url} (Press Ctrl-C to shutdown))
-        puts %(#{'*' * msg.length}\n#{msg}\n#{'*' * msg.length}\n)
-        ::Rack::Server::start( :app => Awestruct::Rack::App.new( @path ),
-                              :Port => @port,
-                              :Host => @bind_addr
-                             )
+        $LOG.info %(#{'*' * msg.length}\n#{msg}\n#{'*' * msg.length}\n) if $LOG.info?
+
+        path = @path
+        generate_on_access = @generate_on_access
+        app = ::Rack::Builder.new do
+          use Awestruct::Rack::GenerateOnAccess if generate_on_access
+          map "/" do
+            run Awestruct::Rack::App.new( path )
+          end
+        end
+
+          ::Rack::Server::start( :app => app,
+                                :Port => @port,
+                                :Host => @bind_addr
+                               )
       end 
+
+      private
+      # Private. Checks to see if the port is open.
+      def port_open?(addr, port)
+        begin
+          s = TCPServer.new(addr, port)
+          s.close
+          true
+        rescue  
+          false
+        end
+      end
     end
   end
 end

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

@@ -42,6 +42,9 @@ asciidoctor:
 textile:
   :no_span_caps: true
 
+generation:
+  :in_theads: <%= Parallel.processor_count * 10 %>
+
 profiles:
   development:
     show_drafts: true

data/lib/awestruct/context.rb

@@ -11,6 +11,23 @@ module Awestruct
       @page = hash[:page]
       @site = hash[:site]
 
+      # Update the front matter from the handler chain
+      @page.handler.front_matter.each do |k,v|
+        k_sym = k.to_sym
+        if @page.key? k_sym
+          if @page[k_sym].is_a?(Array) && v.is_a?(Array)
+            page_values = @page[k_sym].collect {|value| value.class.to_s}.sort
+            front_matter_values = v.collect {|value| value.class.to_s}.sort
+            @page[k_sym] = v if page_values.eql? front_matter_values
+          elsif @page[k_sym].is_a?(Hash) && v.is_a?(Hash)
+            page_values = @page[k_sym].collect {|key, value| value.class.to_s}.sort
+            front_matter_values = v.collect {|key, value| value.class.to_s}.sort
+            @page[k_sym] = v if page_values.eql? front_matter_values
+          else
+            @page[k_sym] = v if @page.key?(k_sym) && (@page[k_sym].class == v.class)
+          end
+        end
+      end
     end
 
     def inspect