css3-progress-bar-rails 0.3.1 → 0.4.0

data/README.markdown

@@ -22,14 +22,24 @@ Into the application.css header:
 
     *= require 'css3-progress-bar'
 
+In a view:
+
+    <%= progress_bar(33, :color => 'blue', :rounded => true) %>  
+
+Also, I have added support for the upcoming [Twitter Bootstrap 2][tweetin]
+progress bar styling as well.  To use:
+
+    <%= bootstrap_progress_bar(33, :color => 'info', :striped => true) %>  
+
 [View Examples Here][examples]
 
 ## Indication
 
 Except where indicated:  
-Copyright (c) 2011 [Nicholas Fine][vanity], released under the MIT license. 
+Copyright (c) 2012 [Nicholas Fine][vanity], released under the MIT license. 
 
 [js]: http://dipperstove.com/index.html
 [blog]: http://dipperstove.com/design/css3-progress-bars.html
 [vanity]: http://ndfine.com
 [examples]: http://ndfine.com/2012/01/03/css3-progress-bars-for-rails.html
+[tweetin]: http://markdotto.com/bs2/docs/components.html#progress

data/app/helpers/css3_progress_bars_helper.rb

@@ -33,6 +33,29 @@ module Css3ProgressBarsHelper
     content_tag :div, mortice_html, :class => html_classes[:container_classes].join(' ')
   end
 
+  def bootstrap_progress_bar percentage, *opts
+    percentage = scrub_percentage(percentage)
+    options = opts.extract_options!
+
+    container_classes = %w(progress)
+
+    if options[:striped] && options[:striped] == true
+      container_classes << 'progress-striped'
+    end
+
+    if options[:active] && options[:active] == true
+      container_classes << 'active'
+    end
+
+    if options[:color] && %w(info success danger).include?(options[:color])
+      container_classes << "progress-#{options[:color]}"
+    end
+
+    bar_html = bar_div(%w('bar'), bar_style(percentage))
+
+    content_tag :div, bar_html, :class => container_classes.join(' ')
+  end
+
   # Accepts an array of values between 0 and 100 to represent the combo progress
   # values.  As there is a limit to the number of colors, only the first five
   # elements of the array will be used.

data/lib/css3-progress-bar-rails/version.rb

@@ -2,7 +2,7 @@ module Css3
   module Progress
     module Bar
       module Rails
-        VERSION = "0.3.1"
+        VERSION = "0.4.0"
       end
     end
   end

data/test/css3_progress_bars_helper_test.rb

@@ -7,6 +7,34 @@ include ActionView::Context
 include Css3ProgressBarsHelper
 
 describe Css3ProgressBarsHelper do
+  describe '#bootstrap_progress_bar' do
+    describe 'with the color option' do
+      describe 'using an invalid color option' do
+        it 'does not set a color class in container div' do
+          Nokogiri::HTML(bootstrap_progress_bar(33, :color => 'foo')).search('div.progress').first.attributes["class"].wont_match /progress-foo/
+        end
+      end
+
+      describe 'using a valid color option' do
+        it 'sets the correct class in container div' do
+          Nokogiri::HTML(bootstrap_progress_bar(33, :color => 'info')).search('div.progress').first.attributes["class"].must_match /progress-info/
+        end
+      end
+    end
+
+    describe 'with the striped option' do
+      it 'sets the correct class in container div' do
+        Nokogiri::HTML(bootstrap_progress_bar(33, :striped => true)).search('div.progress').first.attributes["class"].must_match /progress-striped/
+      end
+    end
+
+    describe 'with the active option' do
+      it 'sets the correct class in container div' do
+        Nokogiri::HTML(bootstrap_progress_bar(12, :active => true)).search('div.progress').first.attributes["class"].must_match /active/
+      end
+    end
+  end
+
   describe '#combo_progress_bar' do
     describe 'given a collection that contains an invalid percentage value' do
       it 'raises an ArgumentError' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: css3-progress-bar-rails
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Nicholas Fine
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 -06:00
+date: 2012-01-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency