awestruct 0.5.6.beta4 → 0.5.6.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451184e1b282a5edaa7f91b42dbd97c3d65b1c8b
-  data.tar.gz: 4f974bef0f5cbd233b4fb5e170c64b5ccd2fb2ae
+  metadata.gz: a8da264db525dd9720d5fb24fcf7caa8f7e0be5f
+  data.tar.gz: eccb58baf90c70f61768063f74afbfa2fdb6ec0d
 SHA512:
-  metadata.gz: 050c58ea9b0d2147c60e761712761d8417daf42034576b6b1e88deb6fc49f68e9cbea02ee33f7b5feb1aa54d765c0ce58544d300934a643f3600163385bc7144
-  data.tar.gz: 5b6a63471993f469cfe4ca6ba5aa6896b31d8634aee872c60bee0ecb98d93fd607ce1a4a0d79c7881bdbe7f1df31b60402240bc1cd4c163681e90210b35c738a
+  metadata.gz: 28fed5e74ec3e7e0009a91a89712988d8e29cfc7baed8e2e7235598ad104930e472325e522e751a4f96ab0266050f43f493685d14c1b97a64b8672d6dcffa869
+  data.tar.gz: f446847490a8208a8da6884a0511a9fcfca1441618cdae077883ab657bd5bf2b2b3d25928843f05bcb062dbb38869aeaacd32cbacd0979cd4ebc4277b4dea8ef

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-10-24'
+  s.date          = '2014-11-05'
 
   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

@@ -46,8 +46,11 @@ module Awestruct
               generate_thread = Thread.new {
                 begin
                   if ( File.extname(path) == '.sass' || File.extname(path) == '.scss' )
-                    # TODO use sass here, eventually
+                    # 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 = []

data/lib/awestruct/cli/options.rb

@@ -97,11 +97,11 @@ module Awestruct
             self.auto     = true
             self.port     = DEFAULT_PORT
             self.profile  = 'development'
-            self.livereload = livereload
+            self.livereload = true
           end
           opts.on( '-a', '--auto', 'Auto-generate when changes are noticed' ) do |a|
             self.auto = a
-            self.livereload = livereload
+            self.livereload = true
           end
           opts.on( '--livereload', 'Support for browser livereload' ) do |livereload|
             self.livereload = livereload
@@ -153,6 +153,10 @@ module Awestruct
         end
 
         opts.parse!(args)
+        self.base_url ||= DEFAULT_BASE_URL
+        self.port ||= DEFAULT_PORT
+        self.bind_addr ||= DEFAULT_BIND_ADDR
+
         self.generate = true if self.generate.nil?
         self
       end # parse()

data/lib/awestruct/compass/default_configuration.rb

@@ -31,7 +31,7 @@ module Awestruct
       end
 
       def default_css_dir
-        site.css_dir
+        File.join site.output_dir, 'stylesheets'
       end
 
       def default_javascripts_dir
@@ -51,7 +51,7 @@ module Awestruct
       end
 
       def default_generated_images_dir
-        File.join site.output_path, 'images'
+        File.join site.output_dir, 'images'
       end
 
       def default_http_generated_images_dir

data/lib/awestruct/engine.rb

@@ -263,7 +263,8 @@ module Awestruct
     def configure_compass 
       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.sass_dir        = File.join( site.config.dir, 'stylesheets' )
+      site.css_dir         = File.join( site.config.output_dir, 'stylesheets' )
       site.javascripts_dir = File.join( site.config.dir, 'javascripts' )
 
       default_config = Awestruct::Compass::DefaultConfiguration.new(site)
@@ -272,7 +273,9 @@ module Awestruct
         default_config.inherit_from! ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
       end 
 
+      ::Compass.reset_configuration!
       ::Compass.add_configuration default_config
+      ::Compass.configuration # return for use elsewhere
 
       # TODO: Should we add an on_stylesheet_error block?  
     end
@@ -320,11 +323,11 @@ module Awestruct
     # path - relative to output dir
     def page_by_source_path(path)
       if (path.include? '_layout')
-        site.layouts.find { |p| p.source_path.to_s == path }
+        site.layouts.find { |p| p.source_path.to_s.include? path }
       elsif (path.include? '_partial')
-        site.partials.find { |p| p.source_path.to_s == path }
+        site.partials.find { |p| p.source_path.to_s.include? path }
       else
-        site.pages.find { |p| p.source_path.to_s == path }
+        site.pages.find { |p| p.source_path.to_s.include? path }
       end
     end
 

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.6.beta4'
+  VERSION = '0.5.6.beta5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.6.beta4
+  version: 0.5.6.beta5
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml