markaby 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aed95364f1421acaab2191897e35fb1a278051cd
-  data.tar.gz: 605b3d61e47bdc08256f2034fd5717ab080585f7
+  metadata.gz: 455850946266c24fdba0054e72e738909a92f031
+  data.tar.gz: fb9ea63ab1b9d64366d7af5deda7c4af1c09ec2a
 SHA512:
-  metadata.gz: 93daf68ab25910cffadcd442f9dd0e05d9e2afb245f16f308776e27e0876d54a9068624d065cf52f03798925aafb4626c14f7ef51d7970d038f4c9a8a2c6e778
-  data.tar.gz: 824f9a360031c25711dadad5bd32a0f84ec12533c2d88bcb57835a9c8ef32804a7a097a338987f48e2c2bd46e029c5830d5195d0fb754a87248cc0bcf55a5e50
+  metadata.gz: 89dd42bd927211894995fc1fd98633345d140d047e379fb647f8c84c88a8cda28fee5677c7fe0283691045659ed8f96a982987e512828f1d2f97fa7fa4f42616
+  data.tar.gz: 4dcbdfcaa7c11683e572595f24f2cd9267c09d1280a97f38151abaa1e2fdb6bdfc53ae77c04e9cd4a67e8692476a22af11436b9cdb7992136f5bf6d33db886c2

data/.gitignore

@@ -18,4 +18,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp
+.byebug_history

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+sudo: false
+rvm:
+  - 1.8
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+matrix:
+  allow_failures:
+    - rvm: 2.5
+    - rvm: jruby-9.1.15.0
+    - rvm: rbx-2
+install: bundle install --without=development --jobs=3 --retry=3

data/Gemfile

@@ -5,4 +5,8 @@ gem 'builder'
 group :test do
   gem 'rake'
   gem 'rspec'
-end
+  gem 'test-unit', :platform => [:mri_22, :mri_23, :mri_24, :mri_25]
+  gem 'byebug', :platform => [:mri_20, :mri_21, :mri_22, :mri_23, :mri_24, :mri_25]
+  gem 'ruby-debug', :platform => [:mri_18]
+  gem 'ruby-debug19', :platform => [:mri_19]
+end

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2006-2018 markaby group (Scott Taylor (smtlaissezfaire), Jonathan Gillette (_why), and related maintainers)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Markaby.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'markaby/version'
+require 'markaby'
 
 Gem::Specification.new do |spec|
   spec.name          = "markaby"

data/README.rdoc

@@ -5,35 +5,84 @@ 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.
 
-=== Install it as a gem
+== Install it
 
-  gem install markaby
+Just do what everyone else does:
 
-== Using Markaby with Sinatra (1.0+)
+  # in Gemfile:
+  gem 'markaby'
 
-  get '/foo' do
-    mab :my_template # my_template.mab in the sinatra view path
-  end
+then bundle install:
 
-If you are looking for sinatra support pre 0.7, see http://github.com/sbfaulkner/sinatra-markaby
+  bundle install
+
+or gem install if you are a weirdo not using bundler.
+
+=== Using Markaby with Rails 4/5+:
+
+Install the gem (using bundler), then:
+
+  # in config/initializers/markaby.rb:
+
+  require 'markaby/rails'
 
-A note on Tilt - using markaby with html5 doesn't quite yet work properly.  If you'd like to render a template with html 5, call this at the start of a .mab template:
+  Markaby::Rails::TemplateHandler.register!({
+    tagset: Markaby::HTML5,
+    indent: 2,
+  })
 
-enable_html5!
+Note, Markaby hasn't been tested on anything below Rails 5.  Please submit bugs
+and/or patches if you'd like support for anything before rails 5.
 
-Or enable html 5 globally:
+Name your templates with an html.mab extension.  You'll also want to configure
+your text editor to see .mab as ruby.
 
-Markaby::Builder.class_eval do
-  @@options = Markaby::Builder::HTML5_OPTIONS
-end
+Here's how you'd do that for Atom:
 
-== Using Markaby with other frameworks
+1. Install the file-types module:
+
+    apm install file-types
+
+1. in your config: Atom -> Config:
+
+    "*":
+      "file-types":
+        "\\.mab$": "source.ruby"
+
+Now that's some chunky bacon!
+
+=== Using Markaby in helpers:
+
+Just call Markaby::Builder with a block as below.
+
+You can also require 'markaby/kernel_method' to make it even easier:
+
+    # my_helper.rb:
+    require 'markaby/kernel_method' # or put this in an initializer
+
+    module MyHelper
+      # note - you can also use Markaby::Builder.new { }.to_s
+      def chunky_bacon
+        mab do
+          p "Chunky Bacon!"
+        end
+      end
+    end
+
+=== Using Markaby with Sinatra (1.0+)
+
+  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
 
 Tilt has a Markaby module, so in principle, any web framework that supports
 Tilt will also support Markaby.  See the appropriate tilt documentation:
 
-  http://github.com/rtomayko/tilt
-
+http://github.com/rtomayko/tilt
 
 == Using Markaby as a Ruby class
 
@@ -220,11 +269,26 @@ won't work with this technique.
     end
   end
 
+== Some other notes, so you aren't confused:
+
+=== On using different tagsets:
+
+Because of the ways various frameworks sub-render templates, to use a different
+tagset in a rendered sub template, you may need to set it at the top of your
+sub-template:
+
+  self.tagset = Markaby::HTML5
+  # or Markaby::Transitional, Markaby::XHTMLStrict, Markaby::XHTMLFrameset
+
+Note, this is only necessary if you were rendering, say, a one off page as
+html transitional but had the default engine as html5.
+
+
 = Credits
 
 Markaby is a work of immense hope by Tim Fletcher and why the lucky stiff.
 It is maintained by joho, spox, and smtlaissezfaire.
-Thankyou for giving it a whirl.
+Thank you for giving it a whirl.
 
 Markaby is inspired by the HTML library within cgi.rb.  Hopefully it will
 turn around and take some cues.

data/lib/markaby.rb

@@ -17,10 +17,15 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 # * Markaby::Tags: lists the roles of various XHTML tags to help Builder
 #   use these tags as they are intended.
 module Markaby
+  MAJOR = 0
+  MINOR = 9
+  TINY = 0
+
+  VERSION = "#{MAJOR}.#{MINOR}.#{TINY}"
+
   class InvalidXhtmlError < StandardError; end
 end
 
-require "markaby/version"
 require 'builder' unless defined?(Builder)
 require 'markaby/builder'
 require 'markaby/cssproxy'

data/lib/markaby/builder.rb

@@ -24,29 +24,13 @@ module Markaby
   class Builder
     include Markaby::BuilderTags
 
