sinatra-content-for2 0.3.alpha1 → 0.3

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "ripper", :platforms => :mri_18
+gem "ripper", :group => :development, :platforms => :mri_18
 
 gemspec
 

data/lib/sinatra/content_for2/erb_handler.rb

@@ -3,7 +3,7 @@ class Sinatra::ContentFor2::ErbHandler < Sinatra::ContentFor2::BaseHandler
 
   def initialize(template)
     super
-    @output_buffer = template.instance_variable_get(:@_out_buf)
+    @output_buffer = get_buf
   end
 
   def is_type?
@@ -21,16 +21,20 @@ class Sinatra::ContentFor2::ErbHandler < Sinatra::ContentFor2::BaseHandler
   def capture_from_template(*args, &block)
     self.output_buffer, _buf_was = '', self.output_buffer
     block.call(*args)
-    ret = eval('@_out_buf', block.binding)
+    ret = eval('@_out_buf || @_buf', block.binding)
     self.output_buffer = _buf_was
     ret
   end
 
 protected
   def output_buffer=(value)
+    template.instance_variable_set(:@_buf, value)
     template.instance_variable_set(:@_out_buf, value)
   end
 
+  def get_buf
+    template.instance_variable_get(:@_out_buf) || template.instance_variable_get(:@_buf)
+  end
 end
 
 Sinatra::ContentFor2::BaseHandler.register(Sinatra::ContentFor2::ErbHandler)

data/lib/sinatra/content_for2/slim_handler.rb

@@ -10,7 +10,7 @@ class Sinatra::ContentFor2::SlimHandler < Sinatra::ContentFor2::BaseHandler
   end
 
   attr_reader :output_buffer
-  
+
   def initialize(template)
     super
     self.class.setup_slim

data/lib/sinatra/content_for2/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module ContentFor2
-    VERSION = '0.3.alpha1'.freeze
+    VERSION = '0.3'.freeze
   end
 end
 

data/sinatra-content-for2.gemspec

@@ -6,7 +6,7 @@ require 'sinatra/content_for2/version'
 
 Gem::Specification.new do |s|
   s.name    = "sinatra-content-for2"
-  s.version = Gem::Version.new(Sinatra::ContentFor2::VERSION)
+  s.version = Gem::Version.new(Sinatra::ContentFor2::VERSION.dup)
 
   s.date = Time.now.strftime('%Y-%m-%d')
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.rubygems_version  = "1.3.7"
 
   s.add_dependency "sinatra"
-  s.add_development_dependency "rake"
+  s.add_development_dependency "rake", "!= 0.9.0"
   s.add_development_dependency "yard"
   s.add_development_dependency "rspec-core"
   s.add_development_dependency "rspec-expectations"

data/spec/lib/sinatra/content_for2_spec.rb

@@ -23,20 +23,13 @@ describe Sinatra::ContentFor2 do
     end
   end
 
-  [ :erb, :haml, :erubis ].each do |engine|
+  [ :erb, :erubis, :haml, :slim ].each do |engine|
     it "should render #{engine} template" do
-      erubis_was = Erubis
-      if engine == :erb
-        Object.send(:remove_const, :Erubis)
-      end
       sr = templates.send(engine, :sub, :layout => false, :eat_errors => false)
       sr.should_not =~ /sub/
       r = templates.send(engine, :main, :layout => false, :eat_errors => false)
       r.should =~ /main/
       r.should =~ /sub/
-      if engine == :erb
-        Object.const_set(:Erubis, erubis_was)
-      end
     end
   end
 end

data/spec/templates/main.erubis

@@ -0,0 +1,3 @@
+main
+<% yield_content :test %>
+

data/spec/templates/main.slim

@@ -0,0 +1,3 @@
+main
+= yield_content :test
+

data/spec/templates/sub.erubis

@@ -0,0 +1,3 @@
+<% content_for :test do %>
+  sub
+<% end %>

data/spec/templates/sub.slim

@@ -0,0 +1,3 @@
+- content_for :test do
+  sub
+

metadata

@@ -1,175 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-content-for2
-version: !ruby/object:Gem::Version 
-  hash: -3702664266
-  prerelease: 4
-  segments: 
-  - 0
-  - 3
-  - alpha
-  - 1
-  version: 0.3.alpha1
+version: !ruby/object:Gem::Version
+  version: '0.3'
+  prerelease: 
 platform: ruby
-authors: 
-- "Nicol\xC3\xA1s Sanguinetti"
+authors:
+- Nicolás Sanguinetti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160673040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160673040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160671220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160671220
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2160670200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160670200
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: &2160669060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160669060
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &2160667960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160667960
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2160667100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: slim
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160667100
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: &2160666340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: erubis
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2160666340
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &2160665780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2160665780
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2160665140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2160665140
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2160664240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *2160664240
 description: Small Sinatra extension to add a content_for helper similar to Rails'
 email: contacto@nicolassanguinetti.info
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -186,51 +144,48 @@ files:
 - spec/lib/sinatra/content_for2_spec.rb
 - spec/spec_helper.rb
 - spec/templates/main.erb
+- spec/templates/main.erubis
 - spec/templates/main.haml
+- spec/templates/main.slim
 - spec/templates/sub.erb
+- spec/templates/sub.erubis
 - spec/templates/sub.haml
+- spec/templates/sub.slim
 - test/content_for_test.rb
-has_rdoc: true
 homepage: https://github.com/Undev/sinatra-content-for2
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sinatra-ditties
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Small Sinatra extension to add a content_for helper similar to Rails'
-test_files: 
+test_files:
 - spec/lib/sinatra/content_for2_spec.rb
 - spec/spec_helper.rb
 - spec/templates/main.erb
+- spec/templates/main.erubis
 - spec/templates/main.haml
+- spec/templates/main.slim
 - spec/templates/sub.erb
+- spec/templates/sub.erubis
 - spec/templates/sub.haml
+- spec/templates/sub.slim
 - test/content_for_test.rb
+has_rdoc: true