RubyGems - sinatra-content-for2 - Versions diffs - 0.2.4 → 0.3.alpha1 - Mend

sinatra-content-for2 0.2.4 → 0.3.alpha1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

data/.gitignore +5 -3
data/.rspec +1 -0
data/Gemfile +6 -0
data/Rakefile +35 -0
data/lib/sinatra/content_for2.rb +111 -68
data/lib/sinatra/content_for2/base_handler.rb +33 -0
data/lib/sinatra/content_for2/erb_handler.rb +37 -0
data/lib/sinatra/content_for2/haml_handler.rb +21 -0
data/lib/sinatra/content_for2/slim_handler.rb +48 -0
data/lib/sinatra/content_for2/version.rb +6 -0
data/sinatra-content-for2.gemspec +24 -17
data/spec/lib/sinatra/content_for2_spec.rb +43 -0
data/spec/spec_helper.rb +7 -0
data/spec/templates/main.erb +3 -0
data/spec/templates/main.haml +3 -0
data/spec/templates/sub.erb +3 -0
data/spec/templates/sub.haml +3 -0
metadata +133 -17

data/.gitignore CHANGED Viewed

@@ -1,4 +1,6 @@
 doc/
-dist/
-tmp/
-*.swp
+pkg/
+*.sw?
+.yardoc/
+Gemfile.lock

data/.rspec ADDED Viewed

	@@ -0,0 +1 @@
1	+ -c -f progress -r ./spec/spec_helper.rb

data/Gemfile ADDED Viewed

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

data/Rakefile ADDED Viewed

@@ -0,0 +1,35 @@
+begin
+  require 'bundler'
+  Bundler::GemHelper.install_tasks
+rescue LoadError
+  $stderr.puts "Please install bundler with: gem install bundler"
+end
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require "sinatra/content_for2/version"
+desc "Default: run all specs"
+task :default => :spec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new
+rescue LoadError
+  $stderr.puts "Please install RSpec 2"
+end
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new do |t|
+    t.options = ['--title', "Sinatra::ContentFor2 #{Sinatra::ContentFor2::VERSION}"]
+    if defined?(Encoding)
+      t.options << '--charset'
+      t.options << 'utf-8'
+    end
+  end
+rescue LoadError
+  $stderr.puts "Yard is not installed. Please run gem install yard"
+end

data/lib/sinatra/content_for2.rb CHANGED Viewed

@@ -1,79 +1,122 @@
 module Sinatra
   module ContentFor2
-    # Capture a block of content to be rendered later. For example:
-    #
-    #     <% content_for :head do %>
-    #       <script type="text/javascript" src="/foo.js"></script>
-    #     <% end %>
-    #
-    # You can call +content_for+ multiple times with the same key
-    # (in the example +:head+), and when you render the blocks for
-    # that key all of them will be rendered, in the same order you
-    # captured them.
-    #
-    # Your blocks can also receive values, which are passed to them
-    # by <tt>yield_content</tt>
-    def content_for(key, &block)
-      content_blocks[key.to_sym] << block if block_given?
+    def self.included(base) #:nodoc:
+      base.send(:include, CurrentTemplateEngine) unless base.method_defined?(:current_template_engine)
     end
-    # Check if a block of content with the given key was defined. For
-    # example:
-    #
-    #     <% content_for :head do %>
-    #       <script type="text/javascript" src="/foo.js"></script>
-    #     <% end %>
-    #
-    #     <% if content_for? :head %>
-    #       <span>content "head" was defined.</span>
-    #     <% end %>
-    def content_for?(key)
-      content_blocks[key.to_sym].any?
+    module CurrentTemplateEngine
+      attr_reader :current_template_engine
+      def render(engine, *) #:nodoc:
+        @current_template_engine, engine_was = engine, @current_template_engine
+        output = super
+        @current_template_engine = engine_was
+        output
+      end
     end
+  end
+end
-    # Render the captured blocks for a given key. For example:
-    #
-    #     <head>
-    #       <title>Example</title>
-    #       <% yield_content :head %>
-    #     </head>
-    #
-    # Would render everything you declared with <tt>content_for
-    # :head</tt> before closing the <tt><head></tt> tag.
-    #
-    # You can also pass values to the content blocks by passing them
-    # as arguments after the key:
-    #
-    #     <% yield_content :head, 1, 2 %>
-    #
-    # Would pass <tt>1</tt> and <tt>2</tt> to all the blocks registered
-    # for <tt>:head</tt>.
-    #
-    # *NOTICE* that you call this without an <tt>=</tt> sign. IE,
-    # in a <tt><% %></tt> block, and not in a <tt><%= %></tt> block.
-    #
-    # *NOTICE*
-    # if you call from erubis, you call this with <tt>=</tt> sign.IE,
-    #in a <tt><%= %></tt> block, and not in a <tt><% %></tt> block.
-    def yield_content(key, *args)
-      content_blocks[key.to_sym].map do |content|
-        if respond_to?(:block_is_haml?) && block_is_haml?(content)
-          capture_haml(*args, &content)
-        elsif defined?(Erubis)
-          content.binding.eval ' _buf = "" '
-          content.call(*args)
-        else
-          content.call
-        end
-      end.join
+require 'sinatra/content_for2/base_handler'
+require 'sinatra/content_for2/erb_handler'
+require 'sinatra/content_for2/haml_handler'
+require 'sinatra/content_for2/slim_handler'
+module Sinatra::ContentFor2
+  def capture_html(*args, &block)
+    handler = find_proper_handler
+    captured_html = nil
+    if handler && handler.is_type? && handler.block_is_type?(block)
+      captured_html = handler.capture_from_template(*args, &block)
+    end
+    if captured_html.nil? && block_given?
+      captured_html = block.call(*args)
     end
+    captured_html || ''
+  end
-    private
+  # Capture a block of content to be rendered later. For example:
+  #
+  #     <% content_for :head do %>
+  #       <script type="text/javascript" src="/foo.js"></script>
+  #     <% end %>
+  #
+  # You can call +content_for+ multiple times with the same key
+  # (in the example +:head+), and when you render the blocks for
+  # that key all of them will be rendered, in the same order you
+  # captured them.
+  #
+  # Your blocks can also receive values, which are passed to them
+  # by <tt>yield_content</tt>
+  def content_for(key, content = nil, &block)
+    key = key.to_sym
+    unless content.nil?
+      content_blocks[key] << content
+    end
+    if block_given?
+      content_blocks[key] << block
+    end
+    ''
+  end
+  # Check if a block of content with the given key was defined. For
+  # example:
+  #
+  #     <% content_for :head do %>
+  #       <script type="text/javascript" src="/foo.js"></script>
+  #     <% end %>
+  #
+  #     <% if content_for? :head %>
+  #       <span>content "head" was defined.</span>
+  #     <% end %>
+  def content_for?(key)
+    content_blocks[key.to_sym].any?
+  end
-      def content_blocks
-        @content_blocks ||= Hash.new {|h,k| h[k] = [] }
-      end
+  # Render the captured blocks for a given key. For example:
+  #
+  #     <head>
+  #       <title>Example</title>
+  #       <% yield_content :head %>
+  #     </head>
+  #
+  # Would render everything you declared with <tt>content_for
+  # :head</tt> before closing the <tt><head></tt> tag.
+  #
+  # You can also pass values to the content blocks by passing them
+  # as arguments after the key:
+  #
+  #     <% yield_content :head, 1, 2 %>
+  #
+  # Would pass <tt>1</tt> and <tt>2</tt> to all the blocks registered
+  # for <tt>:head</tt>.
+  #
+  # *NOTICE* that you call this without an <tt>=</tt> sign. IE,
+  # in a <tt><% %></tt> block, and not in a <tt><%= %></tt> block.
+  #
+  # *NOTICE*
+  # if you call from erubis, you call this with <tt>=</tt> sign.IE,
+  #in a <tt><%= %></tt> block, and not in a <tt><% %></tt> block.
+  def yield_content(key, *args)
+    blocks = content_blocks[key.to_sym]
+    return nil if blocks.empty?
+    blocks.map do |block|
+      block.kind_of?(Proc) ? capture_html(*args, &block) : block.to_s
+    end.join('')
+  end
+protected
+  def content_blocks
+    @content_blocks ||= Hash.new { |h, k| h[k] = [] }
+  end
+  def find_proper_handler
+    Sinatra::ContentFor2::BaseHandler.classes.map do |handlerClass|
+      handlerClass.new(self)
+    end.find do |handler|
+      handler.engines.include?(current_template_engine) && handler.is_type?
+    end
   end
-  helpers ContentFor2
 end

data/lib/sinatra/content_for2/base_handler.rb ADDED Viewed

