machined 0.1.0 → 0.1.1

data/lib/machined/helpers/locals_helpers.rb

@@ -6,6 +6,13 @@ module Machined
     module LocalsHelpers
       extend ActiveSupport::Concern
       
+      # Returns the locals hash. It's actually an instance
+      # of `ActiveSupport::HashWithIndifferentAccess`, so strings
+      # and symbols can be used interchangeably.
+      def locals
+        @locals ||= ActiveSupport::HashWithIndifferentAccess.new
+      end
+      
       # Adds psuedo local variables from the given hash, where
       # the key is the name of the variable. This is provided so
       # processors can add local variables without having access
@@ -18,11 +25,14 @@ module Machined
         end
       end
       
-      # Returns the locals hash. It's actually an instance
-      # of `ActiveSupport::HashWithIndifferentAccess`, so strings
-      # and symbols can be used interchangeably.
-      def locals
-        @locals ||= ActiveSupport::HashWithIndifferentAccess.new
+      # Temporarily changes the locals. The given +temporary_locals+
+      # will be merged into the current locals. After the block is
+      # executed, the locals will be restored to their original state.
+      def with_locals(temporary_locals)
+        old_locals, self.locals = self.locals.dup, temporary_locals
+        yield
+      ensure
+        @locals = old_locals
       end
       
       # Returns true if the given +name+ has been set as a local

data/lib/machined/helpers/render_helpers.rb

@@ -88,20 +88,26 @@ module Machined
         template = resolve_partial(partial)
         depend_on template
         
+        partial_locals = {}
+        
+        # Temporarily use a different layout (default to no layout)
+        partial_locals[:layout] = options.delete(:layout) || false
+        
         # Add object with the name of the partial
         # as the local variable name.
         if object = options.delete(:object)
           object_name = options.delete(:as) || template.to_s[/_?(\w+)(\.\w+)*$/, 1]
-          self.locals[object_name] = object
-          self.locals["#{object_name}_counter"] = options.delete(:counter)
+          partial_locals[object_name] = object
+          partial_locals["#{object_name}_counter"] = options.delete(:counter)
         end
         
         # Add locals from leftover options
-        if locals = options.delete(:locals) || options
-          self.locals = locals
+        if leftover_locals = options.delete(:locals) || options
+          partial_locals.merge!(leftover_locals)
         end
         
-        evaluate_without_processor template, Machined::Processors::LayoutProcessor
+        # Now evaluate the partial
+        with_locals(partial_locals) { return evaluate(template) }
       end
       
       protected
@@ -124,15 +130,6 @@ module Machined
         
         raise Sprockets::FileNotFound, "couldn't find file '#{path}'"
       end
-      
-      # Evaluates the given path without using the given processor.
-      # This is used to evaluate templates without wrapping
-      # them in layouts.
-      def evaluate_without_processor(path, processor) # :nodoc:
-        processors = environment.attributes_for(path).processors.dup
-        processors.delete processor
-        evaluate path, :processors => processors
-      end
     end
   end
 end

data/lib/machined/processors/layout_processor.rb

@@ -58,7 +58,7 @@ module Machined
             template = processor.new(layout_path.to_s) { result }
             result   = template.render(context, {}) { data }
           rescue Exception => e
-            context.annotate_exception! e
+            context.send :annotate_exception!, e
             raise
           end
         end

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/machined/helpers/locals_helper_spec.rb

@@ -34,4 +34,20 @@ describe Machined::Helpers::LocalsHelpers do
       end
     end
   end
+  
+  describe "#with_locals" do
+    it "temporarily changes the local variables" do
+      with_context do |context, output|
+        context.locals = { :title => "Hello World", :layout => "main" }
+        context.with_locals(:layout => false, :body => "...") do
+          context.title.should == "Hello World"
+          context.body.should == "..."
+          context.layout.should be_false
+        end
+        context.title.should == "Hello World"
+        context.layout.should == "main"
+        context.respond_to?(:body).should be_false
+      end
+    end
+  end
 end

data/spec/machined/helpers/render_helpers_spec.rb

@@ -31,6 +31,27 @@ describe Machined::Helpers::RenderHelpers do
       end
     end
     
+    it "returns the original locals state once rendered" do
+      within_construct do |c|
+        c.file "pages/index.html.erb", <<-CONTENT.unindent
+          ---
+          title: Hello World
+          ---
+          <%= render "partial", :title => "Title...", :text => "Text..." %>
+          title: <%= title %>
+          text: <%= respond_to?(:text) %>
+        CONTENT
+        c.file "views/partial.html.erb", "title: <%= title %>\ntext: <%= text %>\n"
+        
+        machined.pages["index.html"].to_s.should == <<-CONTENT.unindent
+          title: Title...
+          text: Text...
+          title: Hello World
+          text: false
+        CONTENT
+      end
+    end
+    
     it "renders partial collections" do
       within_construct do |c|
         c.file "pages/index.html.erb", %(<%= render "number", :collection => [1,2,3] %>)
@@ -40,6 +61,26 @@ describe Machined::Helpers::RenderHelpers do
       end
     end
     
+    it "does not wrap the partial in a layout" do
+      within_construct do |c|
+        c.file "pages/index.html.erb", %(<%= render "partial" %>)
+        c.file "views/layouts/main.html.erb", "<h1><%= yield %></h1>"
+        c.file "views/partial.html.erb", "Hello World"
+        
+        machined.pages["index.html"].to_s.should == "<h1>Hello World</h1>"
+      end
+    end
+    
+    it "optionally wraps the partial in a layout" do
+      within_construct do |c|
+        c.file "pages/index.html.erb", %(<%= render "partial", :layout => "partial" %>)
+        c.file "views/layouts/partial.html.erb", "<h1><%= yield %></h1>"
+        c.file "views/partial.html.erb", "Hello World"
+        
+        machined.pages["index.html"].to_s.should == "<h1>Hello World</h1>"
+      end
+    end
+    
     it "raises a Sprockets::FileNotFound error if the partial is missing" do
       within_construct do |c|
         c.file "pages/index.html.erb", %(<%= render "partial" %>)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: machined
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pete Browne
@@ -15,271 +10,206 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 Z
+date: 2011-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: sprockets
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
-  requirement: *id001
-  name: sprockets
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: sprockets-sass
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
         version: "0.3"
-  requirement: *id002
-  name: sprockets-sass
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: padrino-helpers
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
         version: "0.10"
-  requirement: *id003
-  name: padrino-helpers
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: activesupport
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
         version: "3.1"
-  requirement: *id004
-  name: activesupport
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: i18n
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
         version: "0.6"
-  requirement: *id005
-  name: i18n
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: thor
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 14
         version: "0.14"
-  requirement: *id006
-  name: thor
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: crush
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
         version: "0.3"
-  requirement: *id007
-  name: crush
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
         version: "2.6"
-  requirement: *id008
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: rack-test
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
         version: "0.6"
-  requirement: *id009
-  name: rack-test
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: test-construct
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
         version: "1.2"
-  requirement: *id010
-  name: test-construct
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: unindent
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
-  requirement: *id011
-  name: unindent
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  name: haml
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id012
-  name: haml
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  name: sass
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id013
-  name: sass
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  name: slim
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id014
-  name: slim
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  name: erubis
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id015
-  name: erubis
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  name: rdiscount
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id016
-  name: rdiscount
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  name: uglifier
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id017
-  name: uglifier
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id018
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id018
 description: Why another static site generator? Machined is for the developers who know and love the asset pipeline of Rails 3.1 and want to develop blazingly fast static websites. It's built from the ground up using Sprockets 2.0.
 email: 
 - me@petebrowne.com
@@ -350,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3798876877697823148
       segments: 
       - 0
       version: "0"
@@ -359,14 +289,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3798876877697823148
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: machined
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A static site generator and Rack server built using Sprockets 2.0