awestruct 0.5.6 → 0.5.7.RC1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b14ea27426eef7dea8637b64067898a0aa0fcebb
-  data.tar.gz: f481a9b33a72d7e098055e373dbfbce8a058a580
+  metadata.gz: cf4534d71bfab7a206ad91b375f4d5d7e235d132
+  data.tar.gz: 5e55791deda0c470d448ee22e5b57f73b2b3c63b
 SHA512:
-  metadata.gz: ecc34b84694c4b5c81ab5ccdc8f5e0be17bf4ff80922f4c46874f6896a40dbd689ada792c1275229586050dbfe401b18f529f98252866e29a5af4977a1839404
-  data.tar.gz: 2d3d429ab37e94febfaba72cdfa8a0e40ec51619123b646712f2d3b6d7aeee7cf107993b4528fee4ca6a2dbb709b981810e915240f1784fade9d728ccb69acc0
+  metadata.gz: 7f9248debddd71714d08efe34bc27cee2bf07b4636913aa9758c3cabf829ab519b61f00131aed3c87f4ad0eae23c486ac021a3f5bd7bb3d3ac1f85da9a31981c
+  data.tar.gz: 42390bfcabae84162931e6d687024f5f70e728bbe89e7f30c4a586039813e6d1c8e5fc1a94389395f91bd5bf7cc53faae7fa21991db8681863341e2ad2f5d3e6

data/Gemfile

@@ -13,7 +13,9 @@ group :test do
   gem 'tilt', '~> 2.0.1'
   gem 'coffee-script', '~> 2.2.0'
   gem 'asciidoctor', '1.5.2'
-  gem 'slim', '~> 2.0.2'
+  gem 'compass', '>= 1.0.1'
+  gem 'sassc', '~> 1.6'
+  gem 'slim', '~> 3.0'
   gem 'kramdown', '~> 1.3.3'
   gem 'therubyracer', '~> 0.12.1', :platforms => :ruby
   gem 'therubyrhino', '~> 2.0.3', :platforms => :jruby
@@ -24,6 +26,9 @@ group :test do
   gem 'uglifier', '~> 2.5.0'
   gem 'htmlcompressor', '~> 0.0.7'
   gem 'haml-contrib', '~> 1.0.0'
+  gem 'sass'
+  gem 'bootstrap-sass'
+  gem 'zurb-foundation'
   gem "win32-open3-19", :platforms => :mingw # htmlcompressor depends on old yui compressor, that needs this on win32
 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-08-28'
+  s.date          = '2015-10-13'
 
   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']
@@ -17,6 +17,7 @@ spec = Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   s.platform      = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 2.0'
 
   s.has_rdoc      = true
   s.rdoc_options  = ['--charset=UTF-8']
@@ -29,7 +30,8 @@ spec = Gem::Specification.new do |s|
 
   s.requirements    = <<-EOS
 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.'
+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.
+Compass and sass are no longer hard dependencies. You'll need too add them on your own should you want them. We also should be able to work with sassc.
   EOS
 
   s.add_dependency 'haml', '~> 4.0', '>= 4.0.5'
@@ -37,14 +39,12 @@ Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if
   s.add_dependency 'tilt', '~> 2.0', '>= 2.0.1'
   s.add_dependency 'mime-types', '~> 2.1'
   s.add_dependency 'rest-client', '~> 1.7', '>= 1.7.2'
-  s.add_dependency 'listen', '~> 2.7', '>= 2.7.1'
+  s.add_dependency 'listen', '>= 2.7.1', '<= 4.0'
   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 'oga', '~> 1.3'
   s.add_dependency 'parallel', '~> 1.1', '> 1.1.1'
 
   s.add_development_dependency 'nokogiri', '~> 1.5.0','>= 1.5.10'

data/lib/awestruct/cli/auto.rb

@@ -2,8 +2,6 @@ require 'awestruct/util/exception_helper'
 
 require 'listen'
 require 'guard/livereload'
-require 'compass'
-require 'compass/commands'
 
 module Awestruct
   module CLI

data/lib/awestruct/cli/generate.rb

@@ -1,6 +1,5 @@
 require 'awestruct/engine'
 require 'awestruct/util/exception_helper'
-require 'compass'
 
 module Awestruct
   module CLI

data/lib/awestruct/cli/init.rb

@@ -1,7 +1,5 @@
 require 'awestruct/cli/manifest'
 require 'awestruct/cli/options'
-require 'sass'
-require 'sass/plugin'
 
 module Awestruct
   module CLI
@@ -34,17 +32,13 @@ module Awestruct
 
         lib = nil
         case @framework
-          when 'compass'
-            scaffold_name = 'blueprint'
           when 'bootstrap'
             lib = 'bootstrap-sass'
           when 'foundation'
             lib = 'zurb-foundation'
