twitter_bootstrap_markup 0.0.1 → 0.0.2

data/lib/twitter_bootstrap_markup/add_on.rb

@@ -2,7 +2,7 @@ module TwitterBootstrapMarkup
   class AddOn < Tag
 
     def initialize(text)
-      super(:span, :class => 'add-on') { append text }
+      super(:span, text, :class => 'add-on')
     end
 
   end

data/lib/twitter_bootstrap_markup/alert.rb

@@ -2,8 +2,9 @@ module TwitterBootstrapMarkup
   class Alert < Tag
     TYPES = [:warning, :info, :success, :danger]
 
-    def initialize(attributes={}, &block)
-      super(:div, attributes.prepend!(:class, 'alert'), &block)
+    def initialize(*args, &block)
+      super(:div, *args, &block)
+      attributes.prepend!(:class, 'alert')
     end
 
     TYPES.each do |type|

data/lib/twitter_bootstrap_markup/brand.rb

@@ -2,7 +2,7 @@ module TwitterBootstrapMarkup
   class Brand < Tag
 
     def initialize(title, url)
-      super(:a, :class => 'brand', :href => url) { append title }
+      super(:a, title, :class => 'brand', :href => url)
     end
 
   end

data/lib/twitter_bootstrap_markup/breadcrumb.rb

@@ -2,18 +2,19 @@ module TwitterBootstrapMarkup
   class Breadcrumb < Tag
     alias :internal_append :append
 
-    def initialize(attributes={}, &block)
-      super(:ul, attributes.prepend!(:class, 'breadcrumb'), &block)
+    def initialize(*args, &block)
+      super(:ul, *args, &block)
+      attributes.prepend!(:class, 'breadcrumb')
     end
 
     def append(element=nil, &block)
-      internal_append Tag.block(:li) { append Divider.breadcrumb } unless children.empty?
+      internal_append Tag.block(:li, Divider.breadcrumb) unless children.empty?
 
       element = instance_eval(&block) if block_given?
       if element.is_a?(Tag) && element.name == :li
         internal_append element
       else
-        internal_append Tag.block(:li) { append element }
+        internal_append Tag.block(:li, element)
       end
     end
 

data/lib/twitter_bootstrap_markup/button.rb

@@ -8,7 +8,7 @@ module TwitterBootstrapMarkup
       if block_given?
         super(:button, attributes.prepend!(:class, 'btn'), &block)
       else
-        super(:button, attributes.prepend!(:class, 'btn')) { append text }
+        super(:button, text, attributes.prepend!(:class, 'btn'))
       end
     end
 

data/lib/twitter_bootstrap_markup/control_group.rb

@@ -4,7 +4,7 @@ module TwitterBootstrapMarkup
 
     def initialize(label, attributes={}, &block)
       super(:div, :class => 'control-group') do
-        append Tag.block(:label, attributes.prepend!(:class, 'control-label')) { append label }
+        append Tag.block(:label, label, attributes.prepend!(:class, 'control-label'))
         append Tag.block(:div, :class => 'controls', &block)
       end
     end

data/lib/twitter_bootstrap_markup/divider.rb

@@ -8,7 +8,7 @@ module TwitterBootstrapMarkup
         when :vertical
           super(:li, :class => 'divider-vertical') {}
         when :breadcrumb
-          super(:span, :class => 'divider') { append '/' }
+          super(:span, '/', :class => 'divider') {}
         else
           raise "Invalid divider type [#{type}]"
       end

data/lib/twitter_bootstrap_markup/dropdown_button.rb

@@ -17,7 +17,7 @@ module TwitterBootstrapMarkup
       if element.is_a?(Tag) && element.name == :li
         @ul.append element
       else
-        @ul.append Tag.block(:li) { append element }
+        @ul.append Tag.block(:li, element)
       end
     end
 

data/lib/twitter_bootstrap_markup/fieldset.rb

@@ -11,7 +11,7 @@ module TwitterBootstrapMarkup
         super(:fieldset, attributes) {}
       end
 
-      prepend Tag.new(:legend) { append legend } if legend
+      prepend Tag.new(:legend, legend) if legend
     end
 
   end

data/lib/twitter_bootstrap_markup/help.rb

@@ -4,9 +4,9 @@ module TwitterBootstrapMarkup
     def initialize(type, text)
       case type
         when :inline
-          super(:span, :class => 'help-inline') { append text }
+          super(:span, text, :class => 'help-inline') {}
         when :block
-          super(:p, :class => 'help-block') { append text }
+          super(:p, text, :class => 'help-block') {}
         else
           raise "Invalid help type [#{type}]"
       end

data/lib/twitter_bootstrap_markup/label_base.rb

@@ -3,7 +3,7 @@ module TwitterBootstrapMarkup
     TYPES = [:success, :warning, :important, :info, :inverse]
 
     def initialize(text)
-      super(:span, :class => class_name.downcase) { append text }
+      super(:span, text, :class => class_name.downcase) {}
     end
 
     TYPES.each do |type|

data/lib/twitter_bootstrap_markup/link.rb

@@ -9,7 +9,7 @@ module TwitterBootstrapMarkup
       if block_given?
         super(:a, {:href => url}.merge(attributes), &block)
       else
-        super(:a, {:href => url}.merge(attributes || {})) { append text }
+        super(:a, text, {:href => url}.merge(attributes || {})) {}
       end
     end
 

data/lib/twitter_bootstrap_markup/link_button.rb

@@ -9,7 +9,7 @@ module TwitterBootstrapMarkup
       if block_given?
         super(:a, attributes.prepend!(:class, 'btn').merge(:href => url), &block)
       else
-        super(:a, attributes.prepend!(:class, 'btn').merge(:href => url)) { append text }
+        super(:a, text, attributes.prepend!(:class, 'btn').merge(:href => url)) {}
       end
     end
 

data/lib/twitter_bootstrap_markup/nav_header.rb

@@ -2,7 +2,7 @@ module TwitterBootstrapMarkup
   class NavHeader < Tag
 
     def initialize(text)
-      super(:li, :class => 'nav-header') { append text }
+      super(:li, text, :class => 'nav-header') {}
     end
 
   end

data/lib/twitter_bootstrap_markup/page_header.rb

@@ -6,7 +6,7 @@ module TwitterBootstrapMarkup
         append do
           Tag.block(:h1) do
             append title
-            append Tag.block(:small) { append subtitle } if subtitle
+            append Tag.block(:small, "  #{subtitle}") {} if subtitle
           end
         end
 

data/lib/twitter_bootstrap_markup/select.rb

@@ -15,7 +15,7 @@ module TwitterBootstrapMarkup
         append_options
       end
 
-      prepend Tag.new(:option, :value => '') { append prompt } if prompt
+      prepend Tag.new(:option, prompt, :value => '') {} if prompt
     end
 
     SIZES.each do |size|
@@ -43,7 +43,7 @@ module TwitterBootstrapMarkup
 
     def append_options_array(options, container=self)
       options.each do |option|
-        o = container.append Tag.block(:option, :value => option) { append option }
+        o = container.append Tag.block(:option, option, :value => option) {}
         o.attributes[:selected] = nil if option.to_s == @selected_value.to_s
       end
     end
@@ -57,7 +57,7 @@ module TwitterBootstrapMarkup
           group = append Tag.block(:optgroup, :label => key)
           append_options_hash(value, group)
         else
-          o = container.append Tag.block(:option, :value => value) { append key }
+          o = container.append Tag.block(:option, key, :value => value) {}
           o.attributes[:selected] = nil if value.to_s == @selected_value.to_s
         end
       end

data/lib/twitter_bootstrap_markup/tab_content.rb

@@ -22,7 +22,7 @@ module TwitterBootstrapMarkup
       else
         attributes = {:class => 'tab-pane', :id => id}
         attributes.append!(:class, :active) if mode == :active
-        internal_append Tag.block(:div, attributes) { append element }
+        internal_append Tag.block(:div, element, attributes)
       end
     end
   end

data/lib/twitter_bootstrap_markup/table.rb

@@ -12,8 +12,9 @@ module TwitterBootstrapMarkup
     end
 
     TYPES.each do |type|
-      define_method type do
+      define_method type do |&block|
         attributes.append!(:class, "table-#{type}")
+        instance_eval &block if block
         self
       end
     end

data/lib/twitter_bootstrap_markup/tag.rb

@@ -12,19 +12,21 @@ module TwitterBootstrapMarkup
       Tag.new(name, attributes)
     end
 
-    def self.block(name, attributes={}, &block)
+    def self.block(*args, &block)
       if block_given?
-        Tag.new(name, attributes, &block)
+        Tag.new(*args, &block)
       else
-        Tag.new(name, attributes) {}
+        Tag.new(*args) {}
       end
     end
 
-    def initialize(name, attributes={}, &block)
-      @name = name
-      @attributes = attributes
+    def initialize(*args, &block)
+      @name = args.shift
+      content = args.shift unless args.first.is_a?(Hash)
+      @attributes = args.shift || {}
       @children = []
-      @is_block = block_given?
+      @is_block = content || block_given?
+      append content if content
       instance_eval &block if block_given?
     end
 

data/lib/twitter_bootstrap_markup/ul_container.rb

@@ -13,7 +13,7 @@ module TwitterBootstrapMarkup
         internal_append element
       else
         attributes = mode == :active ? {:class => 'active'} : {}
-        internal_append Tag.block(:li, attributes) { append element }
+        internal_append Tag.block(:li, element, attributes)
       end
     end
 

data/lib/twitter_bootstrap_markup/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapMarkup
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/twitter_bootstrap_markup/well.rb

@@ -1,8 +1,9 @@
 module TwitterBootstrapMarkup
   class Well < Tag
 
-    def initialize(attributes={}, &block)
-      super(:div, attributes.prepend!(:class, 'well'), &block)
+    def initialize(*args, &block)
+      super(:div, *args, &block)
+      attributes.prepend!(:class, 'well')
     end
 
     def small

data/spec/alert_spec.rb

@@ -7,7 +7,7 @@ describe Alert do
     Alert::TYPES.each do |type|
       it type do
         tag = Alert.new do
-          append Tag.block(:strong) { append 'Alert!' }
+          append Tag.block :strong, 'Alert!'
           append 'Message'
         end
 
@@ -17,7 +17,7 @@ describe Alert do
 
     it 'closable' do
       tag = Alert.new do
-        append Tag.block(:strong) { append 'Alert!' }
+        append Tag.block :strong, 'Alert!'
         append 'Message'
       end
 
@@ -31,12 +31,12 @@ describe Alert do
     Alert::TYPES.each do |type|
       it type do
         tag1 = Alert.send(type) do
-          append Tag.block(:strong) { append 'Alert!' }
+          append Tag.block :strong, 'Alert!'
           append 'Message'
         end
 
         tag2 = Alert.new do
-          append Tag.block(:strong) { append 'Alert!' }
+          append Tag.block :strong, 'Alert!'
           append 'Message'
         end
 
@@ -45,12 +45,12 @@ describe Alert do
 
       it "#{type}_closable" do
         tag1 = Alert.send("#{type}_closable") do
-          append Tag.block(:strong) { append 'Alert!' }
+          append Tag.block :strong, 'Alert!'
           append 'Message'
         end
 
         tag2 = Alert.new do
-          append Tag.block(:strong) { append 'Alert!' }
+          append Tag.block :strong, 'Alert!'
           append 'Message'
         end
 
@@ -60,12 +60,12 @@ describe Alert do
 
     it 'closable' do
       tag1 = Alert.closable do
-        append Tag.block(:strong) { append 'Alert!' }
+        append Tag.block :strong, 'Alert!'
         append 'Message'
       end
 
       tag2 = Alert.new do
-        append Tag.block(:strong) { append 'Alert!' }
+        append Tag.block :strong, 'Alert!'
         append 'Message'
       end
 

data/spec/link_spec.rb

@@ -11,11 +11,11 @@ describe Link do
   end
 
   it 'url and block' do
-    Link.new('url') { append Tag.block(:strong) { append 'text' } }.to_s.should eq '<a href="url"><strong>text</strong></a>'
+    Link.new('url') { append Tag.block(:strong, 'text') }.to_s.should eq '<a href="url"><strong>text</strong></a>'
   end
 
   it 'url and block with aditional attributes' do