-    DEFAULT_OPTIONS = {
+    GENERIC_OPTIONS = {
       :indent                 => 0,
-      :output_helpers         => true,
-      :output_xml_instruction => true,
-      :output_meta_tag        => 'xhtml',
       :auto_validation        => true,
-      :tagset                 => Markaby::XHTMLTransitional,
-      :root_attributes => {
-        :xmlns      => 'http://www.w3.org/1999/xhtml',
-        :'xml:lang' => 'en',
-        :lang       => 'en'
-      }
     }
 
-    HTML5_OPTIONS = {
-      :indent                 => 0,
-      :output_helpers         => true,
-      :output_xml_instruction => false,
-      :output_meta_tag        => 'html5',
-      :auto_validation        => true,
-      :tagset                 => Markaby::HTML5,
-      :root_attributes        => {}
-    }
+    HTML5_OPTIONS   = HTML5.default_options.dup
+    DEFAULT_OPTIONS = GENERIC_OPTIONS.merge(HTML5_OPTIONS)
 
     @@options = DEFAULT_OPTIONS.dup
 
@@ -54,10 +38,6 @@ module Markaby
       @@options = DEFAULT_OPTIONS.dup
     end
 
-    def self.set_html5_options!
-      @@options = HTML5_OPTIONS.dup
-    end
-
     def self.set(option, value)
       @@options[option] = value
     end
@@ -66,15 +46,15 @@ module Markaby
       @@options[option]
     end
 
-    def self.ignored_helpers
-      @@ignored_helpers ||= []
-    end
+    attr_reader :tagset
 
-    def self.ignore_helpers(*helpers)
-      ignored_helpers.concat helpers
-    end
+    def tagset=(tagset)
+      @tagset = tagset
 
-    attr_accessor :output_helpers, :tagset
+      tagset.default_options.each do |k, v|
+        self.instance_variable_set("@#{k}".to_sym, v)
+      end
+    end
 
     # Create a Markaby builder object.  Pass in a hash of variable assignments to
     # +assigns+ which will be available as instance variables inside tag construction
@@ -171,6 +151,8 @@ module Markaby
     # the arguments are the same as the tags implemented via method_missing.
     def tag!(tag, *args, &block)
       ele_id = nil
+
+      # TODO: Move this logic to the tagset so that the tagset itself can validate + raise when invalid
       if @auto_validation && @tagset
         if !@tagset.tagset.has_key?(tag)
           raise InvalidXhtmlError, "no element `#{tag}' for #{tagset.doctype}"
@@ -183,15 +165,19 @@ module Markaby
 
           attrs.each do |k, v|
             atname = k.to_s.downcase.intern
-            unless k =~ /:/ or @tagset.tagset[tag].include? atname
+
+            unless k =~ /:/ or @tagset.tagset[tag].include?(atname) or (@tagset == Markaby::HTML5 && atname.to_s =~ /^data-/)
               raise InvalidXhtmlError, "no attribute `#{k}' on #{tag} elements"
             end
+
             if atname == :id
               ele_id = v.to_s
+
               if @used_ids.has_key? ele_id
                 raise InvalidXhtmlError, "id `#{ele_id}' already used (id's must be unique)."
               end
             end
+
             if AttrsBoolean.include? atname
               if v
                 attrs[k] = atname.to_s
@@ -229,13 +215,8 @@ module Markaby
     # method_missing used to be the lynchpin in Markaby, but it's no longer used to handle
     # HTML tags.  See html_tag for that.
     def method_missing(sym, *args, &block)
-      if @_helper.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym)
-        r = @_helper.send(sym, *args, &block)
-        if @output_helpers && r.respond_to?(:to_str)
-          fragment { @builder << r }
-        else
-          r
-        end
+      if @_helper.respond_to?(sym, true)
+        @_helper.send(sym, *args, &block)
       elsif @assigns.has_key?(sym)
         @assigns[sym]
       elsif @assigns.has_key?(stringy_key = sym.to_s)

data/lib/markaby/builder_tags.rb

@@ -56,16 +56,12 @@ module Markaby
 
     # Builds an html tag with HTML5 doctype instead.
     def html5(attrs = {}, &block)
-      enable_html5!
+      self.tagset = Markaby::HTML5
       html5_html(attrs, &block)
     end
 
     def enable_html5!
-      self.tagset = Markaby::HTML5
-
-      Markaby::Builder::HTML5_OPTIONS.each do |k, v|
-        self.instance_variable_set("@#{k}".to_sym, v)
-      end
+      raise NotImplementedError, "Deprecated! Call self.tagset = Markaby::HTML5"
     end
 
   private

data/lib/markaby/kernel_method.rb

@@ -1,8 +1,9 @@
 # You'll need to <tt>require 'markaby/kernel_method'</tt> for this.
+require 'markaby'
+
 module Kernel
   # Shortcut for creating a quick block of Markaby.
   def mab(*args, &block)
     Markaby::Builder.new(*args, &block).to_s
   end
 end
-

data/lib/markaby/rails.rb