-          when '960'
-            lib = 'ninesixty'
         end
         require lib unless lib.nil?
-        manifest.install_compass(@framework)
+        manifest.install_compass(@framework) unless lib.nil?
         if (@scaffold)
           manifest.copy_file('_config/site.yml', framework_path('base_site.yml'), :overwrite => true)
           manifest.copy_file('_layouts/base.html.haml', framework_path('base_layout.html.haml', scaffold_name))
@@ -67,7 +61,13 @@ module Awestruct
             manifest.remove_file('MIT-LICENSE.txt')
           end
         end
-        manifest.perform(@dir)
+        begin
+          manifest.perform(@dir)
+        rescue => e
+          puts e.backtrace
+          puts e.message
+          puts manifest.steps
+        end
       end
 
       def framework_path(path, framework = nil)

data/lib/awestruct/cli/manifest.rb

@@ -1,6 +1,3 @@
-require 'sass/callbacks'
-require 'compass'
-require 'compass/commands'
 require 'erb'
 require 'rubygems/specification'
 require 'ostruct'
@@ -26,7 +23,8 @@ module Awestruct
       end
 
       def template_file(path, input_path, state = {})
-        steps << TemplateFile.new(path, input_path, state.merge(load_gem))
+        new_state = state.merge(load_gem(true))
+        steps << TemplateFile.new(path, input_path, new_state)
       end
 
       def copy_file(path, input_path, opts = {})
@@ -77,11 +75,15 @@ module Awestruct
 
       private
 
-      def load_gem
+      def load_gem(add_compass = false)
         spec = {:dependencies => {}}
         gem_spec = Gem::Specification::load(
           File.join(File.dirname(__FILE__), "../../../", "awestruct.gemspec"))
 
+        if add_compass
+          gem_spec.add_dependency('compass', '>= 1.0.1')
+        end
+
         gem_spec.dependencies.each { |d| spec[:dependencies][d.name] = d}
         spec[:awestruct_version] = gem_spec.version
         spec
@@ -230,8 +232,12 @@ module Awestruct
 
         def perform(dir)
 
+          begin
           rendered = ERB.new(File.read(@input_path), nil, '<>').result(
             OpenStruct.new(@state).instance_eval { binding })
+          rescue => e
+            puts "::DEBUG:: #{e.message} state - #{@state}"
+          end
 
           p = File.join(dir, @path)
           $LOG.info "Create file: #{p}" if $LOG.info?
@@ -249,6 +255,10 @@ module Awestruct
         end
 
         def perform(dir)
+          require 'sass/callbacks'
+          require 'compass'
+          require 'compass/commands'
+
           ::Compass.configuration.sass_dir = 'stylesheets'
           ::Compass.configuration.css_dir = '_site/stylesheets'
           ::Compass.configuration.images_dir = 'images'

data/lib/awestruct/cli/options.rb

@@ -6,16 +6,9 @@ module Awestruct
   module CLI
 
     class Options
-      LOCAL_HOSTS = {
-        'localhost'  => 'localhost',
-        '0.0.0.0'    => 'localhost',
-        '127.0.0.1'  => 'localhost',
-        '::1'        => '[::1]',
-        'localhost6' => 'localhost6'
-      }
-      DEFAULT_BIND_ADDR = '0.0.0.0'
+      DEFAULT_BIND_ADDR = 'localhost'
       DEFAULT_PORT = 4242
