twitter_bootstrap_markup 0.0.2 → 0.0.3

data/lib/twitter_bootstrap_markup.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 require 'twitter_bootstrap_markup/extension/hash'
 require 'twitter_bootstrap_markup/version'
 require 'twitter_bootstrap_markup/tooltip'
@@ -12,7 +14,10 @@ require 'twitter_bootstrap_markup/link_button'
 require 'twitter_bootstrap_markup/icon'
 require 'twitter_bootstrap_markup/divider'
 require 'twitter_bootstrap_markup/dropdown_button'
+require 'twitter_bootstrap_markup/dropdown_link'
 require 'twitter_bootstrap_markup/alert'
+require 'twitter_bootstrap_markup/input_size'
+require 'twitter_bootstrap_markup/textarea'
 require 'twitter_bootstrap_markup/input'
 require 'twitter_bootstrap_markup/select'
 require 'twitter_bootstrap_markup/add_on'
@@ -43,3 +48,5 @@ require 'twitter_bootstrap_markup/pagination'
 require 'twitter_bootstrap_markup/progress_bar'
 require 'twitter_bootstrap_markup/grid_row'
 require 'twitter_bootstrap_markup/grid_column'
+
+require 'twitter_bootstrap_markup/tag_builder'

data/lib/twitter_bootstrap_markup/alert.rb

@@ -15,7 +15,7 @@ module TwitterBootstrapMarkup
     end
 
     def closable
-      prepend Tag.new(:button, :class => 'close', 'data-dismiss' => 'alert') { append '&times' }
+      prepend Tag.new(:a, :class => 'close', 'data-dismiss' => 'alert') { append '&times' }
       self
     end
 

data/lib/twitter_bootstrap_markup/badge.rb

@@ -1,4 +1,5 @@
 module TwitterBootstrapMarkup
-  class Badge < LabelBase
+  class Badge < Tag
+    include LabelBase
   end
 end

data/lib/twitter_bootstrap_markup/button.rb

@@ -1,5 +1,6 @@
 module TwitterBootstrapMarkup
-  class Button < ButtonBase
+  class Button < Tag
+    include ButtonBase
 
     def initialize(*args, &block)
       text = args.shift unless block_given?

data/lib/twitter_bootstrap_markup/button_base.rb

@@ -1,40 +1,44 @@
 module TwitterBootstrapMarkup
-  class ButtonBase < Tag
+  module ButtonBase
     TYPES = [:primary, :info, :success, :warning, :danger, :inverse]
     SIZES = [:large, :small, :mini]
 
-    TYPES.each do |type|
-      define_method type do
-        attributes.append!(:class, "btn-#{type}")
-        self
-      end
-    end
+    def self.included(base)
 
-    SIZES.each do |size|
-      define_method size do
-        self.attributes.append!(:class, "btn-#{size}")
-        self
+      TYPES.each do |type|
+        base.send(:define_method, type) do
+          attributes.append!(:class, "btn-#{type}")
+          self
+        end
       end
-    end
 
-    TYPES.each do |type|
-      define_singleton_method(type) do |*args, &block|
-        self.new(*args, &block).send(type)
+      SIZES.each do |size|
+        base.send(:define_method, size) do
+          self.attributes.append!(:class, "btn-#{size}")
+          self
+        end
       end
-    end
 
-    SIZES.each do |size|
-      define_singleton_method(size) do |*args, &block|
-        self.new(*args, &block).send(size)
+      TYPES.each do |type|
+        base.send(:define_singleton_method, type) do |*args, &block|
+          self.new(*args, &block).send(type)
+        end
       end
-    end
 
-    TYPES.each do |type|
       SIZES.each do |size|
-        define_singleton_method("#{type}_#{size}") do |*args, &block|
-          self.new(*args, &block).send(type).send(size)
+        base.send(:define_singleton_method, size) do |*args, &block|
+          self.new(*args, &block).send(size)
+        end
+      end
+
+      TYPES.each do |type|
+        SIZES.each do |size|
+          base.send(:define_singleton_method, "#{type}_#{size}") do |*args, &block|
+            self.new(*args, &block).send(type).send(size)
+          end
         end
       end
+
     end
 
   end

data/lib/twitter_bootstrap_markup/dropdown_link.rb