@@ -0,0 +1,33 @@
+class Sinatra::ContentFor2::BaseHandler
+  class << self
+    def classes
+      @classes ||= []
+    end
+    def register(handlerClass)
+      classes << handlerClass
+    end
+  end
+  attr_reader :template
+  def initialize(template)
+    @template = template
+  end
+  def engines
+    raise NotImplementedError.new
+  end
+  def is_type?
+    raise NotImplementedError.new
+  end
+  def block_is_type?(block)
+    raise NotImplementedError.new
+  end
+  def capture_from_template(*args, &block)
+    raise NotImplementedError.new
+  end
+end

data/lib/sinatra/content_for2/erb_handler.rb ADDED Viewed

@@ -0,0 +1,37 @@
+class Sinatra::ContentFor2::ErbHandler < Sinatra::ContentFor2::BaseHandler
+  attr_reader :output_buffer
+  def initialize(template)
+    super
+    @output_buffer = template.instance_variable_get(:@_out_buf)
+  end
+  def is_type?
+    ! self.output_buffer.nil?
+  end
+  def block_is_type?(block)
+    is_type? || (block && eval('defined?(__in_erb_template)', block.binding))
+  end
+  def engines
+    @engines ||= [ :erb, :erubis ]
+  end
+  def capture_from_template(*args, &block)
+    self.output_buffer, _buf_was = '', self.output_buffer
+    block.call(*args)
+    ret = eval('@_out_buf', block.binding)
+    self.output_buffer = _buf_was
+    ret
+  end
+protected
+  def output_buffer=(value)
+    template.instance_variable_set(:@_out_buf, value)
+  end
+end
+Sinatra::ContentFor2::BaseHandler.register(Sinatra::ContentFor2::ErbHandler)

data/lib/sinatra/content_for2/haml_handler.rb ADDED Viewed

@@ -0,0 +1,21 @@
+class Sinatra::ContentFor2::HamlHandler < Sinatra::ContentFor2::BaseHandler
+  def is_type?
+    template.respond_to?(:is_haml?) && template.is_haml?
+  end
+  def block_is_type?(block)
+    template.block_is_haml?(block)
+  end
+  def capture_from_template(*args, &block)
+    eval("_hamlout ||= @haml_buffer", block.binding) # this is for rbx
+    template.capture_haml(*args, &block)
+  end
+  def engines
+    @engines ||= [ :haml ]
+  end
+end
+Sinatra::ContentFor2::BaseHandler.register(Sinatra::ContentFor2::HamlHandler)

data/lib/sinatra/content_for2/slim_handler.rb ADDED Viewed

@@ -0,0 +1,48 @@
+class Sinatra::ContentFor2::SlimHandler < Sinatra::ContentFor2::BaseHandler
+  class << self
+    def setup_slim
+      return if @slim_set
+      if defined?(Slim)
+        Slim::Engine.set_default_options(:buffer => '@_out_buf', :generator => Temple::Generators::StringBuffer)
+        @slim_set = true
+      end
+    end
+  end
+  attr_reader :output_buffer
+  def initialize(template)
+    super
+    self.class.setup_slim
+    @output_buffer = template.instance_variable_get(:@_out_buf)
+  end
+  def is_type?
+    ! self.output_buffer.nil?
+  end
+  def capture_from_template(*args, &block)
+    self.output_buffer, _buf_was = "", self.output_buffer
+    block.call(*args)
+    ret = eval("@_out_buf", block.binding)
+    self.output_buffer = _buf_was
+    ret
+  end
+  def block_is_type?(block)
+    is_type? || (block && eval('defined? __in_erb_template', block.binding))
+  end
+  def engines
+    @engines ||= [ :slim ]
+  end
+protected
+  def output_buffer=(val)
+    template.instance_variable_set(:@_out_buf, val)
+  end
+end
+Sinatra::ContentFor2::BaseHandler.register(Sinatra::ContentFor2::SlimHandler)

data/lib/sinatra/content_for2/version.rb ADDED Viewed

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

data/sinatra-content-for2.gemspec CHANGED Viewed

@@ -1,9 +1,14 @@
 #encoding: utf-8
+$LOAD_PATH << File.expand_path('../lib', __FILE__)
+require 'sinatra/content_for2/version'
 Gem::Specification.new do |s|
   s.name    = "sinatra-content-for2"