-      DEFAULT_BASE_URL = %(http://#{LOCAL_HOSTS[DEFAULT_BIND_ADDR] || DEFAULT_BIND_ADDR}:#{DEFAULT_PORT})
+      DEFAULT_BASE_URL = %(http://#{DEFAULT_BIND_ADDR}:#{DEFAULT_PORT})
       DEFAULT_GENERATE_ON_ACCESS = false
 
       attr_accessor :generate
@@ -80,7 +73,7 @@ module Awestruct
             self.init     = init
             self.generate = false
           end
-          opts.on( '-f', '--framework FRAMEWORK', 'Specify a compass framework during initialization (bootstrap, foundation, blueprint, 960)' ) do |framework|
+          opts.on( '-f', '--framework FRAMEWORK', 'Specify a compass framework during initialization (bootstrap, foundation)' ) do |framework|
             self.framework = framework
           end
           opts.on( '--[no-]scaffold', 'Create scaffolding during initialization (default: true)' ) do |s|
@@ -163,7 +156,6 @@ module Awestruct
 
         opts.parse!(args)
         self.port ||= DEFAULT_PORT
-        self.bind_addr = LOCAL_HOSTS[DEFAULT_BIND_ADDR] if self.bind_addr === DEFAULT_BIND_ADDR
         self.base_url = %(http://#{self.bind_addr}:#{self.port}) if self.base_url === DEFAULT_BASE_URL
 
         self.generate = true if self.generate.nil?

data/lib/awestruct/cli/server.rb

@@ -2,6 +2,7 @@ require 'rack'
 require 'rack/builder'
 require 'rack/server'
 require 'awestruct/rack/app'
+require 'awestruct/rack/debug'
 require 'awestruct/rack/generate'
 require 'awestruct/cli/options'
 
@@ -18,11 +19,11 @@ module Awestruct
       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?
+        unless port_open? @bind_addr, @port
+          $LOG.error "#{@bind_addr}:#{@port} not available for server" if $LOG.error?
           abort
         end
-        url = %(http://#{Options::LOCAL_HOSTS[@bind_addr] || @bind_addr}:#{@port})
+        url = %(http://#{@bind_addr}:#{@port})
         msg = %(Starting preview server at #{url} (Press Ctrl-C to shutdown))
         $LOG.info %(#{'*' * msg.length}\n#{msg}\n#{'*' * msg.length}\n) if $LOG.info?
 
@@ -30,12 +31,13 @@ module Awestruct
         generate_on_access = @generate_on_access
         app = ::Rack::Builder.new do
           use Awestruct::Rack::GenerateOnAccess if generate_on_access
+          use Awestruct::Rack::Debug
           map "/" do
             run Awestruct::Rack::App.new( path )
           end
         end
 
-          ::Rack::Server::start( :app => app,
+          ::Rack::Server::start(:app => app,
                                 :Port => @port,
                                 :Host => @bind_addr
                                )

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

@@ -30,7 +30,7 @@ slim:
   :format: :xhtml
 
 slim|html:
-  :format: :html5
+  :format: :html
 
 asciidoctor:
   :backend: html5

data/lib/awestruct/context.rb

@@ -26,6 +26,8 @@ module Awestruct
           else
             @page[k_sym] = v if @page.key?(k_sym) && (@page[k_sym].class == v.class)
           end
+        else # new key, just add it
+          @page[k_sym] = v
         end
       end
     end

data/lib/awestruct/engine.rb

@@ -15,7 +15,6 @@ require 'set'
 require 'date'
 require 'erb'
 
-require 'compass'
 require 'parallel'
 
 class OpenStruct
@@ -71,8 +70,14 @@ module Awestruct
       $LOG.debug 'execute_pipeline' if $LOG.debug?
       $LOG.info 'Excecuting pipeline...' if $LOG.info?
       execute_pipeline(false)
-      $LOG.debug 'configure_compass' if $LOG.debug?
-      configure_compass
+      begin
+        if require('compass') || defined?(::Compass)
+          $LOG.debug 'configure_compass' if $LOG.debug?
+          configure_compass
+        end
+      rescue LoadError
+        # doesn't matter if we can't load it
+      end
       $LOG.debug 'set_urls' if $LOG.debug?
       set_urls( site.pages )
       $LOG.debug 'build_page_index' if $LOG.debug?

data/lib/awestruct/frameworks/base_Gemfile

@@ -27,15 +27,17 @@ source 'https://rubygems.org'                             # This tells Bundler w
 gem 'awestruct', '>= <%= awestruct_version %>'                               # Goes without saying
 gem 'webrick', '~> 1.3.1'                                 # The rack webserver to use in dev mode
 
-gem 'compass', '<%= dependencies['compass'].requirement %>'
 <% if framework.eql? 'bootstrap' %>
 gem 'bootstrap-sass', '<%= dependencies['bootstrap-sass'].requirement %>'
+gem 'compass', '<%= dependencies['compass'].requirement %>'
 <% end %>
 <% if framework.eql? 'foundation' %>
 gem 'zurb-foundation', '<%= dependencies['zurb-foundation'].requirement %>'
+gem 'compass', '<%= dependencies['compass'].requirement %>'
 <% end %>
 <% if framework.eql? '960' %>
 gem 'compass-960-plugin', '<%= dependencies['compass-960-plugin'].requirement %>'
+gem 'compass', '<%= dependencies['compass'].requirement %>'
 <% end %>
 
 # FIXME

data/lib/awestruct/handler_chains.rb

@@ -23,6 +23,17 @@ module Awestruct
     def initialize(include_defaults=true)
       @chains = []
       self << :defaults if include_defaults
+
+      # Register our sassc templates
+      begin
+        if require('sassc') || defined?(::Sassc)
+          require 'awestruct/handlers/template/sassc'
+          ::Tilt.register ::Awestruct::Tilt::SassSasscTemplate,'sass'
+          ::Tilt.register ::Awestruct::Tilt::ScssSasscTemplate,'scss'
+        end
+      rescue LoadError
+        # doesn't matter if we can't load it
+      end
     end
 
     def[](path)

data/lib/awestruct/handlers/css_tilt_handler.rb

@@ -3,8 +3,6 @@ require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/front_matter_handler'
 require 'awestruct/handlers/layout_handler'
 
-require 'compass'
-
 module Awestruct
   module Handlers
     class CssTiltHandler < BaseTiltHandler
@@ -26,10 +24,13 @@ module Awestruct
 
         # Sass / Scss
         opts[:load_paths] ||= []
-        ::Compass::Frameworks::ALL.each do |framework|
-          opts[:load_paths] << framework.stylesheets_directory
+
+        if require('compass') || defined?(::Compass)
+          ::Compass::Frameworks::ALL.each do |framework|
+            opts[:load_paths] << framework.stylesheets_directory
+          end
+          opts[:load_paths] << ::Compass::SpriteImporter.new
         end
-        opts[:load_paths] << ::Compass::SpriteImporter.new
         opts[:load_paths] << File.join(site.config.dir.to_s, File.dirname(relative_source_path) ) unless relative_source_path.nil?
 
         # Less use Paths instead of load_paths

data/lib/awestruct/handlers/template/sassc.rb

@@ -0,0 +1,21 @@
+require 'tilt'
+require 'sassc'
+
+module Awestruct
+  module Tilt
+    class SassSasscTemplate < ::Tilt::SassTemplate
+      self.default_mime_type = 'text/css'
+
+      def prepare
+        @engine = ::SassC::Engine.new(data, sass_options)
+      end
+    end
+    class ScssSasscTemplate < ::Tilt::ScssTemplate
+      self.default_mime_type = 'text/css'
+
+      def prepare
+        @engine = ::SassC::Engine.new(data, sass_options)
+      end
+    end
+  end
+end

data/lib/awestruct/rack/app.rb

@@ -11,12 +11,12 @@ module Awestruct
         path = env['PATH_INFO']
         fs_path = File.join( @doc_root, path )
 
-        if ( File.directory?( fs_path ) )
-          if ( ! ( path =~ %r(/$) ) )
+        if File.directory?(fs_path)
+          if !(path =~ %r(/$))
             return [ 301,
-                     { 'location'=>File.join(path, '') },
+                     { 'location'.freeze => File.join(path, '') },
                      ["Redirecting to: #{path}"] ]
-          elsif ( File.file?( File.join( fs_path, 'index.html' ) ) )
+          elsif File.file?(File.join(fs_path, 'index.html'))
             fs_path = File.join( fs_path, 'index.html' )
           end
         end
@@ -27,18 +27,18 @@ module Awestruct
         # The Body must respond to each and must only yield String
         # values. The Body itself should not be an instance of String,
         # as this will break in Ruby 1.9.
-        if ( File.file?( fs_path ) )
+        if File.file?(fs_path)
           body = read_content( fs_path )
           content_type = ::Rack::Mime.mime_type( File.extname(fs_path) )
           length = body.size.to_s
           [ 200,
-            {"Content-Type" => content_type, "Content-Length" => length},
+            {'Content-Type'.freeze => content_type, 'Content-Length'.freeze => length},
             [body] ]
         else
           body, content_type = read_error_document(path)
           length = body.size.to_s
           [ 404,
-            {"Content-Type" => content_type || 'text/plain', "Content-Length" => length},
+            {'Content-Type'.freeze => content_type || 'text/plain', 'Content-Length'.freeze => length},
             [body] ]
         end
       end
@@ -46,14 +46,14 @@ module Awestruct
       def read_error_document( path )
         doc_path = nil
         htaccess = File.join( @doc_root, '.htaccess' )
-        if ( File.file?( htaccess ) )
+        if File.file?(htaccess)
           File.open( htaccess ).each_line do |line|
-            if ( line =~ %r(^.*ErrorDocument[ \t]+404[ \t]+(.+)$) )
+            if line =~ %r(^.*ErrorDocument[ \t]+404[ \t]+(.+)$)
               doc_path = $1
             end
           end
         end
-        if ( doc_path )
+        if doc_path
           fs_doc_path = File.join( @doc_root, doc_path )
           return [read_content( fs_doc_path ), ::Rack::Mime.mime_type( File.extname(fs_doc_path) )] if File.file?( fs_doc_path )
         end
@@ -62,7 +62,7 @@ module Awestruct
 
 
       def read_content( path )
-        input_stream = IO.open(IO.sysopen(path, "rb"), "rb" )
+        input_stream = IO.open(IO.sysopen(path, 'rb'), 'rb')
         result = input_stream.read
         return result
       ensure