css3-progress-bar-rails 0.1.2 → 0.2.0

data/app/helpers/css3_progress_bars_helper.rb

@@ -9,6 +9,7 @@ module Css3ProgressBarsHelper
   # :rounded and :tiny.  Pass a string in the :color option from the available
   # choices of 'green', 'orange', 'pink', 'blue', and 'purple'.
   def progress_bar percentage, *opts
+    validate_percentage(percentage)
     options = opts.extract_options!
 
     html_classes = setup_default_container_classes
@@ -37,6 +38,7 @@ module Css3ProgressBarsHelper
   #
   # An options hash may also be passed to the method, with a boolean option available for :tiny
   def combo_progress_bar percentages, *opts
+    validate_percentages(percentages[0..4])
     options = opts.extract_options!
     html_classes = setup_default_container_classes
     
@@ -55,6 +57,14 @@ module Css3ProgressBarsHelper
 
   protected
 
+  def validate_percentage percentage
+    (0..100).to_a.include?(percentage.to_i) ? true : (raise ArgumentError, "Invalid Percentage Value")
+  end
+
+  def validate_percentages percentages
+    percentages.each{|p|validate_percentage(p)}
+  end
+
   def setup_default_container_classes
     {
       :container_classes => %w(bar_container),

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

@@ -2,7 +2,7 @@ module Css3
   module Progress
     module Bar
       module Rails
-        VERSION = "0.1.2"
+        VERSION = "0.2.0"
       end
     end
   end

data/test/css3_progress_bars_helper_test.rb

@@ -3,11 +3,44 @@ require 'nokogiri'
 require 'action_view'
 require './app/helpers/css3_progress_bars_helper'
 include ActionView::Helpers
+include ActionView::Context
 include Css3ProgressBarsHelper
 
 describe Css3ProgressBarsHelper do
+  describe '#combo_progress_bar' do
+    describe 'given a collection that contains an invalid percentage value' do
+      it 'raises and ArgumentError' do
+        proc {combo_progress_bar([1,2,888])}.must_raise ArgumentError
+        proc {combo_progress_bar([1,2,'99999',4,5])}.must_raise ArgumentError
+      end
+    end
+    describe 'given a collection of valid percentage values' do
+      describe 'with the tiny option' do
+        it 'sets the correct tiny classes in the divs' do
+          doc = Nokogiri::HTML(combo_progress_bar([1,2,3,4], :tiny => true))
+          doc.search('div.bar_container').first.attributes["class"].value.must_match /container_tiny/
+          doc.search('div.bar_mortice').first.attributes["class"].value.must_match /mortice_tiny/
+          doc.search('div.progress').first.attributes["class"].value.must_match /progress_tiny/
+        end
+      end
+
+      it 'returns the correct number of divs' do
+        Nokogiri::HTML(combo_progress_bar([1,2,3,4,5])).search('div').count.must_equal 7
+        Nokogiri::HTML(combo_progress_bar([1,2,3,4])).search('div').count.must_equal 6
+      end
+    end
+  end
+
   describe '#progress_bar' do
-    describe 'given a percentage value' do
+    describe 'given an invalid percentage value' do
+      it 'raises an ArgumentError' do
+        proc {progress_bar(101)}.must_raise ArgumentError
+        proc {progress_bar(-1)}.must_raise ArgumentError
+        proc {progress_bar('1000')}.must_raise ArgumentError
+      end
+    end
+
+    describe 'given a valid percentage value' do
       describe 'with the color option' do
         describe 'set to an invalid color' do
           it 'sets no color classes in the divs' do
@@ -48,12 +81,12 @@ describe Css3ProgressBarsHelper do
 
       describe 'with no options' do
         it 'returns the correct number of divs' do
-          Nokogiri::HTML(progress_bar(3)).search('div').count.must_be :==, 3
+          Nokogiri::HTML(progress_bar(3)).search('div').count.must_equal 3
         end
 
         it 'sets the correct style in the progress div' do
-          Nokogiri::HTML(progress_bar(44)).search('div.progress').first.attributes["style"].value.must_be :==, "width: 44%;"
-          Nokogiri::HTML(progress_bar(88)).search('div.progress').first.attributes["style"].value.must_be :==, "width: 88%;"
+          Nokogiri::HTML(progress_bar(44)).search('div.progress').first.attributes["style"].value.must_equal "width: 44%;"
+          Nokogiri::HTML(progress_bar(88)).search('div.progress').first.attributes["style"].value.must_equal "width: 88%;"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css3-progress-bar-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10655340 !ruby/object:Gem::Requirement
+  requirement: &14890920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10655340
+  version_requirements: *14890920
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10654880 !ruby/object:Gem::Requirement
+  requirement: &14890500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10654880
+  version_requirements: *14890500
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &10654300 !ruby/object:Gem::Requirement
+  requirement: &14889900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10654300
+  version_requirements: *14889900
 description: Integrates Josh Sullivan's CSS3 Progress Bars into Rails and adds ActionView
   helpers for generation.
 email: