markaby 0.7.2 → 0.8.0

data/lib/markaby/kernel_method.rb

@@ -5,3 +5,4 @@ module Kernel
     Markaby::Builder.new(*args, &block).to_s
   end
 end
+

data/lib/markaby/tags.rb

@@ -1,6 +1,8 @@
 module Markaby
   FORM_TAGS         = [ :form, :input, :select, :textarea ]
-  SELF_CLOSING_TAGS = [ :base, :meta, :link, :hr, :br, :param, :img, :area, :input, :col, :frame ]
+  SELF_CLOSING_TAGS = [:area, :base, :br, :col, :command, :embed, :frame, :hr,
+                       :img, :input, :keygen, :link, :meta, :param, :source,
+                       :track, :wbr]
 
   # Common sets of attributes.
   AttrCore   = [:id, :class, :style, :title]
@@ -19,7 +21,7 @@ module Markaby
   AttrHAlign = [:align, :char, :charoff]
   AttrVAlign = [:valign]
   Attrs      = AttrCore + AttrI18n + AttrEvents
-  
+
   AttrsBoolean = [
     :checked, :disabled, :multiple, :readonly, :selected, # standard forms
     :autofocus, :required, :novalidate, :formnovalidate, # HTML5 forms
@@ -197,4 +199,91 @@ module Markaby
     @forms = @tags & FORM_TAGS
     @self_closing = @tags & SELF_CLOSING_TAGS
   end
+
+  class HTML5
+    class << self
+      attr_accessor :tags, :tagset, :forms, :self_closing, :doctype
+    end
+
+    @doctype = ['html']
+    @tagset = XHTMLTransitional.tagset.merge({
+      :abbr => Attrs,
+      :article => Attrs,
+      :aside => Attrs,
+      :audio => Attrs,
+      :bdi => Attrs,
+      :canvas => Attrs,
+      :command => Attrs,
+      :datalist => Attrs,
+      :details => Attrs,
+      :embed => Attrs,
+      :figure => Attrs,
+      :figcaption => Attrs,
+      :footer => Attrs,
+      :header => Attrs,
+      :hgroup => Attrs,
+      :keygen => Attrs,
+      :mark => Attrs,
+      :menu => Attrs,
+      :meter => Attrs,
+      :nav => Attrs,
+      :output => Attrs,
+      :progress => Attrs,
+      :rp => Attrs,
+      :rt => Attrs,
+      :ruby => Attrs,
+      :section => Attrs,
+      :source => Attrs,
+      :time => Attrs,
+      :track => Attrs,
+      :video => Attrs,
+      :wbr => Attrs
+    })
+
+    # Additional attributes found in HTML5
+    additional_tags = {
+      :a => [:media, :download, :ping],
+      :area => [:media, :download, :ping, :hreflang, :rel, :type],
+      :base => [:target],
+      :button => [:autofocus, :form, :formaction, :formenctype, :formmethod,
+                  :formnovalidate, :formtarget],
+      :fieldset => [:form, :disabled, :name],
+      :form => [:novalidate],
+      :label => [:form],
+      :html => [:manifest],
+      :iframe => [:sandbox, :seamless, :srcdoc],
+      :img => [:crossorigin],
+      :input => [:autofocus, :placeholder, :form, :required, :autocomplete,
+                 :min, :max, :multiple, :pattern, :step, :list, :width, :height,
+                 :dirname, :formaction, :formenctype, :formmethod,
+                 :formnovalidate, :formtarget],
+      :link => [:sizes],
+      :meta => [:charset],
+      :menu => [:type, :label],
+      :object => [:form],
+      :ol => [:reversed],
+      :object => [:typemustmatch],
+      :output => [:form],
+      :script => [:async],
+      :select => [:autofocus, :form, :required],
+      :style => [:scoped],
+      :textarea => [:autofocus, :placeholder, :form, :required, :dirname,
+                    :maxlength, :wrap],
+    }
+
+    AttrsHTML5  = [:contenteditable, :contextmentu, :draggable, :dropzone,
+                   :hidden, :role, :spellcheck, :translate]
+
+    additional_tags.each do |k, v|
+      @tagset[k] += v
+    end
+
+    @tagset.each do |k, v|
+      @tagset[k] += AttrsHTML5
+    end
+
+    @tags = @tagset.keys
+    @forms = @tags & FORM_TAGS
+    @self_closing = @tags & SELF_CLOSING_TAGS
+  end
 end

data/lib/markaby/version.rb

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

data/spec/markaby/{css_proxy_test.rb → css_proxy_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
-class CssProxyTest < Test::Unit::TestCase
+describe Markaby::CssProxy do
   it "should have method_missing as private" do
     methods = Markaby::CssProxy.private_instance_methods.dup
     methods.map! { |m| m.to_sym }
@@ -14,34 +14,29 @@ class CssProxyTest < Test::Unit::TestCase
     end.new
   end
 
-  def test_responds_to_everything
+  it "responds_to_everything" do
     proxy = Markaby::CssProxy.new(mock_builder, 'stream', :sym)
-
-    assert proxy.respond_to?(:any_method)
-    assert proxy.respond_to?(:foobarbazasdfasdfadfs)
+    proxy.respond_to?(:any_method).should be_true
+    proxy.respond_to?(:foobarbazasdfasdfadfs).should be_true
   end
 
-  def test_does_not_respond_to_method_missing
+  it "does_not_respond_to_method_missing" do
     proxy = Markaby::CssProxy.new(mock_builder, 'stream', :sym)
-
-    assert !proxy.respond_to?(:method_missing)
+    proxy.should_not respond_to(:method_missing)
   end
 
-  def test_does_respond_to_private_instance_methods_with_private_flag_set_to_true
+  it "does_respond_to_private_instance_methods_with_private_flag_set_to_true" do
     proxy = Markaby::CssProxy.new(mock_builder, 'stream', :sym)
-
-    assert proxy.respond_to?(:method_missing, true)
+    proxy.respond_to?(:method_missing, true).should be_true
   end
 
-  def test_does_not_respond_to_private_instance_methods_with_private_flag_set_to_false
+  it "does_not_respond_to_private_instance_methods_with_private_flag_set_to_false" do
     proxy = Markaby::CssProxy.new(mock_builder, 'stream', :sym)
-
-    assert !proxy.respond_to?(:method_missing, false)
+    proxy.respond_to?(:method_missing, false).should be_false
   end
 
-  def test_respond_to_should_always_return_boolean
+  it "respond_to_should_always_return_boolean" do
     proxy = Markaby::CssProxy.new(mock_builder, 'stream', :sym)
-
-    assert_equal proxy.respond_to?(:method_missing, :a_value), true
+    proxy.respond_to?(:method_missing, :a_value).should be_true
   end
 end

data/spec/markaby/html5_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Markaby do
+  it "should insert an html5 doctype" do
+    document = mab { html5 { head { title 'OKay' } } }
+    document.should include("<!DOCTYPE html>")
+  end
+
+  it "should not have xmlns in html5 html tag" do
+    document = mab { html5 { head { title 'OKay' } } }
+    document.should_not include("xmlns")
+  end
+
+  it "should make html5-specific tags" do
+    document = mab { html5 { tag! :header } }
+    document.should include("header")
+  end
+
+  it "should accept html5-specific tag as a block" do
+    document = mab { html5 { header { h1 "Wow" } } }
+    document.should include("<header><h1>Wow</h1></header>")
+  end
+
+  it "should make html5-specific tags in partials" do
+    document = mab { html5 { header { h1 "Wow" } } }
+    document.should include("<header><h1>Wow</h1></header>")
+  end
+
+  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"/>')
+  end
+
+  it "should put correct html5 charset meta" do
+    document = mab { html5 { head { title 'OKay' } } }
+    document.should include('<meta charset="utf-8"/>')
+  end
+
+  it "should add a class to a html5 tag" do
+    document = mab { html5 { canvas.big "yo look" } }
+    document.should include('<canvas class="big">yo look</canvas>')
+  end
+
+  it "should add an id to a html5 tag" do
+    document = mab { html5 { canvas.only! "yo look" } }
+    document.should include('<canvas id="only">yo look</canvas>')
+  end
+
+  it "should add a closing slash to self-closing tags in xhtml" do
+    document = mab { br }
+    document.should include('<br/>')
+  end
+
+  it "should not add a closing slash to self-closing tags in html5" do
+    pending do
+      document = mab { html5 { br } }
+      document.should include('<br>')
+    end
+  end
+
+  it "should close empty non-self-closing tags in html5" do
+    pending do
+      document = mab { html5 { header } }
+      document.should include("<header></header>")
+    end
+  end
+
+  it "should not allow fake attributes" do
+    expect {
+      mab do
+        html5 do
+          input "something", :fake => "fake", :foo => "bar"
+        end
+      end
+    }.to raise_error
+  end
+
+  it "should allow new attributes" do
+    expect {
+      mab do
+        html5 do
+          input "something", :placeholder => "placeholder"
+        end
+      end
+    }.not_to raise_error
+  end
+
+  it "should allow a placeholder on an input" do
+    doc = mab do
+      html5 do
+        input :type => "text",
+              :name => "foo",
+              :value => "bar",
+              :placeholder => "something"
+      end
+    end
+
+    doc.should == "<!DOCTYPE html><html><input type=\"text\" name=\"foo\" value=\"bar\" placeholder=\"something\"/></html>"
+  end
+end

data/spec/markaby/markaby_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Markaby do
   it "can assign helpers after instantiation" do
-    helper = mock 'helper', :foo => :bar
+    helper = double 'helper', :foo => :bar
 
     builder = Markaby::Builder.new
     builder.helper = helper

data/spec/markaby/{markaby_test.rb → markaby_test_unit_spec.rb}

@@ -70,7 +70,7 @@ end
 
 describe Markaby do
   it "can assign helpers after instantiation" do
-    helper = mock 'helper', :foo => :bar
+    helper = double 'helper', :foo => :bar
 
     builder = Markaby::Builder.new
     builder.helper = helper

data/spec/spec_helper.rb

@@ -1,15 +1,10 @@
 require 'test/unit'
-require 'test/unit/autorunner'
 require 'rspec'
 
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'markaby'
 require 'markaby/kernel_method'
-require 'markaby/rails'
-
-require 'erb'
-require 'markaby/rails/spec_helper'
 
 module MarkabyTestHelpers
   def link_to(obj)

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: markaby
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
+- Scott Taylor
+- judofyr
 - _why
-- Tim Fletcher
-- John Barton
-- spox
-- smtlaissezfaire
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70326085518080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326085518080
-description: Tim Fletcher and _why's ruby driven HTML templating system
-email: scott@railsnewbie.com
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: _why's markaby templating language
+email:
+- scott@railsnewbie.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - Markaby.gemspec
 - README.rdoc
 - Rakefile
 - VERSION
-- garlic.rb
-- init.rb
 - lib/markaby.rb
 - lib/markaby/builder.rb
 - lib/markaby/builder_tags.rb
 - lib/markaby/cssproxy.rb
 - lib/markaby/kernel_method.rb
-- lib/markaby/rails.rb
-- 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
+- lib/markaby/version.rb
 - spec/markaby/builder_spec.rb
-- spec/markaby/css_proxy_test.rb
-- spec/markaby/fragment_test.rb
-- spec/markaby/markaby_other_static.mab
+- 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.rb
-- spec/markaby/rails/spec_helper.rb
-- spec/markaby/rails/views/layouts/layout.mab
-- spec/markaby/rails/views/markaby/_a_partial.mab
-- spec/markaby/rails/views/markaby/_form_for_with_body_in_erb.erb
-- 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
-- spec/markaby/rails/views/markaby/form_for_with_fields.mab
-- spec/markaby/rails/views/markaby/form_for_with_multiple_fields.mab
-- spec/markaby/rails/views/markaby/no_values_passed.mab
-- spec/markaby/rails/views/markaby/partial_parent.mab
-- spec/markaby/rails/views/markaby/partial_parent_with_locals.mab
-- spec/markaby/rails/views/markaby/render_erb_without_explicit_render_call.erb
-- spec/markaby/rails/views/markaby/render_explicit_but_empty_markaby_layout.mab
-- spec/markaby/rails/views/markaby/render_mab_without_explicit_render_call.mab
-- spec/markaby/rails/views/markaby/render_with_ivar.mab
-- spec/markaby/rails/views/markaby/renders_erb.rhtml
-- spec/markaby/rails/views/markaby/renders_form_for_with_erb_body.mab
-- spec/markaby/rails/views/markaby/routes.mab
-- spec/markaby/rails/views/markaby/yielding.mab
-- spec/markaby/rails/views/markaby/yielding_content_for_with_block_helper.mab
-- spec/markaby/rails/views/markaby/yielding_two.mab
-- spec/markaby/rails/views/markaby/yielding_with_content_for.mab
-- spec/markaby/rails_test.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
-- spec/markaby/tilt/markaby_other_static.mab
-- spec/markaby/tilt/render_twice.mab
-- spec/markaby/tilt/scope.mab
-- spec/markaby/tilt/yielding.mab
-- spec/markaby/tilt_spec.rb
-- spec/spec.opts
+- spec/markaby/markaby_test_unit_spec.rb
 - spec/spec_helper.rb
-homepage: http://markaby.github.com/markaby/
-licenses: []
+homepage: ''
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -125,8 +112,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
-summary: Markup as Ruby, write HTML in your native Ruby tongue
-test_files: []
+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