twitter_bootstrap_builder 0.0.4 → 0.0.5

data/.gitignore

@@ -1,18 +1,18 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.idea

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in twitter_bootstrap_builder.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in twitter_bootstrap_builder.gemspec
+gemspec

data/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 gabriel
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2012 gabriel
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,29 +1,29 @@
-# TwitterBootstrapBuilder
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'twitter_bootstrap_builder'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install twitter_bootstrap_builder
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# TwitterBootstrapBuilder
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'twitter_bootstrap_builder'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install twitter_bootstrap_builder
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,2 +1,2 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/lib/twitter_bootstrap_builder/builders/drop_down_builder.rb

@@ -12,7 +12,7 @@ module TwitterBootstrapBuilder
       end
 
       def link_to(*args, &block)
-        Tag.block(:li, template.link_to(*args, &block)).to_s.html_safe
+        Tag.block(:li, template.link_to(*args, &block)).html_safe
       end
 
     end

data/lib/twitter_bootstrap_builder/builders/fieldset_builder.rb

@@ -19,19 +19,19 @@ module TwitterBootstrapBuilder
       def actions(&block)
         actions = Tag.block(:div, class: 'form-actions')
         actions.append template.capture(self, &block) if block
-        actions.to_s.html_safe
+        actions.html_safe
       end
 
       def display_field(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method)) do |cg|
           cg.append Tag.block(:span, model.send(method).to_s.gsub("\n", '<br>'), class: 'display')
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def text_field(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.text_field(method, options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       TwitterBootstrapMarkup::InputSize::VALUES.each do |size|
@@ -39,14 +39,14 @@ module TwitterBootstrapBuilder
           ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
             options.append!(:class, "input-#{size}")
             cg.append form_builder.text_field(method, options)
-          end.to_s.html_safe
+          end.html_safe
         end
       end
 
       def text_area(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.text_area(method, options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       TwitterBootstrapMarkup::InputSize::VALUES.each do |size|
@@ -54,62 +54,62 @@ module TwitterBootstrapBuilder
           ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
             options.append!(:class, "input-#{size}")
             cg.append form_builder.text_area(method, options)
-          end.to_s.html_safe
+          end.html_safe
         end
       end
 
       def email_field(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.email_field(method, options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def password_field(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.password_field(method, options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def check_box(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.check_box(method, options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def hidden_field(method, options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.hidden_field(method, options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def select(method, choices, options={}, html_options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.select(method, choices, options, html_options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def date_select(method, options={}, html_options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.date_select(method, form_builder.send('objectify_options', options), html_options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def time_select(method, options={}, html_options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.time_select(method, form_builder.send('objectify_options', options), html_options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def datetime_select(method, options={}, html_options={})
         ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.datetime_select(method, form_builder.send('objectify_options', options), html_options)
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def custom_field(label, options={}, &block)
         ControlGroup.new(label, options) do |cg|
           cg.append template.capture(self, &block) if block
-        end.to_s.html_safe
+        end.html_safe
       end
 
     end

data/lib/twitter_bootstrap_builder/builders/nav_bar_builder.rb

@@ -9,7 +9,7 @@ module TwitterBootstrapBuilder
       end
 
       def brand(title, url)
-        Brand.new(title, url).to_s.html_safe
+        Brand.new(title, url).html_safe
       end
 
       def container(&block)

data/lib/twitter_bootstrap_builder/builders/nav_container_builder.rb

@@ -14,24 +14,24 @@ module TwitterBootstrapBuilder
         if options[:active_if].is_a?(Proc) ? options[:active_if].call : options[:active_if]
           active_link_to(*args, &block)
         else
-          Tag.block(:li, template.link_to(*args, &block)).to_s.html_safe
+          Tag.block(:li, template.link_to(*args, &block)).html_safe
         end
       end
 
       def active_link_to(*args, &block)
-        Tag.block(:li, template.link_to(*args, &block), class: 'active').to_s.html_safe
+        Tag.block(:li, template.link_to(*args, &block), class: 'active').html_safe
       end
 
       def divider
-        Tag.block(:li, Divider.vertical).to_s.html_safe
+        Tag.block(:li, Divider.vertical).html_safe
       end
 
       def dropdown_link(text, &block)
-        Tag.block(:li, DropDownLinkBuilder.new(template, text: text, &block).html_safe).to_s.html_safe
+        Tag.block(:li, DropDownLinkBuilder.new(template, text: text, &block).html_safe).html_safe
       end
 
       def custom(&block)
-        Tag.block(:li, Tag.block(:a, template.capture(self, &block))).to_s.html_safe
+        Tag.block(:li, Tag.block(:a, template.capture(self, &block))).html_safe
       end
 
     end

data/lib/twitter_bootstrap_builder/builders/nav_list_builder.rb

@@ -9,7 +9,7 @@ module TwitterBootstrapBuilder
       end
 
       def header(text)
-        NavHeader.new(text).to_s.html_safe
+        NavHeader.new(text).html_safe
       end
 
       def link_to(*args, &block)
@@ -17,20 +17,20 @@ module TwitterBootstrapBuilder
         if options[:active_if].is_a?(Proc) ? options[:active_if].call : options[:active_if]
           active_link_to(*args, &block)
         else
-          Tag.block(:li, template.link_to(*args, &block)).to_s.html_safe
+          Tag.block(:li, template.link_to(*args, &block)).html_safe
         end
       end
 
       def active_link_to(*args, &block)
-        Tag.block(:li, template.link_to(*args, &block), class: 'active').to_s.html_safe
+        Tag.block(:li, template.link_to(*args, &block), class: 'active').html_safe
       end
 
       def divider
-        Tag.block(:li, Divider.horizontal).to_s.html_safe
+        Tag.block(:li, Divider.horizontal).html_safe
       end
 
       def custom(&block)
-        Tag.block(:li, template.capture(self, &block)).to_s.html_safe
+        Tag.block(:li, template.capture(self, &block)).html_safe
       end
 
     end

data/lib/twitter_bootstrap_builder/builders/table_builder.rb

@@ -4,7 +4,7 @@ module TwitterBootstrapBuilder
 
       def initialize(*args, &block)
         super
-        @fields = []
+        @fields = {}
       end
 
       def to_s
@@ -18,7 +18,7 @@ module TwitterBootstrapBuilder
             end
           end
           data.append pager
-        end.to_s.html_safe
+        end.html_safe
       end
 
       def collection
@@ -29,8 +29,8 @@ module TwitterBootstrapBuilder
         options[:model_class] || collection.klass
       end
 
-      def field(method)
-        @fields << method
+      def field(method, &block)
+        @fields[method] = block
         nil
       end
 
@@ -46,7 +46,7 @@ module TwitterBootstrapBuilder
           thead.append do |h|
             Tag.block(:tr) do |tr|
               tr.append Tag.block(:th)
-              @fields.each do |field|
+              @fields.keys.each do |field|
                 tr.append Tag.block(:th, model_class.human_attribute_name(field))
               end
             end
@@ -60,8 +60,8 @@ module TwitterBootstrapBuilder
             tbody.append do |b|
               Tag.block(:tr) do |tr|
                 tr.append Tag.block(:td, template.capture(model, &@actions_block), class: 'actions') if @actions_block
-                @fields.each do |field|
-                  tr.append Tag.block(:td, model.send(field))
+                @fields.each do |field, block|
+                  tr.append Tag.block(:td, (block ? template.capture(model, &block) : model.send(field)))
                 end
               end
             end

data/lib/twitter_bootstrap_builder/extensions/twitter_bootstrap_markup.rb

@@ -0,0 +1,7 @@
+module TwitterBootstrapMarkup
+  class Tag
+    def html_safe
+      to_s.html_safe
+    end
+  end
+end

data/lib/twitter_bootstrap_builder/helpers/commons_helper.rb

@@ -12,7 +12,7 @@ module TwitterBootstrapBuilder
 
       def page_header(*args)
         if args.any?
-          content_for(:page_header, TwitterBootstrapMarkup::PageHeader.new(args.shift, args.shift).to_s.html_safe)
+          content_for(:page_header, TwitterBootstrapMarkup::PageHeader.new(args.shift, args.shift).html_safe)
         else
           content_for?(:page_header) ? content_for(:page_header) : nil
         end
@@ -59,7 +59,7 @@ module TwitterBootstrapBuilder
       def well(size=nil, &block)
         well = TwitterBootstrapMarkup::Well.new(capture(&block))
         well.send(size) if size
-        well.to_s.html_safe
+        well.html_safe
       end
 
       def well_small(&block)
@@ -76,7 +76,7 @@ module TwitterBootstrapBuilder
 
       TwitterBootstrapMarkup::Alert::TYPES.each do |type|
         define_method "alert_#{type}" do |message|
-          content_for(:alert_message, TwitterBootstrapMarkup::Alert.new(message).send(type).closable.to_s.html_safe)
+          content_for(:alert_message, TwitterBootstrapMarkup::Alert.new(message).send(type).closable.html_safe)
         end
       end
 
@@ -93,20 +93,20 @@ module TwitterBootstrapBuilder
       end
 
       def icon(name)
-        TwitterBootstrapMarkup::Icon.new(name).to_s.html_safe
+        TwitterBootstrapMarkup::Icon.new(name).html_safe
       end
 
       def icon_white(name)
-        TwitterBootstrapMarkup::Icon.white(name).to_s.html_safe
+        TwitterBootstrapMarkup::Icon.white(name).html_safe
       end
 
       TwitterBootstrapMarkup::LabelBase::TYPES.each do |type|
         define_method "label_#{type}" do |text|
-          TwitterBootstrapMarkup::Label.send(type, text).to_s.html_safe
+          TwitterBootstrapMarkup::Label.send(type, text).html_safe
         end
 
         define_method "badge_#{type}" do |text|
-          TwitterBootstrapMarkup::Badge.send(type, text).to_s.html_safe
+          TwitterBootstrapMarkup::Badge.send(type, text).html_safe
         end
       end
 

data/lib/twitter_bootstrap_builder/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapBuilder
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/twitter_bootstrap_builder.rb

@@ -4,6 +4,8 @@ require 'twitter_bootstrap_builder/engine'
 require 'twitter_bootstrap_markup'
 require 'kaminari'
 
+require 'twitter_bootstrap_builder/extensions/twitter_bootstrap_markup'
+
 require 'twitter_bootstrap_builder/helpers/commons_helper'
 require 'twitter_bootstrap_builder/helpers/buttons_helper'
 require 'twitter_bootstrap_builder/helpers/dropdowns_helper'

data/vendor/assets/javascripts/twitter_bootstrap_builder.js

@@ -20,4 +20,8 @@ Array.prototype.uniq = function () {
     return this.filter(function (itm, i, a) {
         return i == a.indexOf(itm);
     });
-};
+};
+
+jQuery(function ($) {
+    $("[rel=popover]").popover();
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter_bootstrap_markup
-  requirement: &28680948 !ruby/object:Gem::Requirement
+  requirement: &25945224 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28680948
+  version_requirements: *25945224
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &28680696 !ruby/object:Gem::Requirement
+  requirement: &25944816 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28680696
+  version_requirements: *25944816
 description: Set of helpers to extend Rails for implement Twitter Bootstrap markup
 email:
 - gabynaiman@gmail.com
@@ -67,6 +67,7 @@ files:
 - lib/twitter_bootstrap_builder/builders/tab_builder.rb
 - lib/twitter_bootstrap_builder/builders/table_builder.rb
 - lib/twitter_bootstrap_builder/engine.rb
+- lib/twitter_bootstrap_builder/extensions/twitter_bootstrap_markup.rb
 - lib/twitter_bootstrap_builder/helpers/buttons_helper.rb
 - lib/twitter_bootstrap_builder/helpers/commons_helper.rb
 - lib/twitter_bootstrap_builder/helpers/dropdowns_helper.rb