-    Link.new('url', :title => 'link') { append Tag.block(:strong) { append 'text' } }.to_s.should eq '<a href="url" title="link"><strong>text</strong></a>'
+    Link.new('url', :title => 'link') { append Tag.block(:strong, 'text') }.to_s.should eq '<a href="url" title="link"><strong>text</strong></a>'
   end
 
   it 'url, image and text' do

data/spec/page_header_spec.rb

@@ -7,7 +7,7 @@ describe PageHeader do
   end
 
   it 'title and subtitle' do
-    PageHeader.new('Page Title', 'Subtitle').to_s.should eq '<div class="page-header"><h1>Page Title<small>Subtitle</small></h1></div>'
+    PageHeader.new('Page Title', 'Subtitle').to_s.should eq '<div class="page-header"><h1>Page Title<small>&nbsp;&nbsp;Subtitle</small></h1></div>'
   end
 
 end

data/spec/pagination_spec.rb

@@ -5,8 +5,8 @@ describe Pagination do
   [:default, :centered, :right].each do |position|
     it position do
       tag = Pagination.send(position == :default ? :new : position) do
-        append Tag.new(:a) { append 'Prev' }, :active
-        append Tag.new(:a) { append 1 }, :active
+        append Tag.new(:a, 'Prev'), :active
+        append Tag.new(:a, 1), :active
         append Link.new(2, '#')
         append Link.new('Next', '#')
       end

data/spec/table_spec.rb

@@ -24,6 +24,10 @@ describe Table do
       end
     end
 
+    it 'combined' do
+      Table.bordered.condensed.striped { append Tag.block(:tr) }.to_s.should eq Table.new { append Tag.block(:tr) }.bordered.condensed.striped.to_s
+    end
+
   end
 
 end

data/spec/tabs_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Tab' do
+describe Tab do
 
   it 'default' do
     tag = Tab.new do
@@ -8,11 +8,11 @@ describe 'Tab' do
       nav.append NavTab.new('Tab 2', '#tab2')
       nav.append NavTab.new('#tab3') { append 'Tab 3' }
       content.append('tab1', :active) do
-        Tag.block(:i) { append 'Content for Tab 1' }
+        Tag.block :i, 'Content for Tab 1'
       end
       content.append 'tab2', 'Content for Tab 2'
       content.append('tab3') do
-        Tag.block(:strong) { append 'Content for Tab 3' }
+        Tag.block :strong, 'Content for Tab 3'
       end
     end
 

data/spec/tag_spec.rb

@@ -26,7 +26,7 @@ describe Tag do
   end
 
   it 'Create text container tag' do
-    Tag.block(:div, :style => 'width: 100%') { append 'Title' }.to_s.should eq '<div style="width: 100%">Title</div>'
+    Tag.block(:div, 'Title', :style => 'width: 100%').to_s.should eq '<div style="width: 100%">Title</div>'
   end
 
   it 'Create tag tree' do

data/spec/well_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe Well do
 
   it 'default' do
-    Well.new{append 'This is a well'}.to_s.should eq '<div class="well">This is a well</div>'
+    Well.new('This is a well').to_s.should eq '<div class="well">This is a well</div>'
   end
 
   it 'small' do
-    Well.small{append 'This is a small well'}.to_s.should eq '<div class="well well-small">This is a small well</div>'
+    Well.small('This is a small well').to_s.should eq '<div class="well well-small">This is a small well</div>'
   end
 
   it 'large' do
-    Well.large{append 'This is a large well'}.to_s.should eq '<div class="well well-large">This is a large well</div>'
+    Well.large('This is a large well').to_s.should eq '<div class="well well-large">This is a large well</div>'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_markup
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24630648 !ruby/object:Gem::Requirement
+  requirement: &25752036 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24630648
+  version_requirements: *25752036
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &24629736 !ruby/object:Gem::Requirement
+  requirement: &25751784 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24629736
+  version_requirements: *25751784
 description: Object Oriented Twitter Bootstrap Markup
 email:
 - gabynaiman@gmail.com