awestruct 0.5.6.beta → 0.5.6.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0a51f409f8009c7c325d9d2e7acea5437e2c1e
-  data.tar.gz: e392c0a5f0fd4252953d61a0399d548de9f072c3
+  metadata.gz: d83143b07ec3085c78256ce5718b736cef452ee4
+  data.tar.gz: 323e14b76cb3f6536c9b95a04b51fdb685e0226b
 SHA512:
-  metadata.gz: 0b818f8b17abc86d8f471b52b0d3e8e2820d77619a3492c9ca47d34a4a47961a07891bc73b4fa7d3a7b7baebfee4a00bbff2d5933a7ffd8eb8bca6055804b925
-  data.tar.gz: 3a7dd3521dbe40d059c79a12edcc51d36a2c6d7aa7da2b54b4ea6dd557885615a46a855436d6ef71a3882a2585fbadb7251bd42ca5b3f00f0317b115fdaef4f2
+  metadata.gz: bea4c25337f3a86b3a155fc5a9e86ed80c32c1dffc91d77cab85537d1b7544e642c97318e622e0ea748f5528a944af9a0efdb43b092669791260beccb676ed49
+  data.tar.gz: ec81e398c1aa6dd99d6ee7e2b6641c37d60f6765fa6369245f8e2d58ed7c49358ca81bafba94e94f340db9b54cb8fd00c03220fe57ce145baf7fcd07e287ca44

data/Gemfile

@@ -5,8 +5,8 @@ group :development do
   gem 'rspec', '~> 2.14.1'
   gem 'rake', '~> 10.2.2'
   gem 'guard-rspec', '~> 4.2.0', :require => false
-  gem 'pry', :require => false
-  gem 'pry-byebug', :require => false
+  #gem 'pry', :require => false
+  #gem 'pry-byebug', :require => false
 end
 
 group :test do

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-09-26'
+  s.date          = '2014-10-17'
 
   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']
@@ -36,9 +36,9 @@ Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if
   s.add_dependency 'asciidoctor' # we're pretty good about backwards compat
   s.add_dependency 'nokogiri', '~> 1.5.10'
   s.add_dependency 'tilt', '~> 2.0.1'
-  s.add_dependency 'compass', '~> 0.12.4'
+  s.add_dependency 'compass', '~> 1.0.1'
   s.add_dependency 'compass-960-plugin', '~> 0.10.4'
-  s.add_dependency 'bootstrap-sass', '~> 3.1.1.0'
+  s.add_dependency 'bootstrap-sass', '~> 3.2.0.2'
   s.add_dependency 'zurb-foundation', '~> 4.3.2'
   s.add_dependency 'mime-types', '~> 2.1'
   s.add_dependency 'rest-client', '~> 1.7.2'

data/lib/awestruct/cli/auto.rb

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

data/lib/awestruct/cli/manifest.rb

@@ -1,11 +1,6 @@
 require 'sass/callbacks'
-require 'compass/app_integration'
-require 'compass/configuration'
-require 'compass/logger'
-require 'compass/actions'
-require 'compass/commands/base'
-require 'compass/commands/registry'
-require 'compass/commands/create_project'
+require 'compass'
+require 'compass/commands'
 require 'compass/installers/bare_installer'
 
 module ::Compass::AppIntegration::StandAlone

data/lib/awestruct/engine.rb

@@ -333,9 +333,9 @@ module Awestruct
         generate_page_internal(page)
       end
 
-      pages = [ page ]
+      regen_pages = Set.new [ page ]
 
-      pages.each do |p|
+      regen_pages.each do |p|
         if $LOG.debug?
           $LOG.debug "--------------------"
           $LOG.debug "Page: #{p.output_path} #{p.relative_source_path} #{p.__is_layout ? 'Layout':''}"
@@ -353,8 +353,7 @@ module Awestruct
         end
       end
 
-      regen_pages = Set.new
-
+      binding.pry
       if page.dependencies.has_changed_content || page.__is_layout || page.is_partial?
         regen_pages += page.dependencies.dependents
       end
@@ -380,10 +379,9 @@ module Awestruct
       regen_pages.each do |p|
         puts "Regenerating page #{p.output_path}" unless config.quiet
         generate_page_internal(p)
-        pages << p
       end
 
-      pages
+      regen_pages
     end
 
     def run_auto_for_non_page(file)

data/lib/awestruct/extensions/paginator.rb

@@ -59,10 +59,10 @@ module Awestruct
 
       def execute(site)
         removal_path = nil
-        all = @collection || site.send( @prop_name )
+        _all = @collection || site.send( @prop_name )
         i = 1
         paginated_pages = []
-        all.each_slice( @per_page ) do |slice|
+        _all.each_slice( @per_page ) do |slice|
           page = site.engine.find_and_load_site_page( @input_path )
           removal_path ||= page.output_path
           slice.extend( Paginated )

data/lib/awestruct/extensions/tagger.rb

@@ -89,6 +89,7 @@ module Awestruct
           paginator = Awestruct::Extensions::Paginator.new( @tagged_items_property, @input_path, options )
           primary_page = paginator.execute( site )
           tag.primary_page = primary_page
+          tag.pages.each {|p| primary_page.dependencies.add_key_dependency(p)}
         end
 
         site.send( "#{@tagged_items_property}_tags=", ordered_tags )

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.6.beta'
+  VERSION = '0.5.6.beta2'
 end

data/spec/awestruct/handlers/tilt_handler_spec.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'awestruct/config'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/tilt_handler'
+require 'awestruct/engine'
 
 require 'hashery'
 require 'tilt/template'
@@ -106,7 +107,8 @@ describe Awestruct::Handlers::TiltHandler do
   context 'when loading an engine not installed' do
     specify 'should not throw exceptions; instead have the error in the rendered output' do
       # setup
-      Awestruct::Engine.instance.config.verbose = true
+      @site.config.verbose = true
+      Awestruct::Engine.new(@site.config)
       Tilt::register Tilt::BogusTemplate, '.bogus',
       log = StringIO.new
       $LOG = Logger.new(log)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.6.beta
+  version: 0.5.6.beta2
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: compass-960-plugin
   requirement: !ruby/object:Gem::Requirement
@@ -105,14 +105,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1.0
+        version: 3.2.0.2
 - !ruby/object:Gem::Dependency
   name: zurb-foundation
   requirement: !ruby/object:Gem::Requirement