markaby 0.8.1 → 0.9.1

data/spec/markaby/markaby_test_unit_spec.rb

@@ -1,61 +1,94 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 class MarkabyTest < Test::Unit::TestCase
+  include TestHelpers
+
   def teardown
     Markaby::Builder.restore_defaults!
   end
 
   def test_simple
     assert_equal "<hr/>", mab { hr }
-    assert_equal "<hr/><br/>", mab { hr; br }
-    assert_equal "<p>foo</p>", mab { p 'foo' }
-    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\".*/>")
+    assert_equal "<hr/><br/>", mab {
+                                 hr
+                                 br
+                               }
+    assert_equal "<p>foo</p>", mab { p "foo" }
+    assert_equal "<p>foo</p>", mab { p { "foo" } }
   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' } }
-    assert_equal "<h1 class=\"fruits&amp;floots\">Apples</h1>", mab { h1 'Apples', :class => 'fruits&floots' }
+    assert_equal "<h1>Apples &amp; Oranges</h1>", mab { h1 "Apples & Oranges" }
+    assert_equal "<h1>Apples & Oranges</h1>", mab { h1 { "Apples & Oranges" } }
+    assert_equal "<h1 class=\"fruits&amp;floots\">Apples</h1>", mab { h1 "Apples", class: "fruits&floots" }
   end
 
   def test_capture
     builder = Markaby::Builder.new
     assert builder.to_s.empty?
-    assert_equal "<h1>TEST</h1>", builder.capture { h1 'TEST' }
+    assert_equal "<h1>TEST</h1>", builder.capture { h1 "TEST" }
     assert builder.to_s.empty?
-    assert mab { capture { h1 'hello world' }; nil }.empty?
-    assert_equal mab { div { h1 'TEST' } }, mab { div { capture { h1 'TEST' } } }
+    assert mab {
+             capture { h1 "hello world" }
+             nil
+           }.empty?
+    assert_equal mab { div { h1 "TEST" } }, mab { div { capture { h1 "TEST" } } }
   end
 
   def test_ivars
     html = "<div><h1>Steve</h1><div><h2>Gerald</h2></div><h3>Gerald</h3></div>"
-    assert_equal html, mab { div { @name = 'Steve'; h1 @name; div { @name = 'Gerald'; h2 @name }; h3 @name } }
-    assert_equal html, mab { div { @name = 'Steve'; h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
-    assert_equal html, mab(:name => 'Steve') { div { h1 @name; self << capture { div { @name = 'Gerald'; h2 @name } }; h3 @name } }
+    assert_equal html, mab {
+                         div {
+                           @name = "Steve"
+                           h1 @name
+                           div {
+                             @name = "Gerald"
+                             h2 @name
+                           }
+                           h3 @name
+                         }
+                       }
+    assert_equal html, mab {
+                         div {
+                           @name = "Steve"
+                           h1 @name
+                           self << capture {
+                             div {
+                               @name = "Gerald"
+                               h2 @name
+                             }
+                           }
+                           h3 @name
+                         }
+                       }
+    assert_equal html, mab(name: "Steve") {
+                         div {
+                           h1 @name
+                           self << capture {
+                             div {
+                               @name = "Gerald"
+                               h2 @name
+                             }
+                           }
+                           h3 @name
+                         }
+                       }
   end
 
   def test_ivars_without_at_symbol
-    assert_equal "<h1>Hello World</h1>", mab { @message = 'Hello World'; h1 message }
+    assert_equal "<h1>Hello World</h1>", mab {
+                                           @message = "Hello World"
+                                           h1 message
+                                         }
   end
 
-  def spec_helpers
-    Markaby::Builder.ignored_helpers.clear
-    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') }
+  def test_helpers
+    assert_equal %(squirrels), mab({}, MarkabyTestHelpers) { pluralize("squirrel") }
+    assert_equal %(<a href="">edit</a>), mab({}, MarkabyTestHelpers) { link_to("edit") }
+    assert mab({}, MarkabyTestHelpers) {
+             link_to("edit")
+             nil
+           }.empty?
   end
 
   def test_uses_helper_instance_variable
@@ -66,111 +99,66 @@ 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'}"
+  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"
         }
-        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" } }
-
-    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..." } } }
+    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 `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' } } }
+    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>})
+    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' } } }
+    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>})
+    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
 
   def test_full_doc_frameset
-    doc = mab { xhtml_frameset { head { title 'OKay' } } }
+    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>})
+    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>))
   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"})
+    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"))
   end
 
   def version_file
@@ -178,7 +166,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
@@ -210,7 +198,7 @@ describe Markaby do
   end
 
   def test_local_assigning
-    builder = Markaby::Builder.new(:variable => :a_value)
+    builder = Markaby::Builder.new(variable: :a_value)
 
     assert_equal :a_value, builder.variable
   end
@@ -231,21 +219,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

@@ -1,38 +1,37 @@
-require 'rspec'
+require "rspec"
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 
-require 'markaby'
-require 'markaby/kernel_method'
+require "markaby"
+require "markaby/kernel_method"
+require "markaby/rails"
+require "test/unit"
+
+# need to set this to true otherwise Test::Unit goes berserk + tries to run
+# see https://jonleighton.name/2012/stop-test-unit-autorun/
+Test::Unit.run = true
 
 module MarkabyTestHelpers
   def link_to(obj)
-    %{<a href="">#{obj}</a>}
+    %(<a href="">#{obj}</a>)
   end
+
   def pluralize(string)
     string + "s"
   end
+
   module_function :link_to, :pluralize
 end
 
 module TestHelpers
   def assert_exception(exclass, exmsg, *mab_args, &block)
-    begin
-      mab(*mab_args, &block)
-    rescue Exception => e
-      assert_equal exclass, e.class
-      assert_match /#{exmsg}/, e.message
-    end
+    mab(*mab_args, &block)
+  rescue => e
+    assert_equal exclass, e.class
+    assert_match(/#{exmsg}/, e.message)
   end
 end
 
-module Test
-  module Unit
-    class TestCase
-      include TestHelpers
-      def self.it(name, &blk)
-        define_method("test_#{name}", &blk)
-      end
-    end
-  end
+RSpec.configure do |c|
+  c.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: markaby
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Scott Taylor
 - judofyr
 - _why
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -30,16 +30,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,9 +64,11 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Markaby.gemspec
 - README.rdoc
 - Rakefile
@@ -74,21 +76,28 @@ files:
 - lib/markaby/builder.rb
 - lib/markaby/builder_tags.rb
 - lib/markaby/cssproxy.rb
+- lib/markaby/html5.rb
 - lib/markaby/kernel_method.rb
-- lib/markaby/tags.rb
+- lib/markaby/rails.rb
+- lib/markaby/tagset.rb
 - lib/markaby/version.rb
+- lib/markaby/xhtml_frameset.rb
+- lib/markaby/xhtml_strict.rb
+- lib/markaby/xhtml_transitional.rb
+- lib/markaby/xml_tagset.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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,16 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A pure ruby based, html markup language
-test_files:
-- 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/spec_helper.rb
+test_files: []