css3-progress-bar-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fd2cdd0323e7b1c9b84dbef4f33cdc1ce7f31d40
+  data.tar.gz: 8939667a889c4950745cb57cbc0a1a99e1a13f04
+SHA512:
+  metadata.gz: 7b02936d5f65c9263764f8de29b4d3dfb9df88e329016666df761d315d628ba3afc6902819ba77c226032f7fea77ce85428d3dada502f697ddd57a8381ec27b1
+  data.tar.gz: da625d9b40afbc4b0b128bbf099ac99bde8f36311b08d1f81701588fb8bb740b927ce0856e3d0ba5734eb63570e8c78a877b2b4ceaab66d3d79326cbec48e185

data/.travis.yml

@@ -1,12 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
-  - ree
+  - 2.0.0
   - jruby
-#  - rbx-19mode # rbx-19mode dies on nokogiri dependency
-  - rbx-18mode
 branches:
   only:
     - master

data/README.markdown

@@ -1,8 +1,8 @@
-# CSS3 Progress Bars for Rails
+## CSS3 Progress Bars for Rails
 
 [![Travis CI Build Status](http://travis-ci.org/yrgoldteeth/css3-progress-bar-rails.png)](http://travis-ci.org/yrgoldteeth/css3-progress-bar-rails)
 
-## Inspiration
+### Inspiration
 
 [Josh Sullivan][js] made some very pretty [progress bars][blog] in CSS3.
 
@@ -10,7 +10,7 @@
 
 Thought it might be useful.
 
-## Instruction
+### Instruction
 
 This gem assumes you're using Rails 3.1+, including the asset pipeline.
 
@@ -33,7 +33,7 @@ progress bar styling as well.  To use:
 
 [View Examples Here][examples]
 
-## Indication
+### Indication
 
 Except where indicated:  
 Copyright (c) 2012 [Nicholas Fine][vanity], released under the MIT license. 

data/app/assets/stylesheets/progress-me.css

@@ -0,0 +1,18 @@
+.progress {
+    position: relative;
+}
+
+.progress-bar {
+    z-index: 1;
+    position: absolute;
+}
+
+.progress span {
+    position: absolute;
+    top: 0;
+    z-index: 2;
+    text-align: center;
+    width: 100%;
+    color: black;
+    font-size: 12px;
+}

data/app/helpers/css3_progress_bars_helper.rb

@@ -36,8 +36,14 @@ module Css3ProgressBarsHelper
   def bootstrap_progress_bar percentage, *opts
     percentage = scrub_percentage(percentage)
     options = opts.extract_options!
+    message = ''
 
     container_classes = %w(progress)
+    content_classes = %w(progress-bar)
+
+    if options[:message] && options[:message] != ''
+      message = options[:message]
+    end
 
     if options[:striped] && options[:striped] == true
       container_classes << 'progress-striped'
@@ -47,12 +53,17 @@ module Css3ProgressBarsHelper
       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))
+    if options[:color] && %w(info success warning danger).include?(options[:color])
+      if options[:bootstrap] && options[:bootstrap] == 2
+        container_classes << "progress-#{options[:color]}"
 
+        bar_html = bar_div(%w('bar'), bar_style(percentage))
+      else
+        content_classes << "progress-bar-#{options[:color]}"
+        bar_html = bar_div(content_classes, bar_style(percentage))
+        bar_html << bar_span(message)
+      end
+    end
     content_tag :div, bar_html, :class => container_classes.join(' ')
   end
 
@@ -135,6 +146,10 @@ module Css3ProgressBarsHelper
     content_tag :div, '', :style => style, :class => classes.join(' ')
   end
 
+  def bar_span text
+    content_tag :span, text
+  end
+
   def mortice_div bar_html, classes
     content_tag :div, bar_html, :class => classes.join(' ')
   end

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

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

data/test/css3_progress_bars_helper_test.rb

@@ -11,26 +11,44 @@ describe Css3ProgressBarsHelper 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/
+          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/
+          Nokogiri::HTML(bootstrap_progress_bar(33, color: 'info')).search('div.progress-bar').first.attributes["class"].must_match /progress-bar-info/
+        end
+      end
+
+      describe 'using a valid color with option and twitter bootstrap 2' do
+        it 'sets the correct class in container div using twitter bootstrap 2' do
+          Nokogiri::HTML(bootstrap_progress_bar(33, bootstrap: 2, 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/
+        Nokogiri::HTML(bootstrap_progress_bar(33, striped: true)).search('div.progress').first.attributes["class"].must_match /progress-striped/
+      end
+    end
+
+    describe 'with the striped option using twitter bootstrap 2' do
+      it 'sets the correct class in container div using twitter bootstrap 2' do
+        Nokogiri::HTML(bootstrap_progress_bar(33, bootstrap: 2, 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/
+        Nokogiri::HTML(bootstrap_progress_bar(12, active: true)).search('div.progress').first.attributes["class"].must_match /active/
+      end
+    end
+
+    describe 'with the active option using twitter bootstrap 2' do
+      it 'sets the correct class in container div using twitter bootstrap 2' do
+        Nokogiri::HTML(bootstrap_progress_bar(12, bootstrap: 2, active: true)).search('div.progress').first.attributes["class"].must_match /active/
       end
     end
   end

metadata

@@ -1,122 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: css3-progress-bar-rails
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Nicholas Fine
 - Josh Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-31 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Integrates Josh Sullivan's CSS3 Progress Bars into Rails and adds ActionView helpers for generation.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
 - app/assets/stylesheets/css3-progress-bar.css
+- app/assets/stylesheets/progress-me.css
 - app/helpers/css3_progress_bars_helper.rb
 - css3-progress-bar-rails.gemspec
 - lib/css3-progress-bar-rails.rb
 - lib/css3-progress-bar-rails/version.rb
 - test/css3_progress_bars_helper_test.rb
-has_rdoc: true
 homepage: http://ndfine.com/2012/01/03/css3-progress-bars-for-rails.html
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  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"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: css3-progress-bar-rails
-rubygems_version: 1.4.2
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Integrates Josh Sullivan's CSS3 Progress Bars into Rails 3.1+ Projects.
-test_files: []
-
+test_files:
+- test/css3_progress_bars_helper_test.rb