markababy 1.2.0 → 1.3.0

data/README.md

@@ -0,0 +1,56 @@
+Markaby's little sister
+=======================
+
+
+Installation
+------------
+
+    $ gem install markababy
+
+
+Example
+-------
+
+Usage is similar to [Markaby](http://en.wikipedia.org/wiki/Markaby),
+and easy to use directly from a Ruby script:
+
+```ruby
+require 'markababy'
+
+Markababy.markup do
+  html do
+    head { title 'Boats.com' }
+    body do
+      h1 'Boats.com has great deals'
+      ul do
+        li '$49 for a canoe'
+        li '$39 for a raft'
+        li '$29 for a huge boot that floats and can fit 5 people'
+      end
+    end
+  end
+end
+```
+
+Use `Markababy.capture` if you want to capture the output as a string
+instead of printing it to `$stdout`.
+
+
+Rails template usage
+--------------------
+
+To use Markababy within a Rails 3 app: add markababy as a dependency to your
+Gemfile; do the bundle dance; then change the extension on your template files
+from .erb to .rb and you can start writing your templates in Ruby! Controller
+instance variables and helpers will be available as methods.
+
+
+Less is more
+------------
+
+Some differences from Markaby:
+
+* No auto-stringification
+* No element classes or IDs
+* No validation
+* No XHTML

data/Rakefile

@@ -1,5 +1,8 @@
 require 'rake/testtask'
 
-Rake::TestTask.new do |t|
+task :default => :spec
+
+Rake::TestTask.new(:spec) do |t|
   t.test_files = FileList['spec/*_spec.rb']
+  t.warning = true
 end

data/lib/markababy.rb

@@ -3,7 +3,7 @@ require 'cgi'
 
 module Markababy
   def self.capture(options = {}, &block)
-    [].tap { |output| markup(options.merge(output: output), &block) }.join
+    [].tap { |output| markup(options.merge(:output => output), &block) }.join
   end
 
   def self.markup(options = {}, &block)

data/lib/markababy/builder.rb

@@ -1,3 +1,11 @@
+unless defined?(BasicObject)
+  require 'backports/basic_object'
+
+  class BasicObject
+    undef_method :p
+  end
+end
+
 module Markababy
   class Builder < BasicObject
     def initialize(options, &block)
@@ -12,8 +20,18 @@ module Markababy
       instance_eval(&block)
     end
 
+    if ::Object.new.respond_to?(:respond_to_missing?)
+      def context_responds_to?(name)
+        @context.respond_to?(name)
+      end
+    else
+      def context_responds_to?(name)
+        @context.respond_to?(name) || (@context.respond_to?(:respond_to_missing?) && @context.respond_to_missing?(name))
+      end
+    end
+
     def method_missing(sym, *args, &block)
-      if !@context.nil? && @context.respond_to?(sym)
+      if @context && context_responds_to?(sym)
         return @context.send(sym, *args, &block)
       end
 

data/lib/markababy/rails_template_context.rb

@@ -3,7 +3,7 @@ module Markababy
     def initialize(controller)
       @controller = controller
 
-      @ivars = @controller.instance_variables - @controller.class.new.instance_variables
+      @ivars = (@controller.instance_variables - @controller.class.new.instance_variables).map(&:to_sym)
     end
 
     def respond_to_missing?(sym, include_private = false)

data/lib/markababy/rails_template_handler.rb

@@ -2,7 +2,7 @@ module Markababy
   module RailsTemplateHandler
     def self.call(template)
       "self.output_buffer = ''\n" +
-      "Markababy.capture(output: self.output_buffer, context: Markababy::RailsTemplateContext.new(self)) do\n" +
+      "Markababy.capture(:output => self.output_buffer, :context => Markababy::RailsTemplateContext.new(self)) do\n" +
       "#{template.source}\n" +
       "end\n"
     end

data/markababy.gemspec

@@ -1,13 +1,21 @@
 Gem::Specification.new do |s|
   s.name = 'markababy'
-  s.version = '1.2.0'
+  s.version = '1.3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
   s.homepage = 'http://github.com/timcraft/markababy'
   s.description = 'Markaby\'s little sister'
   s.summary = 'See description'
-  s.files = Dir.glob('{lib,spec}/**/*') + %w(README.txt Rakefile markababy.gemspec)
+  s.files = Dir.glob('{lib,spec}/**/*') + %w(README.md Rakefile markababy.gemspec)
   s.add_development_dependency('rails', ['>= 3.0.3'])
   s.require_path = 'lib'
+
+  unless defined?(BasicObject)
+    s.add_dependency('backports', '~> 2.8.2')
+  end
+
+  if RUBY_VERSION == '1.8.7'
+    s.add_development_dependency('minitest', '>= 4.2.0')
+  end
 end

data/spec/markababy_rails_spec.rb

@@ -20,14 +20,14 @@ class DummyController < AbstractController::Base
   def index
     @message = 'Controller says hello!'
 
-    render template: 'index'
+    render :template => 'index'
   end
 end
 
-describe DummyController do
-  it 'should return the correct markup' do
+describe 'Rendering the DummyController index template' do
+  it 'returns the correct markup' do
     output = '<html><head><title>Controller says hello!</title></head><body><p>12,345,678</p></body></html>'
 
-    DummyController.new.index.must_equal output
+    DummyController.new.index.must_equal(output)
   end
 end

data/spec/markababy_spec.rb

@@ -8,56 +8,60 @@ class ExampleContext
   end
 end
 
-describe Markababy do
-  it 'should render tags without attributes or content correctly' do
+describe 'Markababy' do
+  it 'renders tags without attributes or content' do
     Markababy.capture { br }.must_equal '<br>'
   end
 
-  it 'should render tags with content correctly' do
+  it 'renders tags with content' do
     Markababy.capture { title 'Untitled' }.must_equal '<title>Untitled</title>'
   end
 
-  it 'should escape content correctly' do
+  it 'escapes content' do
     Markababy.capture { h1 'Apples & Oranges' }.must_equal '<h1>Apples &amp; Oranges</h1>'
   end
 
-  it 'should render tags with an attribute hash correctly' do
-    Markababy.capture { input type: :text, size: 40 }.must_equal '<input type="text" size="40">'
+  it 'renders tags with an attribute hash' do
+    output = Markababy.capture { input :type => :text, :size => 40 }
+
+    output.must_match(/<input .+>/)
+    output.must_match(/ type="text"/)
+    output.must_match(/ size="40"/)
   end
 
-  it 'should render tags with an attribute array correctly' do
-    Markababy.capture { input [{type: :text}, :disabled] }.must_equal '<input type="text" disabled>'
+  it 'renders tags with an attribute array' do
+    Markababy.capture { input [{:type => :text}, :disabled] }.must_equal '<input type="text" disabled>'
   end
 
-  it 'should render tags with attributes and content correctly' do
-    Markababy.capture { div 'O hai', class: 'name' }.must_equal '<div class="name">O hai</div>'
+  it 'renders tags with attributes and content' do
+    Markababy.capture { div 'O hai', :class => 'name' }.must_equal '<div class="name">O hai</div>'
   end
 
-  it 'should render nested tags correctly' do
+  it 'renders nested tags' do
     Markababy.capture { h1 { span 'Chunky bacon!' } }.must_equal '<h1><span>Chunky bacon!</span></h1>'
   end
 
-  it 'should allow output target to be specified' do
+  it 'provides an option for specifying the output target' do
     output = []
 
-    Markababy.markup(output: output) { hr }
+    Markababy.markup(:output => output) { hr }
 
     output.join.must_equal '<hr>'
   end
 
-  it 'should allow context for method lookup to be specified' do
-    output = Markababy.capture(context: ExampleContext.new) { h1 baconize('Super chunky') }
+  it 'provides an option for specifying the method lookup context' do
+    output = Markababy.capture(:context => ExampleContext.new) { h1 baconize('Super chunky') }
 
     output.must_equal '<h1>Super chunky bacon!</h1>'
   end
 
-  it 'should provide a method for rendering text content' do
+  it 'provides an method for rendering text content inside a tag' do
     output = Markababy.capture { h1 { text 'Hello '; strong 'World' } }
 
     output.must_equal '<h1>Hello <strong>World</strong></h1>'
   end
 
-  it 'should respect the html_safe? method' do
+  it 'does not escape content that has been marked as html safe' do
     Markababy.capture { text 'Hello&nbsp;World'.html_safe }.must_equal 'Hello&nbsp;World'
 
     output = Markababy.capture { h1 'Hello <strong>World</strong>'.html_safe }
@@ -65,13 +69,13 @@ describe Markababy do
     output.must_equal '<h1>Hello <strong>World</strong></h1>'
   end
 
-  it 'should provide an option for including a doctype declaration' do
-    output = Markababy.capture(doctype: true) { html { body { p 'INSERT CONTENT HERE' } } }
+  it 'provides an option for including a doctype declaration' do
+    output = Markababy.capture(:doctype => true) { html { body { p 'INSERT CONTENT HERE' } } }
 
     output.must_equal "<!DOCTYPE html>\n<html><body><p>INSERT CONTENT HERE</p></body></html>"
   end
 
-  it 'should provide access to constants' do
+  it 'provides access to constants' do
     Something = Class.new
 
     Markababy.capture { h1 Something }.must_equal('<h1>Something</h1>')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markababy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10049430 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *10049430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 description: Markaby's little sister
 email:
 - mail@timcraft.com
@@ -37,7 +42,7 @@ files:
 - spec/markababy_rails_spec.rb
 - spec/markababy_spec.rb
 - spec/views/index.html.rb
-- README.txt
+- README.md
 - Rakefile
 - markababy.gemspec
 homepage: http://github.com/timcraft/markababy
@@ -60,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: See description

data/README.txt

@@ -1,37 +0,0 @@
-Markaby's little sister.
-
-Usage is similar to Markaby, and easy to use directly from a Ruby script:
-
-  require 'markababy'
-
-  Markababy.markup do
-    html do
-      head { title 'Boats.com' }
-      body do
-        h1 'Boats.com has great deals'
-        ul do
-          li '$49 for a canoe'
-          li '$39 for a raft'
-          li '$29 for a huge boot that floats and can fit 5 people'
-        end
-      end
-    end
-  end
-
-Use Markababy.capture if you want to capture the output as a string instead
-of printing it to $stdout.
-
-To use Markababy within a Rails 3 app, first add it to your Gemfile:
-
-  gem 'markababy'
-
-Then change the extension on your template files from .erb to .rb, and you
-can start writing your templates in Ruby! Controller instance variables and
-helpers will be available as methods.
-
-Some differences from Markaby:
-
-* No auto-stringification
-* No element classes or IDs
-* No validation
-* No XHTML