@@ -0,0 +1,30 @@
+module TwitterBootstrapMarkup
+  class DropdownLink < Tag
+    alias :internal_append :append
+
+    def initialize(text, &block)
+      super(:div, :class => 'dropdown') do
+        internal_append(Link.new('#', :class => 'dropdown-toggle', 'data-toggle' => 'dropdown') do
+          append "#{text} "
+          append Tag.block :span, :class => 'caret'
+        end)
+        @ul = internal_append Tag.block(:ul, :class => 'dropdown-menu')
+        instance_eval &block if block_given?
+      end
+    end
+
+    def append(element)
+      if element.is_a?(Tag) && element.name == :li
+        @ul.append element
+      else
+        @ul.append Tag.block(:li, element)
+      end
+    end
+
+    def as_nav_item
+      @name = :li
+      self
+    end
+
+  end
+end

data/lib/twitter_bootstrap_markup/input.rb

@@ -1,25 +1,19 @@
 module TwitterBootstrapMarkup
   class Input < Tag
     TYPES = [:text, :hidden, :email, :password, :button, :checkbox, :radio]
-    SIZES = [:mini, :small, :medium, :large, :xlarge, :xxlarge]
+
+    include InputSize::InstanceMethods
 
     def initialize(type, attributes={}, &block)
       super(:input, {:type => type}.merge(attributes), &block)
     end
 
-    SIZES.each do |size|
-      define_method(size) do
-        attributes.append!(:class, "input-#{size}")
-        self
-      end
-    end
-
     TYPES.each do |type|
       define_singleton_method(type) do |*args, &block|
         self.new(type, *args, &block)
       end
 
-      SIZES.each do |size|
+      InputSize::VALUES.each do |size|
         define_singleton_method("#{type}_#{size}") do |*args, &block|
           self.new(type, *args, &block).send(size)
         end

data/lib/twitter_bootstrap_markup/input_size.rb

@@ -0,0 +1,22 @@
+module TwitterBootstrapMarkup
+  module InputSize
+    VALUES = [:mini, :small, :medium, :large, :xlarge, :xxlarge]
+
+    module InstanceMethods
+      VALUES.each do |size|
+        define_method(size) do
+          attributes.append!(:class, "input-#{size}")
+          self
+        end
+      end
+    end
+
+    module ClassMethods
+      VALUES.each do |size|
+        define_method(size) do |*args, &block|
+          self.new(*args, &block).send(size)
+        end
+      end
+    end
+  end
+end

data/lib/twitter_bootstrap_markup/label.rb

@@ -1,4 +1,5 @@
 module TwitterBootstrapMarkup
-  class Label < LabelBase
+  class Label < Tag
+    include LabelBase
   end
 end

data/lib/twitter_bootstrap_markup/label_base.rb

@@ -1,22 +1,26 @@
 module TwitterBootstrapMarkup
-  class LabelBase < Tag
+  module LabelBase
     TYPES = [:success, :warning, :important, :info, :inverse]
 
     def initialize(text)
       super(:span, text, :class => class_name.downcase) {}
     end
 
-    TYPES.each do |type|
-      define_method type do
-        attributes.append!(:class, "#{class_name.downcase}-#{type}")
-        self
+    def self.included(base)
+
+      TYPES.each do |type|
+        base.send(:define_method, type) do
+          attributes.append!(:class, "#{class_name.downcase}-#{type}")
+          self
+        end
       end
-    end
 
-    TYPES.each do |type|
-      define_singleton_method type do |*args, &block|
-        self.new(*args, &block).send(type)
+      TYPES.each do |type|
+        base.send(:define_singleton_method, type) do |*args, &block|
+          self.new(*args, &block).send(type)
+        end
       end
+
     end
 
     private

data/lib/twitter_bootstrap_markup/link_button.rb

@@ -1,5 +1,6 @@
 module TwitterBootstrapMarkup
-  class LinkButton < ButtonBase
+  class LinkButton < Tag
+    include ButtonBase
 
     def initialize(*args, &block)
       text = args.shift unless block_given?

data/lib/twitter_bootstrap_markup/nav_bar.rb

@@ -1,13 +1,15 @@
 module TwitterBootstrapMarkup
   class NavBar < Tag
+    alias :internal_append :append
 
     def initialize(attributes={}, &block)
-      super(:div, attributes.prepend!(:class, 'navbar')){}
-      append do
-        Tag.new(:div, :class => 'navbar-inner') do
-          append Tag.new(:div, :class => 'container', &block)
-        end
-      end
+      super(:div, attributes.prepend!(:class, 'navbar')) {}
+      @container = Tag.block(:div, :class => 'container', &block)
+      internal_append Tag.block(:div, @container, :class => 'navbar-inner')
+    end
+
+    def append(*args, &block)
+      @container.append(*args, &block)
     end
 
     def top

data/lib/twitter_bootstrap_markup/nav_list.rb

@@ -1,11 +1,16 @@
 module TwitterBootstrapMarkup
   class NavList < Well
+    alias :internal_append :append
 
     def initialize(attributes={}, &block)
-      super(attributes.append!(:style, 'padding: 8px 0;')) do
-        append NavListContainer.new(&block)
-      end
+      super(attributes.append!(:style, 'padding: 8px 0;')) {}
+      @container = NavListContainer.new(&block)
+      internal_append @container
+    end
+
+    def append(*args, &block)
+      @container.append(*args, &block)
     end
-  end
 
+  end
 end

data/lib/twitter_bootstrap_markup/select.rb

@@ -1,6 +1,7 @@
 module TwitterBootstrapMarkup
   class Select < Tag
-    SIZES = [:mini, :small, :medium, :large, :xlarge, :xxlarge]
+    extend InputSize::ClassMethods
+    include InputSize::InstanceMethods
 
     def initialize(*args, &block)
       @options = args.shift || [] unless block_given?
@@ -18,19 +19,6 @@ module TwitterBootstrapMarkup
       prepend Tag.new(:option, prompt, :value => '') {} if prompt
     end
 
-    SIZES.each do |size|
-      define_method(size) do
-        attributes.append!(:class, "input-#{size}")
-        self
-      end
-    end
-
-    SIZES.each do |size|
-      define_singleton_method(size) do |*args, &block|
-        self.new(*args, &block).send(size)
-      end
-    end
-
     private
 
     def append_options

data/lib/twitter_bootstrap_markup/tag.rb

@@ -27,11 +27,11 @@ module TwitterBootstrapMarkup
       @children = []
       @is_block = content || block_given?
       append content if content
-      instance_eval &block if block_given?
+      evaluate(&block) if block_given?
     end
 
     def append(element=nil, &block)
-      element = instance_eval(&block) if block_given?
+      element = evaluate(&block) if block_given?
       @children << element
       element
     end
@@ -49,5 +49,15 @@ module TwitterBootstrapMarkup
       end
     end
 
+    private
+
+    def evaluate(&block)
+      if block.arity == 0
+        element = instance_eval(&block)
+      else
+        element = block.call(self)
+      end
+    end
+
   end
 end

data/lib/twitter_bootstrap_markup/tag_builder.rb

@@ -0,0 +1,22 @@
+module TwitterBootstrapMarkup
+  module TagBuilder
+
+    def self.class_of(constant)
+      "TwitterBootstrapMarkup::#{constant}".safe_constantize
+    end
+
+    TwitterBootstrapMarkup.constants.select { |c| class_of(c).is_a?(Class) }.each do |constant|
+      tag_class = class_of(constant)
+      define_singleton_method constant.to_s.underscore do |*args, &block|
+        tag_class.new(*args, &block)
+      end
+
+      (tag_class.methods - Object.methods).each do |method|
+        define_singleton_method "#{constant.to_s.underscore}_#{method}" do |*args, &block|
+          tag_class.send(method, *args, &block)
+        end
+      end
+    end
+
+  end
+end

data/lib/twitter_bootstrap_markup/textarea.rb

@@ -0,0 +1,15 @@
+module TwitterBootstrapMarkup
+  class Textarea < Tag
+    extend InputSize::ClassMethods
+    include InputSize::InstanceMethods
+
+    def initialize(*args, &block)
+      if block_given?
+        super(:textarea, *args, &block)
+      else
+        super(:textarea, *args) {}
+      end
+    end
+
+  end
+end

data/lib/twitter_bootstrap_markup/ul_container.rb

@@ -3,12 +3,12 @@ module TwitterBootstrapMarkup
     alias :internal_append :append
 
     def initialize(attributes={}, &block)
-      super(:ul, attributes, &block)
+      super(:ul, attributes, &(block || Proc.new {}))
     end
 
     def append(element=nil, mode=:inactive, &block)
       element = instance_eval(&block) if block_given?
-      if element.is_a?(Tag) && element.name == :li
+      if is_li? element
         element.attributes.append!(:class, 'active') if mode == :active
         internal_append element
       else
@@ -17,5 +17,12 @@ module TwitterBootstrapMarkup
       end
     end
 
+    private
+
+    def is_li?(element)
+      (element.is_a?(Tag) && element.name == :li) ||
+          (element.is_a?(String) && ['<li>', '<li '].include?(element.downcase[0..3]))
+    end
+
   end
 end

data/lib/twitter_bootstrap_markup/version.rb

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

data/markup/alerts.html

@@ -59,7 +59,7 @@
             <td>Closable</td>
             <td id="closable">
                 <div class="alert">
-                    <button class="close" data-dismiss="alert">&times</button>
+                    <a class="close" data-dismiss="alert">&times</a>
                     <strong>Alert!</strong>
                     Message
                 </div>