@@ -0,0 +1,36 @@
+require 'markaby'
+
+module Markaby
+  module Rails
+    class TemplateHandler
+      class << self
+        def register!(options={})
+          self.options = options
+          ActionView::Template.register_template_handler(:mab, new)
+        end
+
+        # TODO: Do we need this?
+        # Default format used by Markaby
+        # class_attribute :default_format
+        # self.default_format = :html
+
+        def options
+          @options ||= {}
+        end
+
+        def options=(val)
+          self.options.merge!(val)
+          self.options
+        end
+      end
+
+      def call(template)
+        <<-CODE
+          Markaby::Builder.new(Markaby::Rails::TemplateHandler.options, self) do
+            #{template.source}
+          end.to_s
+        CODE
+      end
+    end
+  end
+end

data/lib/markaby/tags.rb

@@ -29,12 +29,36 @@ module Markaby
     :compact, :declare, :noresize, :noshade, :nowrap # deprecated or unused
   ]
 
-  # All the tags and attributes from XHTML 1.0 Strict
-  class XHTMLStrict
+  class Tagset
     class << self
       attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
+
+      def default_options
+        {
+          :tagset => self
+        }
+      end
     end
+  end
 
+  class XmlTagset < Tagset
+    class << self
+      def default_options
+        super.merge({
+          :output_xml_instruction => true,
+          :output_meta_tag        => 'xhtml',
+          :root_attributes        => {
+            :xmlns      => 'http://www.w3.org/1999/xhtml',
+            :'xml:lang' => 'en',
+            :lang       => 'en'
+          }
+        })
+      end
+    end
+  end
+
+  # All the tags and attributes from XHTML 1.0 Strict
+  class XHTMLStrict < XmlTagset
     @doctype = ['-//W3C//DTD XHTML 1.0 Strict//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd']
     @tagset  = {
       :html       => AttrI18n + [:id, :xmlns],
@@ -122,11 +146,7 @@ module Markaby
   end
 
   # Additional tags found in XHTML 1.0 Transitional
-  class XHTMLTransitional
-    class << self
-      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
-    end
-
+  class XHTMLTransitional < XmlTagset
     @doctype = ['-//W3C//DTD XHTML 1.0 Transitional//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd']
     @tagset = XHTMLStrict.tagset.merge({
       :strike   => Attrs,
@@ -184,11 +204,7 @@ module Markaby
   end
 
   # Additional tags found in XHTML 1.0 Frameset
-  class XHTMLFrameset
-    class << self
-      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
-    end
-
+  class XHTMLFrameset < XmlTagset
     @doctype = ['-//W3C//DTD XHTML 1.0 Frameset//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd']
     @tagset = XHTMLTransitional.tagset.merge({
       :frameset => AttrCore + [:rows, :cols, :onload, :onunload],
@@ -200,9 +216,15 @@ module Markaby
     @self_closing = @tags & SELF_CLOSING_TAGS
   end
 
-  class HTML5
+  class HTML5 < Tagset
     class << self
-      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
+      def default_options
+        super.merge({
+          :output_xml_instruction => false,
+          :output_meta_tag        => 'html5',
+          :root_attributes        => {}
+        })
+      end
     end
 
     @doctype = ['html']

data/spec/markaby/fragment_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
-class FragmentTest < Test::Unit::TestCase
+describe "Fragments" do
   it "should have method_missing as a private instance method" do
     private_methods = Markaby::Fragment.private_instance_methods.dup
     private_methods.map! { |m| m.to_sym }

data/spec/markaby/html5_spec.rb

@@ -28,7 +28,9 @@ describe Markaby do
 
   it "should put correct xhtml charset meta" do
     document = mab { xhtml_strict { head { title 'OKay' } } }
-    document.should include('<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>')
+    document.should include('<meta')
+    document.should include('http-equiv="Content-Type"')
+    document.should include('content="text/html; charset=utf-8"')
   end
 
   it "should put correct html5 charset meta" do
@@ -95,6 +97,19 @@ describe Markaby do
       end
     end
 
-    doc.should == "<!DOCTYPE html><html><input type=\"text\" name=\"foo\" value=\"bar\" placeholder=\"something\"/></html>"
+    doc.should include('<input type="text" ')
+    doc.should include('name="foo"')
+    doc.should include('value="bar"')
+    doc.should include('placeholder="something"')
+  end
+
+  it "should allow data attributes anywhere" do
+    doc = mab do
+      html5 do
+        div('data-foo' => 'bar')
+      end
+    end
+
+    doc.should include('<div data-foo="bar"/>')
   end
 end

data/spec/markaby/markaby_spec.rb

@@ -1,6 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Markaby do
+  it "should work with classes and ids" do
+    mab { div.one '' }.should == %{<div class="one"></div>}
+    mab { div.one.two '' }.should == %{<div class="one two"></div>}
+    mab { div.three! '' }.should == %{<div id="three"></div>}
+    mab { hr.hidden }.should == %{<hr class="hidden"/>}
+
+    out = mab { input.foo :id => 'bar' }
+    out.should match("<input.*class=\"foo\".*/>")
+    out.should match("<input.*name=\"bar\".*/>")
+  end
+
   it "can assign helpers after instantiation" do
     helper = double 'helper', :foo => :bar
 
@@ -36,10 +47,6 @@ describe Markaby do
     builder.three.should == "four"
   end
 
-  def test_builder_bang_methods
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", mab { instruct! }
-  end
-
   it "should be able to produce the correct html from a fragment" do
     str = ""
     str += "<div>"
@@ -63,105 +70,79 @@ describe Markaby do
     generated.should == str
   end
 
-  def test_fragments
-    assert_equal %{<div><h1>Monkeys</h1><h2>Giraffes <strong>Miniature</strong></h2><h3>Donkeys</h3></div>},
-        mab { div { h1 "Monkeys"; h2 { "Giraffes #{strong 'Miniature' }" }; h3 "Donkeys" } }
-
-    assert_equal %{<div><h1>Monkeys</h1><h2>Giraffes <small>Miniature</small> and <strong>Large</strong></h2><h3>Donkeys</h3><h4>Parakeet <strong>Large</strong> as well...</h4></div>},
-        mab { div { @a = small 'Miniature'; @b = strong 'Large'; h1 "Monkeys"; h2 { "Giraffes #{@a} and #{@b}" }; h3 "Donkeys"; h4 { "Parakeet #{@b} as well..." } } }
-  end
-
-  def test_invalid_xhtml
-    assert_exception(NoMethodError, "undefined method `dav'") { dav {} }
-    assert_exception(Markaby::InvalidXhtmlError, "no attribute `styl' on div elements") { div(:styl => 'ok') {} }
-    assert_exception(Markaby::InvalidXhtmlError, "no attribute `class' on tbody elements") { tbody.okay {} }
-  end
-
-  def test_full_doc_transitional
-    doc = mab { xhtml_transitional { head { title 'OKay' } } }
-    assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
-    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">})
-    assert doc.include?(%{<title>OKay</title>})
-  end
-
-  def test_full_doc_strict
-    doc = mab { xhtml_strict { head { title 'OKay' } } }
-    assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
-    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">})
-    assert doc.include?(%{<title>OKay</title>})
-  end
+  it "should copy instance variables from a helper object" do
+    klass = Class.new do
+      def initialize
+        @hello = "hello there"
+      end
+    end
 
-  def test_full_doc_frameset
-    doc = mab { xhtml_frameset { head { title 'OKay' } } }
-    assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
-    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">})
-    assert doc.include?(%{<title>OKay</title>})
+    builder = Markaby::Builder.new({}, klass.new)
+    builder.capture { @hello }.should == "hello there"
   end
 
-  def test_root_attributes_can_be_changed
-    doc = mab { xhtml_strict(:lang => 'fr') { head { title { 'Salut!' } } } }
-    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">})
-    assert doc.include?(%{<title>Salut!</title>})
-    assert doc.include?(%{ lang="fr"})
+  describe Markaby::InvalidXhtmlError do
+    it "should inherit from StandardError" do
+      Markaby::InvalidXhtmlError.superclass.should == StandardError
+    end
   end
 
-  def version_file
-    File.expand_path(File.dirname(__FILE__) + "/../../VERSION")
-  end
+  it "can assign helpers after instantiation" do
+    helper = double 'helper', :foo => :bar
 
-  def test_markaby_should_have_correct_version
-    assert_equal Markaby::VERSION, File.read(version_file).strip
+    builder = Markaby::Builder.new
+    builder.helper = helper
+    builder.foo.should == :bar
   end
 
-  def test_duplicate_usage_of_same_id
-    assert_raises Markaby::InvalidXhtmlError do
-      mab do
-        p.one!
-        p.one!
-      end
-    end
+  it "should be able to set a local" do
+    builder = Markaby::Builder.new
+    builder.locals = { :foo => "bar" }
+    builder.foo.should == "bar"
   end
 
-  # auto validation
-
-  def test_tagging_with_invalid_tag_should_raise_error
-    assert_raises Markaby::InvalidXhtmlError do
-      mab do
-        tag! :an_invalid_tag
-      end
-    end
+  it "should be able to set a different local value" do
+    builder = Markaby::Builder.new
+    builder.locals = { :foo => "baz" }
+    builder.foo.should == "baz"
   end
 
-  def test_self_closing_html_tag_with_block_throws_errors
-    assert_raises Markaby::InvalidXhtmlError do
-      mab do
-        html_tag :img do
-        end
-      end
-    end
+  it "should assign the correct key" do
+    builder = Markaby::Builder.new
+    builder.locals = { :key => :value }
+    builder.key.should == :value
   end
 
-  def test_local_assigning
-    builder = Markaby::Builder.new(:variable => :a_value)
+  it "should be able to assign multiple locals" do
+    builder = Markaby::Builder.new
 
-    assert_equal :a_value, builder.variable
-  end
+    builder.locals = { :one => "two", :three => "four" }
 
-  def test_local_assignment_with_strings
-    builder = Markaby::Builder.new("variable" => :a_value)
-    assert_equal :a_value, builder.variable
+    builder.one.should == "two"
+    builder.three.should == "four"
   end
 
-  def test_local_assignment_prefers_symbols_to_strings
-    builder = Markaby::Builder.new("variable" => "string_value", :variable => :symbol_value)
-    assert_equal :symbol_value, builder.variable
-  end
+  it "should be able to produce the correct html from a fragment" do
+    str = ""
+    str += "<div>"
+    str += "<h1>Monkeys</h1>"
+    str += "<h2>Giraffes <small>Miniature</small> and <strong>Large</strong></h2>"
+    str += "<h3>Donkeys</h3>"
+    str += "<h4>Parakeet <b><i>Innocent IV</i></b> in Classic Chartreuse</h4>"
+    str += "</div>"
 
-  def test_method_missing_should_call_tag_if_no_tagset_present
-    Markaby::Builder.set(:tagset, nil)
+    generated = mab {
+      div {
+        h1 "Monkeys"
+        h2 {
+          "Giraffes #{small('Miniature')} and #{strong 'Large'}"
+        }
+        h3 "Donkeys"
+        h4 { "Parakeet #{b { i 'Innocent IV' }} in Classic Chartreuse" }
+      }
+    }
 
-    builder = Markaby::Builder.new
-    builder.something.should == "<something/>"
+    generated.should == str
   end
 
   it "should copy instance variables from a helper object" do
@@ -181,4 +162,3 @@ describe Markaby do
     end
   end
 end
-

data/spec/markaby/markaby_test_unit_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require 'test/unit'
 
 class MarkabyTest < Test::Unit::TestCase
+  include TestHelpers
+
   def teardown
     Markaby::Builder.restore_defaults!
   end
@@ -12,17 +15,6 @@ class MarkabyTest < Test::Unit::TestCase
     assert_equal "<p>foo</p>", mab { p { 'foo' } }
   end
 
-  def test_classes_and_ids
-    assert_equal %{<div class="one"></div>},     mab { div.one '' }
-    assert_equal %{<div class="one two"></div>}, mab { div.one.two '' }
-    assert_equal %{<div id="three"></div>},      mab { div.three! '' }
-    assert_equal %{<hr class="hidden"/>},        mab { hr.hidden }
-
-    out = mab { input.foo :id => 'bar' }
-    out.should match("<input.*class=\"foo\".*/>")
-    out.should match("<input.*name=\"bar\".*/>")
-  end
-
   def test_escaping
     assert_equal "<h1>Apples &amp; Oranges</h1>", mab { h1 'Apples & Oranges' }
     assert_equal "<h1>Apples & Oranges</h1>", mab { h1 { 'Apples & Oranges' } }
@@ -49,13 +41,10 @@ class MarkabyTest < Test::Unit::TestCase
     assert_equal "<h1>Hello World</h1>", mab { @message = 'Hello World'; h1 message }
   end
 
-  def spec_helpers
-    Markaby::Builder.ignored_helpers.clear
+  def test_helpers
     assert_equal %{squirrels}, mab({}, MarkabyTestHelpers) { pluralize('squirrel') }
     assert_equal %{<a href="">edit</a>}, mab({}, MarkabyTestHelpers) { link_to('edit') }
-    assert mab({}, MarkabyTestHelpers) { @output_helpers = false; link_to('edit'); nil }.empty?
-    Markaby::Builder.ignore_helpers :pluralize
-    assert_exception(NoMethodError, "undefined method `pluralize'", {}, MarkabyTestHelpers) { pluralize('squirrel') }
+    assert mab({}, MarkabyTestHelpers) { link_to('edit'); nil }.empty?
   end
 
   def test_uses_helper_instance_variable
@@ -66,71 +55,11 @@ class MarkabyTest < Test::Unit::TestCase
     builder = Markaby::Builder.new({}, helper)
     assert_equal :ivar_value, builder.some_ivar
   end
-end
-
-describe Markaby do
-  it "can assign helpers after instantiation" do
-    helper = double 'helper', :foo => :bar
-
-    builder = Markaby::Builder.new
-    builder.helper = helper
-    builder.foo.should == :bar
-  end
-
-  it "should be able to set a local" do
-    builder = Markaby::Builder.new
-    builder.locals = { :foo => "bar" }
-    builder.foo.should == "bar"
-  end
-
-  it "should be able to set a different local value" do
-    builder = Markaby::Builder.new
-    builder.locals = { :foo => "baz" }
-    builder.foo.should == "baz"
-  end
-
-  it "should assign the correct key" do
-    builder = Markaby::Builder.new
-    builder.locals = { :key => :value }
-    builder.key.should == :value
-  end
-
-  it "should be able to assign multiple locals" do
-    builder = Markaby::Builder.new
-
-    builder.locals = { :one => "two", :three => "four" }
-
-    builder.one.should == "two"
-    builder.three.should == "four"
-  end
 
   def test_builder_bang_methods
     assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>", mab { instruct! }
   end
 
-  it "should be able to produce the correct html from a fragment" do
-    str = ""
-    str += "<div>"
-    str += "<h1>Monkeys</h1>"
-    str += "<h2>Giraffes <small>Miniature</small> and <strong>Large</strong></h2>"
-    str += "<h3>Donkeys</h3>"
-    str += "<h4>Parakeet <b><i>Innocent IV</i></b> in Classic Chartreuse</h4>"
-    str += "</div>"
-
-    generated = mab {
-      div {
-        h1 "Monkeys"
-        h2 {
-          "Giraffes #{small('Miniature')} and #{strong 'Large'}"
-        }
-        h3 "Donkeys"
-        h4 { "Parakeet #{b { i 'Innocent IV' }} in Classic Chartreuse" }
-      }
-    }
-
-    generated.should == str
-  end
-
   def test_fragments
     assert_equal %{<div><h1>Monkeys</h1><h2>Giraffes <strong>Miniature</strong></h2><h3>Donkeys</h3></div>},
         mab { div { h1 "Monkeys"; h2 { "Giraffes #{strong 'Miniature' }" }; h3 "Donkeys" } }
@@ -178,7 +107,7 @@ describe Markaby do
   end
 
   def test_markaby_should_have_correct_version
-    assert_equal Markaby::VERSION, File.read(version_file).strip
+    assert_equal Markaby::VERSION, '0.9.0'
   end
 
   def test_duplicate_usage_of_same_id
@@ -231,21 +160,4 @@ describe Markaby do
     builder = Markaby::Builder.new
     builder.something.should == "<something/>"
   end
-
-  it "should copy instance variables from a helper object" do
-    klass = Class.new do
-      def initialize
-        @hello = "hello there"
-      end
-    end
-
-    builder = Markaby::Builder.new({}, klass.new)
-    builder.capture { @hello }.should == "hello there"
-  end
-
-  describe Markaby::InvalidXhtmlError do
-    it "should inherit from StandardError" do
-      Markaby::InvalidXhtmlError.superclass.should == StandardError
-    end
-  end
 end

data/spec/markaby/rails_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+# stub
+module ActionView
+  module Template
+    class << self
+      def register_template_handler(sym, handler)
+        @template_handlers ||= {}
+        @template_handlers[sym] = handler
+      end
+
+      def template_handlers
+        @template_handlers ||= {}
+      end
+    end
+  end
+end
+
+describe Markaby::Rails do
+  it "should register the template handler" do
+    Markaby::Rails::TemplateHandler.register!
+    ActionView::Template.template_handlers[:mab].should be_a_kind_of(Markaby::Rails::TemplateHandler)
+  end
+
+  it "should be able to pass options" do
+    Markaby::Rails::TemplateHandler.register!(:indent => 2)
+    Markaby::Rails::TemplateHandler.options[:indent].should == 2
+  end
+end

data/spec/spec_helper.rb

@@ -4,14 +4,17 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'markaby'
 require 'markaby/kernel_method'
+require "markaby/rails"
 
 module MarkabyTestHelpers
   def link_to(obj)
     %{<a href="">#{obj}</a>}
   end
+
   def pluralize(string)
     string + "s"
   end
+
   module_function :link_to, :pluralize
 end
 
@@ -25,14 +28,3 @@ module TestHelpers
     end
   end
 end
-
-module Test
-  module Unit
-    class TestCase
-      include TestHelpers
-      def self.it(name, &blk)
-        define_method("test_#{name}", &blk)
-      end
-    end
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markaby
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Scott Taylor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -64,9 +64,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Markaby.gemspec
 - README.rdoc
 - Rakefile
@@ -75,14 +77,15 @@ files:
 - lib/markaby/builder_tags.rb
 - lib/markaby/cssproxy.rb
 - lib/markaby/kernel_method.rb
+- lib/markaby/rails.rb
 - lib/markaby/tags.rb
-- lib/markaby/version.rb
 - spec/markaby/builder_spec.rb
 - spec/markaby/css_proxy_spec.rb
 - spec/markaby/fragment_spec.rb
 - spec/markaby/html5_spec.rb
 - spec/markaby/markaby_spec.rb
 - spec/markaby/markaby_test_unit_spec.rb
+- spec/markaby/rails_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -104,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A pure ruby based, html markup language
@@ -115,4 +118,5 @@ test_files:
 - spec/markaby/html5_spec.rb
 - spec/markaby/markaby_spec.rb
 - spec/markaby/markaby_test_unit_spec.rb
+- spec/markaby/rails_spec.rb
 - spec/spec_helper.rb

data/lib/markaby/version.rb

@@ -1,3 +0,0 @@
-module Markaby
-  VERSION = '0.8.1'
-end