markaby 0.6.10 → 0.7.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 0.7.0
+
+* Sinatra 1.0 support
+* Full Tilt 1.0+ support, including "yield" support for layouts
+
 = 0.6.10
 
 * Rails fixes for form_for + content_for

data/Markaby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{markaby}
-  s.version = "0.6.10"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["_why", "Tim Fletcher", "John Barton", "spox", "smtlaissezfaire"]
-  s.date = %q{2010-08-13}
+  s.date = %q{2010-08-15}
   s.description = %q{Tim Fletcher and _why's ruby driven HTML templating system}
   s.email = %q{scott@railsnewbie.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/markaby/rails/current.rb",
      "lib/markaby/rails/deprecated.rb",
      "lib/markaby/rails/rails_builder.rb",
+     "lib/markaby/sinatra.rb",
      "lib/markaby/tags.rb",
      "lib/markaby/tilt.rb",
      "spec/markaby/builder_spec.rb",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
      "spec/markaby/rails/views/markaby/_partial_child_with_locals.mab",
      "spec/markaby/rails/views/markaby/access_to_helpers.mab",
      "spec/markaby/rails/views/markaby/broken.mab",
+     "spec/markaby/rails/views/markaby/commented_out_template.mab",
      "spec/markaby/rails/views/markaby/correct_template_values.mab",
      "spec/markaby/rails/views/markaby/double_output.mab",
      "spec/markaby/rails/views/markaby/form_for.mab",
@@ -66,6 +68,14 @@ Gem::Specification.new do |s|
      "spec/markaby/rails/views/markaby/yielding_with_content_for.mab",
      "spec/markaby/rails_spec.rb",
      "spec/markaby/rails_version_spec.rb",
+     "spec/markaby/sinatra/app.rb",
+     "spec/markaby/sinatra/sinatra_spec.rb",
+     "spec/markaby/sinatra/views/helpers.mab",
+     "spec/markaby/sinatra/views/layout.mab",
+     "spec/markaby/sinatra/views/markaby_template.mab",
+     "spec/markaby/sinatra/views/scope_instance_variables.mab",
+     "spec/markaby/sinatra/views/simple_html.mab",
+     "spec/markaby/sinatra/views/variables.mab",
      "spec/markaby/tilt/erb.erb",
      "spec/markaby/tilt/locals.mab",
      "spec/markaby/tilt/markaby.mab",
@@ -90,6 +100,8 @@ Gem::Specification.new do |s|
      "spec/markaby/rails/spec_helper.rb",
      "spec/markaby/rails_spec.rb",
      "spec/markaby/rails_version_spec.rb",
+     "spec/markaby/sinatra/app.rb",
+     "spec/markaby/sinatra/sinatra_spec.rb",
      "spec/markaby/tilt_spec.rb",
      "spec/spec_helper.rb"
   ]

data/README.rdoc

@@ -5,7 +5,7 @@ It is an alternative to ERb which weaves the two languages together.
 Also a replacement for templating languages which use primitive languages
 that blend with HTML.
 
-== Using Markaby as a Rails plugin
+== Using Markaby as a Rails plugin / gem
 
 Write Rails templates in pure Ruby.  Example layout:
 
@@ -18,23 +18,37 @@ Write Rails templates in pure Ruby.  Example layout:
     body do
       p flash[:notice], :style => "color: green"
 
-      self << content_for_layout
+      div.signup! do
+        form_for @user do |f|
+          f.text_field :email
+        end
+      end
+
+      yield
     end
   end
 
-Markaby supports many versions of rails:
+Markaby templates end in .mab
+
+Markaby supports many versions of rails, including the latest rails:
 
   1.2.2, 1.2.3, 1.2.4, 1.2.5, 1.2.6, 2.2.0,
   2.2.1, 2.2.2, 2.2.3, 2.3.1, 2.3.2, 2.3.2.1,
   2.3.3, 2.3.3.1, 2.3.4, 2.3.5, 2.3.6, 2.3.7,
   2.3.8
 
-Install it as a plugin:
+Rails 3.0 support is planned.
+
+=== Install it as a plugin
 
   script/plugin install git://github.com/markaby/markaby.git
 
+=== Install it as a gem
+
+  gem install markaby
+
 If you are loading it in a different way (from a gem), make sure
-it's on the LOAD_PATH, and add the following in
+it's on the $LOAD_PATH, and add the following in
 an initializer (config/initializers/markaby.rb will work):
 
   require 'markaby'
@@ -42,6 +56,25 @@ an initializer (config/initializers/markaby.rb will work):
 
   Markaby::Rails.load
 
+Or, you could try config.gem, but that's now known as a bad idea.
+
+
+== Using Markaby with Sinatra (1.0+)
+
+  require 'markaby/sinatra'
+
+  get '/foo' do
+    mab :my_template # my_template.mab in the sinatra view path
+  end
+
+If you are looking for sinatra support pre 0.7, see http://github.com/sbfaulkner/sinatra-markaby
+
+
+== Using Markaby with other frameworks
+
+Markaby has a Tilt module, so in principle, any web framework that supports
+Tilt can/will also support Markaby.
+
 
 == Using Markaby as a Ruby class
 

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.7.0

data/lib/markaby/rails/current.rb

@@ -7,9 +7,11 @@ module Markaby
 
       def compile(template, local_assigns={})
         <<-CODE
-          handler = Markaby::Rails::TemplateHandler.new
-          handler.view = self
-          handler.render(lambda { #{template.source} }, local_assigns)
+          __template_handler = Markaby::Rails::TemplateHandler.new
+          __template_handler.view = self
+          __template_handler.render(lambda {
+            #{template.source}
+          }, local_assigns)
         CODE
       end
 
@@ -41,7 +43,30 @@ module Markaby
       end
     end
 
-    module CaptureHelper
+    module Helpers
+      # allow fragments to act as strings.  url_for has a
+      # case statment in it:
+      #
+      # case options
+      # when String
+      #   ...
+      #
+      # which essential is doing the following:
+      #
+      # String === options
+      #
+      # That assertion fails with Markaby::Fragments, which are essential
+      # builder/string fragments.
+      #
+      def url_for(options={})
+        case options
+        when Markaby::Fragment
+          super(options.to_s)
+        else
+          super
+        end
+      end
+
       def capture(*args, &block)
         if output_buffer.kind_of?(Markaby::Builder)
           output_buffer.capture(&block)
@@ -53,34 +78,8 @@ module Markaby
   end
 end
 
-# allow fragments to act as strings.  url_for has a
-# nasty case statment in it:
-#
-# case options
-# when String
-#   ...
-#
-# which essential is doing the following:
-#
-# String === options
-#
-ActionView::Helpers::UrlHelper.class_eval do
-  alias_method :url_for_aliased_by_markaby, :url_for
-
-  def url_for(options={})
-    options ||= {}
-
-    url = case options
-    when Markaby::Fragment
-      url_for_aliased_by_markaby(options.to_s)
-    else
-      url_for_aliased_by_markaby(options)
-    end
-  end
-end
-
 ActionView::Base.class_eval do
-  include Markaby::Rails::CaptureHelper
+  include Markaby::Rails::Helpers
 end
 
 ActionView::Template.register_template_handler(:mab, Markaby::Rails::TemplateHandler)

data/lib/markaby/sinatra.rb

@@ -0,0 +1,18 @@
+require 'markaby/tilt'
+require 'sinatra'
+
+module Sinatra
+  class Base
+    # sinatra's #render looks for options in Sinatra::Application
+    # by asking if it responds_to?(:mab)
+    # Unfortunately, if the the mab kernel method is included,
+    # Sinatra::Application will respond_to? it.
+    set :mab, {}
+  end
+
+  module Templates
+    def mab(template, options={}, locals={})
+      render :mab, template, options, locals
+    end
+  end
+end

data/lib/markaby/tilt.rb

@@ -1,12 +1,33 @@
+require 'markaby'
 require 'tilt'
 
 module Markaby
   module Tilt
     class Template < ::Tilt::Template
+      class TiltBuilder < Markaby::Builder
+        def __capture_markaby_tilt__(&block)
+          __run_markaby_tilt__ do
+            text capture(&block)
+          end
+        end
+      end
+
       def evaluate(scope, locals, &block)
-        builder = Markaby::Builder.new({}, scope)
+        builder = TiltBuilder.new({}, scope)
         builder.locals = locals
-        builder.instance_eval(data, __FILE__, __LINE__)
+
+        if block
+          builder.instance_eval <<-CODE, __FILE__, __LINE__
+            def __run_markaby_tilt__
+              #{data}
+            end
+          CODE
+
+          builder.__capture_markaby_tilt__(&block)
+        else
+          builder.instance_eval(data, __FILE__, __LINE__)
+        end
+
         builder.to_s
       end
 
@@ -17,5 +38,5 @@ end
 
 module Tilt
   MarkabyTemplate = Markaby::Tilt::Template
-  register "mab", MarkabyTemplate
+  register :mab, MarkabyTemplate
 end

data/spec/markaby/rails/views/markaby/commented_out_template.mab

@@ -0,0 +1 @@
+# <!-- raise an ruby error -->

data/spec/markaby/rails_spec.rb

@@ -116,6 +116,9 @@ if RUNNING_RAILS
     def routes
     end
 
+    def commented_out_template
+    end
+
     def render_with_yielding
       render :layout   => "layout.mab",
              :template => "markaby/yielding"
@@ -255,6 +258,14 @@ if RUNNING_RAILS
       assert_equal expected_output, @response.body
     end
 
+    def test_commented_out_template_cant_raise_errors
+      get :commented_out_template
+      assert_response :success
+
+      expected_output = ""
+      assert_equal expected_output, @response.body
+    end
+
     if Rails::VERSION::MAJOR >= 2
       def test_renders_form_for_properly
         get :renders_form_for

data/spec/markaby/sinatra/app.rb

@@ -0,0 +1,49 @@
+set :views, lambda { File.join(File.dirname(__FILE__), "views") }
+
+get '/empty_action' do
+  "hi there"
+end
+
+get '/markaby_template' do
+  mab :markaby_template
+end
+
+get '/simple_html' do
+  mab :simple_html
+end
+
+get '/variables' do
+  mab :variables, {}, :name => "Scott Taylor"
+end
+
+get '/variables_with_locals' do
+  mab :variables, :locals => { :name => "Scott Taylor" }
+end
+
+get '/scope_instance_variables' do
+  @name = "Scott Taylor"
+  mab :variables
+end
+
+template :layout_index do
+  'div.title "Hello World!"'
+end
+
+get "/named_template" do
+  mab :layout_index
+end
+
+get "/layout" do
+  @display_layout = true
+  mab :layout_index
+end
+
+helpers do
+  def chunky
+    "bacon"
+  end
+end
+
+get "/helpers" do
+  mab :helpers
+end

data/spec/markaby/sinatra/sinatra_spec.rb

@@ -0,0 +1,64 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/app")
+require 'rack/test'
+
+describe "sinatra integration" do
+  include Rack::Test::Methods
+
+  def app
+    @app ||= Sinatra::Application
+  end
+
+  it "should render an empty" do
+    get '/empty_action'
+    last_response.should be_ok
+  end
+
+  it "should render an empty markaby template" do
+    get '/markaby_template'
+    last_response.should be_ok
+    last_response.body.should == ""
+  end
+
+  it "should render a template with html in it" do
+    get '/simple_html'
+    last_response.should be_ok
+    last_response.body.should == "<ul><li>hi</li><li>there</li></ul>"
+  end
+
+  it "should be able to pass variables" do
+    get '/variables'
+    last_response.should be_ok
+    last_response.body.should == '<p class="name">Scott Taylor</p>'
+  end
+
+  it "should be able to pass variables through locals" do
+    get '/variables_with_locals'
+    last_response.should be_ok
+    last_response.body.should == '<p class="name">Scott Taylor</p>'
+  end
+
+  it "should have scope to instance variables" do
+    get '/scope_instance_variables'
+    last_response.should be_ok
+    last_response.body.should == '<p class="name">Scott Taylor</p>'
+  end
+
+  it "should be able to use named templates" do
+    get "/named_template"
+    last_response.should be_ok
+    last_response.body.should == '<div class="title">Hello World!</div>'
+  end
+
+  it "should be able to use a layout with :layout" do
+    get '/layout'
+    last_response.should be_ok
+    last_response.body.should == '<html><div class="title">Hello World!</div></html>'
+  end
+
+  it "should be able to access helpers in a template" do
+    get '/helpers'
+    last_response.should be_ok
+    last_response.body.should == "<li>bacon</li>"
+  end
+end

data/spec/markaby/sinatra/views/helpers.mab

@@ -0,0 +1 @@
+li chunky

data/spec/markaby/sinatra/views/layout.mab

@@ -0,0 +1,7 @@
+if @display_layout
+  html do
+    yield
+  end
+else
+  yield
+end

data/spec/markaby/sinatra/views/scope_instance_variables.mab

@@ -0,0 +1,3 @@
+p :class => "name" do
+  @name
+end

data/spec/markaby/sinatra/views/simple_html.mab

@@ -0,0 +1,4 @@
+ul do
+  li "hi"
+  li "there"
+end

data/spec/markaby/sinatra/views/variables.mab

@@ -0,0 +1,3 @@
+p :class => "name" do
+  name
+end

data/spec/markaby/tilt_spec.rb

@@ -1,6 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-require 'markaby/tilt'
-require 'erb'
 
 module Markaby
   describe Tilt, "templates" do
@@ -36,15 +34,6 @@ module Markaby
       tilt.render.should == "<html></html>"
     end
 
-    it "should evaluate a block in the scope given" do
-      pending do
-        scope = mock 'scope object', :foo => "bar"
-
-        tilt = ::Tilt::MarkabyTemplate.new { li foo }
-        tilt.render(scope).should == "<li>bar</li>"
-      end
-    end
-
     it "should evaluate a template file in the scope given" do
       scope = mock 'scope object', :foo => "bar"
 
@@ -58,14 +47,14 @@ module Markaby
     end
 
     it "should yield to the block given" do
-      pending do
-        tilt = ::Tilt::MarkabyTemplate.new("tilt/yielding.mab", &@block)
-        output = tilt.render(Object.new, {}) do
-          text("Joe")
-        end
+      tilt = ::Tilt::MarkabyTemplate.new("tilt/yielding.mab", &@block)
+      eval_scope = Markaby::Builder.new
 
-        output.should == "Hey Joe"
+      output = tilt.render(Object.new, {}) do
+        text("Joe")
       end
+
+      output.should == "Hey Joe"
     end
 
     it "should be able to render two templates in a row" do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'test/unit'
 require 'spec'
 require 'spec/interop/test'
@@ -9,6 +8,9 @@ require 'markaby'
 require 'markaby/kernel_method'
 require 'markaby/rails'
 
+require 'markaby/sinatra'
+require 'erb'
+
 module MarkabyTestHelpers
   def link_to(obj)
     %{<a href="">#{obj}</a>}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: markaby
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 10
-  version: 0.6.10
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - _why
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 -04:00
+date: 2010-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - lib/markaby/rails/current.rb
 - lib/markaby/rails/deprecated.rb
 - lib/markaby/rails/rails_builder.rb
+- lib/markaby/sinatra.rb
 - lib/markaby/tags.rb
 - lib/markaby/tilt.rb
 - spec/markaby/builder_spec.rb
@@ -77,6 +78,7 @@ files:
 - spec/markaby/rails/views/markaby/_partial_child_with_locals.mab
 - spec/markaby/rails/views/markaby/access_to_helpers.mab
 - spec/markaby/rails/views/markaby/broken.mab
+- spec/markaby/rails/views/markaby/commented_out_template.mab
 - spec/markaby/rails/views/markaby/correct_template_values.mab
 - spec/markaby/rails/views/markaby/double_output.mab
 - spec/markaby/rails/views/markaby/form_for.mab
@@ -97,6 +99,14 @@ files:
 - spec/markaby/rails/views/markaby/yielding_with_content_for.mab
 - spec/markaby/rails_spec.rb
 - spec/markaby/rails_version_spec.rb
+- spec/markaby/sinatra/app.rb
+- spec/markaby/sinatra/sinatra_spec.rb
+- spec/markaby/sinatra/views/helpers.mab
+- spec/markaby/sinatra/views/layout.mab
+- spec/markaby/sinatra/views/markaby_template.mab
+- spec/markaby/sinatra/views/scope_instance_variables.mab
+- spec/markaby/sinatra/views/simple_html.mab
+- spec/markaby/sinatra/views/variables.mab
 - spec/markaby/tilt/erb.erb
 - spec/markaby/tilt/locals.mab
 - spec/markaby/tilt/markaby.mab
@@ -149,5 +159,7 @@ test_files:
 - spec/markaby/rails/spec_helper.rb
 - spec/markaby/rails_spec.rb
 - spec/markaby/rails_version_spec.rb
+- spec/markaby/sinatra/app.rb
+- spec/markaby/sinatra/sinatra_spec.rb
 - spec/markaby/tilt_spec.rb
 - spec/spec_helper.rb