-  s.version = "0.2.4"
-  s.date    = "2011-02-04"
+  s.version = Gem::Version.new(Sinatra::ContentFor2::VERSION)
+  s.date = Time.now.strftime('%Y-%m-%d')
   s.description = "Small Sinatra extension to add a content_for helper similar to Rails'"
   s.summary     = "Small Sinatra extension to add a content_for helper similar to Rails'"
@@ -18,20 +23,22 @@ Gem::Specification.new do |s|
   s.rubygems_version  = "1.3.7"
   s.add_dependency "sinatra"
-  if s.respond_to?(:add_development_dependency)
-    s.add_development_dependency "contest"
-    s.add_development_dependency "sr-mg"
-    s.add_development_dependency "redgreen"
-  end
-  s.files = %w[
-.gitignore
-LICENSE
-README.rdoc
-sinatra-content-for2.gemspec
-lib/sinatra/content_for2.rb
-test/content_for_test.rb
-]
+  s.add_development_dependency "rake"
+  s.add_development_dependency "yard"
+  s.add_development_dependency "rspec-core"
+  s.add_development_dependency "rspec-expectations"
+  s.add_development_dependency "rr"
+  s.add_development_dependency "slim"
+  s.add_development_dependency "erubis"
+  s.add_development_dependency "haml"
+  s.add_development_dependency "bundler", ">= 1.0.10"
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 end

data/spec/lib/sinatra/content_for2_spec.rb ADDED Viewed

@@ -0,0 +1,43 @@
+require 'sinatra/base'
+require 'erubis'
+require 'haml'
+require 'slim'
+class SpecTemplates < Sinatra::Base
+  set :environment, :test
+  set :views, File.join(File.dirname(__FILE__), '..', '..', 'templates')
+  helpers Sinatra::ContentFor2
+end
+describe Sinatra::ContentFor2 do
+  def templates
+    @templates ||= begin
+      r = SpecTemplates.new
+      # remove Rack magic
+      while !r.kind_of?(SpecTemplates) do
+        r = r.instance_variable_get(:@app)
+      end
+      r
+    end
+  end
+  [ :erb, :haml, :erubis ].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/spec_helper.rb ADDED Viewed

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'sinatra/content_for2'
+RSpec.configure do |config|
+  config.mock_with :rr
+end

data/spec/templates/main.erb ADDED Viewed

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

data/spec/templates/main.haml ADDED Viewed

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

data/spec/templates/sub.erb ADDED Viewed

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

data/spec/templates/sub.haml ADDED Viewed

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

metadata CHANGED Viewed

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-content-for2
 version: !ruby/object:Gem::Version
-  prerelease: false
+  hash: -3702664266
+  prerelease: 4
   segments:
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - alpha
+  - 1
+  version: 0.3.alpha1
 platform: ruby
 authors:
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-02-04 00:00:00 +03:00
+date: 2011-06-23 00:00:00 +04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -25,64 +27,168 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 3
         segments:
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: contest
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 3
         segments:
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency
-  name: sr-mg
+  name: yard
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 3
         segments:
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency
-  name: redgreen
+  name: rspec-core
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
+        hash: 3
         segments:
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency
+  name: rr
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency
+  name: slim
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency
+  name: erubis
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency
+  name: haml
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency
+  name: bundler
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  type: :development
+  version_requirements: *id010
 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:
 - .gitignore
+- .rspec
+- Gemfile
 - LICENSE
 - README.rdoc
-- sinatra-content-for2.gemspec
+- Rakefile
 - lib/sinatra/content_for2.rb
+- lib/sinatra/content_for2/base_handler.rb
+- lib/sinatra/content_for2/erb_handler.rb
+- lib/sinatra/content_for2/haml_handler.rb
+- lib/sinatra/content_for2/slim_handler.rb
+- lib/sinatra/content_for2/version.rb
+- sinatra-content-for2.gemspec
+- spec/lib/sinatra/content_for2_spec.rb
+- spec/spec_helper.rb
+- spec/templates/main.erb
+- spec/templates/main.haml
+- spec/templates/sub.erb
+- spec/templates/sub.haml
 - test/content_for_test.rb
 has_rdoc: true
 homepage: https://github.com/Undev/sinatra-content-for2
@@ -98,23 +204,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      hash: 3
       segments:
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
+      hash: 25
       segments:
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 rubyforge_project: sinatra-ditties
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 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.haml
+- spec/templates/sub.erb
+- spec/templates/sub.haml
+- test/content_for_test.rb