css3-progress-bar-rails 0.2.2 → 0.3.0

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
   - jruby
 #  - rbx-19mode # rbx-19mode dies on nokogiri dependency
   - rbx-18mode
+branches:
+  only:
+    - master

data/app/helpers/css3_progress_bars_helper.rb

@@ -3,13 +3,14 @@
 module Css3ProgressBarsHelper
 
   # Accepts a value between 0 and 100 that represents the percentage amount displayed
-  # as filled on the progress bar's div style.
+  # as filled on the progress bar's div style.  Numbers greater than 100 will be
+  # returned as 100, likewise numbers less than 0 will be returned as 0.
   #
   # An options hash may also be passed to the method, with boolean options for
   # :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)
+    percentage = scrub_percentage(percentage)
     options = opts.extract_options!
 
     html_classes = setup_default_container_classes
@@ -17,7 +18,7 @@ module Css3ProgressBarsHelper
     if options[:rounded] && options[:rounded] == true
       handle_rounded_classes(html_classes)
     end
-    
+
     if options[:tiny] && options[:tiny] == true
       handle_tiny_classes(html_classes)
     end
@@ -36,12 +37,14 @@ module Css3ProgressBarsHelper
   # values.  As there is a limit to the number of colors, only the first five
   # elements of the array will be used.
   #
+  # An error will be raised if the values passed in are greater than 100 when summed.
+  #
   # 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
-    
+
     if options[:tiny] && options[:tiny] == true
       handle_tiny_classes(html_classes)
     end
@@ -56,15 +59,19 @@ module Css3ProgressBarsHelper
   end
 
   protected
-
-  # Yeah, if you pass a string that non-numeric, it'll validate because 'string'.to_i returns 0.
-  # I can live with it.
-  def validate_percentage percentage
-    (0..100).to_a.include?(percentage.to_i) ? true : (raise ArgumentError, "Invalid Percentage Value")
+  # Raising errors was kind of stupid for single progress bars, so instead 
+  # return the percentage amount if it's betwee 0 and 100.  If it's > 100,
+  # return 100.  If it's < 0, return 0.
+  def scrub_percentage percentage
+    p = percentage.to_i
+    return p if (0..100).to_a.include?(p)
+    p > 100 ? 100 : 0
   end
 
   def validate_percentages percentages
-    percentages.each{|p|validate_percentage(p)}
+    if percentages.map(&:to_i).inject(:+) > 100 
+      raise Css3ProgressBars::ComboBarError, "Values passed to combo bar exceed 100%"
+    end
   end
 
   def setup_default_container_classes
@@ -109,3 +116,6 @@ module Css3ProgressBarsHelper
     content_tag :div, bar_html, :class => classes.join(' ')
   end
 end
+module Css3ProgressBars
+  class ComboBarError < ArgumentError; end
+end

data/css3-progress-bar-rails.gemspec

@@ -5,9 +5,9 @@ require "css3-progress-bar-rails/version"
 Gem::Specification.new do |s|
   s.name        = "css3-progress-bar-rails"
   s.version     = Css3::Progress::Bar::Rails::VERSION
-  s.authors     = ["Nicholas Fine"]
-  s.email       = ["nicholas.fine@gmail.com"]
-  s.homepage    = ""
+  s.authors     = ["Nicholas Fine", "Josh Sullivan"]
+  s.email       = ["nicholas.fine@gmail.com", "josh@dipperstove.com"]
+  s.homepage    = "http://ndfine.com/2012/01/03/css3-progress-bars-for-rails.html"
   s.summary     = %q{Integrates Josh Sullivan's CSS3 Progress Bars into Rails 3.1+ Projects.}
   s.description = %q{Integrates Josh Sullivan's CSS3 Progress Bars into Rails and adds ActionView helpers for generation.}
 
@@ -18,8 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
   s.add_runtime_dependency "rails"
   s.add_development_dependency "minitest"
   s.add_development_dependency "nokogiri"

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

@@ -4,3 +4,5 @@ module Css3ProgressBars
   class Engine < Rails::Engine
   end
 end
+
+

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

@@ -2,7 +2,7 @@ module Css3
   module Progress
     module Bar
       module Rails
-        VERSION = "0.2.2"
+        VERSION = "0.3.0"
       end
     end
   end

data/test/css3_progress_bars_helper_test.rb

@@ -10,8 +10,8 @@ describe Css3ProgressBarsHelper do
   describe '#combo_progress_bar' do
     describe 'given a collection that contains an invalid percentage value' do
       it 'raises an ArgumentError' do
-        proc {combo_progress_bar([1,2,888])}.must_raise ArgumentError
-        proc {combo_progress_bar([1,2,'99999',4,5])}.must_raise ArgumentError
+        proc {combo_progress_bar([1,2,888])}.must_raise Css3ProgressBars::ComboBarError
+        proc {combo_progress_bar([1,2,'99999',4,5])}.must_raise Css3ProgressBars::ComboBarError
       end
     end
     describe 'given a collection of valid percentage values' do
@@ -37,13 +37,19 @@ describe Css3ProgressBarsHelper do
 
   describe '#progress_bar' 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
+      describe 'greater than 100' do
+        it 'sets the progress div width to 100' do
+          Nokogiri::HTML(progress_bar(101)).search('div.progress').first.attributes["style"].value.must_equal "width: 100%;"
+          Nokogiri::HTML(progress_bar(10100)).search('div.progress').first.attributes["style"].value.must_equal "width: 100%;"
+        end
       end
-    end
 
+      describe 'less than 0' do
+        it 'sets the progress div width to 0' do
+          Nokogiri::HTML(progress_bar(-203)).search('div.progress').first.attributes["style"].value.must_equal "width: 0%;"
+        end
+      end
+    end
     describe 'given a valid percentage value' do
       describe 'with the color option' do
         describe 'set to an invalid color' do

metadata

@@ -1,16 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: css3-progress-bar-rails
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
-  version: 0.2.2
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nicholas Fine
+- Josh Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 -06:00
+date: 2012-01-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +27,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -32,6 +41,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,12 +55,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
 description: Integrates Josh Sullivan's CSS3 Progress Bars into Rails and adds ActionView helpers for generation.
 email: 
 - nicholas.fine@gmail.com
+- josh@dipperstove.com
 executables: []
 
 extensions: []
@@ -68,7 +84,7 @@ files:
 - lib/css3-progress-bar-rails/version.rb
 - test/css3_progress_bars_helper_test.rb
 has_rdoc: true
-homepage: ""
+homepage: http://ndfine.com/2012/01/03/css3-progress-bars-for-rails.html
 licenses: []
 
 post_install_message: 
@@ -81,17 +97,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: css3-progress-bar-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Integrates Josh Sullivan's CSS3 Progress Bars into Rails 3.1+ Projects.