twitter-bootstrap-markup-rails 0.3.0 → 0.3.1

data/.gitignore

@@ -6,3 +6,4 @@ doc
 pkg
 .idea
 .rvmrc
+coverage

data/CONTRIBUTORS.md

@@ -3,3 +3,4 @@
 Daniel Jabbour, https://github.com/djabbour
 Carlos Vilhena, https://github.com/carvil
 Cristian Bica,  https://github.com/cristianbica
+Ryan Feng,      https://github.com/rfeng

data/README.md

@@ -3,7 +3,7 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>v0.3.0</td>
+        <td>v0.3.1</td>
     </tr>
     <tr>
         <th>Build Status</th>
@@ -26,7 +26,7 @@ This gem focuses on making it easier to use Twitter's Bootstrap 2.0. It's a coll
 
 Add to your `Gemfile`:
 
-    gem 'twitter-bootstrap-markup-rails', '0.3.0'
+    gem 'twitter-bootstrap-markup-rails', '0.3.1'
 
 ## Currently Supported
 
@@ -34,6 +34,8 @@ Add to your `Gemfile`:
 * Inline labels
 * Buttons
 * Button dropdowns
+* Modal windows
+* Progress bars
 
 Documentation
 ---

data/Rakefile

@@ -18,3 +18,15 @@ YARD::Rake::YardocTask.new do |t|
   #t.options = ['--plugin', 'yard-tomdoc']
 end
 
+if RUBY_VERSION =~ /^1\.9/
+  desc "Code coverage detail"
+  task :simplecov do
+    ENV['COVERAGE'] = "true"
+    Rake::Task['spec'].execute
+  end
+else
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
+end

data/lib/twitter-bootstrap-markup-rails/components.rb

@@ -9,6 +9,7 @@ module Twitter::Bootstrap::Markup::Rails
     autoload :ButtonDropdown, 'twitter-bootstrap-markup-rails/components/button_dropdown'
     autoload :Navigation, 'twitter-bootstrap-markup-rails/components/navigation'
     autoload :Modal, 'twitter-bootstrap-markup-rails/components/modal'
+    autoload :ProgressBar, 'twitter-bootstrap-markup-rails/components/progress_bar'
   end
 end
 

data/lib/twitter-bootstrap-markup-rails/components/progress_bar.rb

@@ -0,0 +1,51 @@
+module Twitter::Bootstrap::Markup::Rails::Components
+  class ProgressBar < Base
+    attr_accessor :width
+
+    def initialize(width, options = {})
+      super
+      @width = width
+    end
+
+    def to_s
+      output_buffer << content_tag(:div, build_div_options) do
+        build_bar_tag.html_safe
+      end.html_safe
+      super
+    end
+
+    private
+
+    def default_options
+      {
+        :class        => 'progress',
+        :type         => [],
+        :html_options => {}
+      }
+    end
+
+    def build_bar_tag
+      ops = { :class => 'bar', :style => "width: #{width}%;" }
+      content_tag(:div, nil, ops)
+    end
+
+    def build_div_options
+      ops = { :class => build_class }
+      ops.reverse_merge(options[:html_options])
+    end
+
+    def build_class
+      classes = [options[:class]]
+
+      if options[:type].is_a?(Array)
+        classes = classes | options[:type].map { |c| "progress-#{c.to_s}" }
+      else
+        classes << "progress-#{options[:type]}"
+      end
+
+      classes << "active" if options[:active]
+
+      classes.join(" ")
+    end
+  end
+end

data/lib/twitter-bootstrap-markup-rails/helper_collection.rb

@@ -34,11 +34,11 @@ module Twitter::Bootstrap::Markup::Rails
     attr_accessor :method, :options, :args
 
     def initialize(view, symbol, args, block)
-      @view = view
-      @method = symbol
+      @view    = view
+      @method  = symbol
       @options = args.extract_options!
-      @args = args
-      @block = block
+      @args    = args
+      @block   = block
     end
 
     def to_s
@@ -53,4 +53,4 @@ module Twitter::Bootstrap::Markup::Rails
     end
 
   end
-end
+end

data/lib/twitter-bootstrap-markup-rails/helpers.rb

@@ -6,6 +6,7 @@ module Twitter::Bootstrap::Markup::Rails
     autoload :ButtonHelpers, 'twitter-bootstrap-markup-rails/helpers/button_helpers'
     autoload :NavigationHelpers, 'twitter-bootstrap-markup-rails/helpers/navigation_helpers'
     autoload :ModalHelpers, 'twitter-bootstrap-markup-rails/helpers/modal_helpers'
+    autoload :ProgressBarHelpers, 'twitter-bootstrap-markup-rails/helpers/progress_bar_helpers'
   end
 end
 

data/lib/twitter-bootstrap-markup-rails/helpers/alert_helpers.rb

@@ -15,7 +15,7 @@ module Twitter::Bootstrap::Markup::Rails::Helpers
     #
     # Examples
     #
-    #   bootstrap_alert("Hello!")
+    #   bootstrap_alert_tag("Hello!")
     #   # => '<div class="alert"><a class="close">×</a>Hello!</div>'
     #
     # Returns HTML String for the alert

data/lib/twitter-bootstrap-markup-rails/helpers/progress_bar_helpers.rb

@@ -0,0 +1,23 @@
+module Twitter::Bootstrap::Markup::Rails::Helpers
+  module ProgressBarHelpers
+    # Render a bootstrap progress bar
+    #
+    # @param [Integer] width percent out of 100 progress on bar
+    # @param [Hash] options hash containing options (default: {}):
+    #           :type         - Additional progress type(s). For one, just specify a string, but
+    #                           you can also pass an array (of sym or str) for multiple classes
+    #           :html_options - Any additional options you'd like to pass to the content_tag that will be created
+    #                           for this button's a tag (for instance :target can be specified in :html_options).
+    #
+    # Examples
+    #
+    #   bootstrap_progress_bar_tag 40, :type => ['info', 'striped'], :active => true
+    #
+    def bootstrap_progress_bar_tag(width, options = {})
+      Twitter::Bootstrap::Markup::Rails::Components::ProgressBar.new(
+        width,
+        options
+      ).to_s
+    end
+  end
+end

data/lib/twitter-bootstrap-markup-rails/version.rb

@@ -2,7 +2,7 @@ module Twitter
   module Bootstrap
     module Markup
       module Rails
-        VERSION = "0.3.0"
+        VERSION = "0.3.1"
       end
     end
   end

data/spec/helpers/form_helpers_spec.rb

@@ -122,5 +122,15 @@ describe Twitter::Bootstrap::Markup::Rails::Helpers::FormHelpers do
 
       end
     end
+
+    context "password_field" do
+      it "should wrap a text input within the magical div tags" do
+        build_bootstrap_form do |f|
+          f.password_field 'method'
+        end
+
+        output_buffer.should have_tag('div.control-group div.controls input[type=password]')
+      end
+    end
   end
-end
+end

data/spec/helpers/progress_bar_helpers_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Twitter::Bootstrap::Markup::Rails::Helpers::ProgressBarHelpers do
+  include BootstrapSpecHelper
+
+  before do
+    @output_buffer = ''
+  end
+
+  it 'should create a bar with the progress class' do
+    concat bootstrap_progress_bar_tag(40)
+    output_buffer.should have_tag("div.progress div.bar")
+  end
+
+  it 'should have the correct width' do
+    concat bootstrap_progress_bar_tag(40)
+    output_buffer.should have_tag(:div, :style => 'width: 40%;')
+  end
+
+  it 'stores sets the type of the progress bar' do
+    concat bootstrap_progress_bar_tag(40, :type => :striped)
+    output_buffer.should have_tag("div.progress.progress-striped")
+  end
+
+  it 'stores sets the types of the progress bar' do
+    concat bootstrap_progress_bar_tag(40, :type => [:striped, :warning])
+    output_buffer.should have_tag("div.progress.progress-striped.progress-warning")
+  end
+
+  it 'stores sets the active flag of the progress bar' do
+    concat bootstrap_progress_bar_tag(40, :active => true)
+    output_buffer.should have_tag("div.progress.active")
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # encoding: utf-8
-require 'bundler/setup'
+
+if RUBY_VERSION =~ /^1\.9/
+  require 'simplecov'
+  ENV["COVERAGE"] && SimpleCov.start
+end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/twitter-bootstrap-markup-rails'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/twitter-bootstrap-markup-rails/engine'))

data/spec/support/bootstrap_spec_helper.rb

@@ -25,29 +25,12 @@ module BootstrapSpecHelper
   include ActiveSupport
   include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
 
-  def _routes
-    url_helpers = mock('url_helpers')
-    url_helpers.stub!(:hash_for_posts_path).and_return({})
-    url_helpers.stub!(:hash_for_post_path).and_return({})
-    url_helpers.stub!(:hash_for_post_models_path).and_return({})
-    url_helpers.stub!(:hash_for_authors_path).and_return({})
-
-    mock('_routes',
-         :url_helpers => url_helpers,
-         :url_for => "/mock/path"
-        )
-  end
-
   def controller
     env = mock('env', :[] => nil)
     request = mock('request', :env => env)
     mock('controller', :controller_path= => '', :params => {}, :request => request)
   end
 
-  def default_url_options
-    {}
-  end
-
   def self.included(base)
     base.class_eval do
 

data/twitter-bootstrap-markup-rails.gemspec

@@ -18,14 +18,13 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "railties", "~> 3.0"
   gem.add_development_dependency "rails",              "~> 3.0"
-  gem.add_development_dependency "rspec-rails",        "~> 2.8"
-  gem.add_development_dependency "guard",              "~> 1.0"
-  gem.add_development_dependency "guard-rspec",        "~> 0.6"
+  gem.add_development_dependency "rspec-rails",        "~> 2.10"
   gem.add_development_dependency "rspec_tag_matchers", ">= 1.0"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'redcarpet'
   gem.add_development_dependency 'yard-tomdoc'
   gem.add_development_dependency 'simple-navigation'
+  gem.add_development_dependency RUBY_VERSION =~ /^1\.9/ ? "simplecov" : "rcov"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-markup-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,13 +58,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
@@ -72,33 +72,17 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rspec_tag_matchers
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,9 +90,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: yard-tomdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard-tomdoc
+  name: simple-navigation
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple-navigation
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -200,7 +184,6 @@ files:
 - .travis.yml
 - CONTRIBUTORS.md
 - Gemfile
-- Guardfile
 - README.md
 - Rakefile
 - lib/twitter-bootstrap-markup-rails.rb
@@ -216,6 +199,7 @@ files:
 - lib/twitter-bootstrap-markup-rails/components/inline_label.rb
 - lib/twitter-bootstrap-markup-rails/components/modal.rb
 - lib/twitter-bootstrap-markup-rails/components/navigation.rb
+- lib/twitter-bootstrap-markup-rails/components/progress_bar.rb
 - lib/twitter-bootstrap-markup-rails/engine.rb
 - lib/twitter-bootstrap-markup-rails/helper_collection.rb
 - lib/twitter-bootstrap-markup-rails/helper_collection_set.rb
@@ -226,6 +210,7 @@ files:
 - lib/twitter-bootstrap-markup-rails/helpers/inline_label_helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/modal_helpers.rb
 - lib/twitter-bootstrap-markup-rails/helpers/navigation_helpers.rb
+- lib/twitter-bootstrap-markup-rails/helpers/progress_bar_helpers.rb
 - lib/twitter-bootstrap-markup-rails/plugins.rb
 - lib/twitter-bootstrap-markup-rails/plugins/simple_navigation/renderer/bootstrap_topbar_list.rb
 - lib/twitter-bootstrap-markup-rails/version.rb
@@ -236,6 +221,7 @@ files:
 - spec/helpers/inline_label_helpers_spec.rb
 - spec/helpers/modal_helpers_spec.rb
 - spec/helpers/navigation_helpers_spec.rb
+- spec/helpers/progress_bar_helpers_spec.rb
 - spec/integration/action_view_spec.rb
 - spec/integration/readme_spec.rb
 - spec/plugins/bootstrap_topbar_list_spec.rb
@@ -267,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails helpers for Bootstrap 2.0 - HTML, CSS, and JS toolkit from
@@ -279,6 +265,7 @@ test_files:
 - spec/helpers/inline_label_helpers_spec.rb
 - spec/helpers/modal_helpers_spec.rb
 - spec/helpers/navigation_helpers_spec.rb
+- spec/helpers/progress_bar_helpers_spec.rb
 - spec/integration/action_view_spec.rb
 - spec/integration/readme_spec.rb
 - spec/plugins/bootstrap_topbar_list_spec.rb

data/Guardfile

@@ -1,7 +0,0 @@
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/.*(helpers|components)/(.+)\.rb$})    { |m| "spec/#{m[1]}/#{m[2]}_spec.rb" }
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch(%r{^lib/(.+)\.rb$})                           { "spec" }
-end