bootstrap_progressbar 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268dd4c0b64651b82e1d4ab971b3da0989eb09b1
-  data.tar.gz: b645d9464c28e131d6e119257a6c57ab9ad5d85a
+  metadata.gz: 6fe1c695b26c317eb510ec2b50113f60853db122
+  data.tar.gz: c52267d35411beb0f21dad10590a20d4bc1af93d
 SHA512:
-  metadata.gz: 66a1e3985eeddf27feb2c1849cdb847c8478058d938d8c298ac1a293892006b79ea4c5076cc5c9df886824780e16ddc5da4342f83bd7a94f655524a615ebf065
-  data.tar.gz: de4c17fef798764ff99774415f4a5d5283f4c0658594a3ae2947a82bb7207e5cbea85de8f46fb92b185a71d388b4f540ce0ebbb641e0219534139120c59d8562
+  metadata.gz: 54c14d2f93eee9da201af33c5a983f549c4336473b64f2757b29b158d358104fe12823679b8684eb273f2ff1963849bbad21026569cfe8cd673f1314ae6c83c9
+  data.tar.gz: 411745110eeb7d66f090f3ad774ac957c6b91b02eaa0f84ecfbf9425b0f6e8c9683f85f31ab519425f1352bebd54c20a15a5783aca4d6775f75202b66a1a3c0e

data/lib/bootstrap_progressbar/helper.rb

@@ -8,7 +8,6 @@ module BootstrapProgressbar
         end
       end
 
-      # generate a bootstrap progress-bar with a percent and custom options
       # Params:
       # +percent+:: +Fixnum+ between 0 to 1.00
       # +options+::
@@ -42,15 +41,17 @@ module BootstrapProgressbar
           striped = ""
         end
 
-        clazz = options[:class] if options[:class]
-
+        clazz = [options[:class], 'progress-bar', alternative, striped].join(' ').strip()
         unless options[:label]
           percent_and_label = "<span class='sr-only'>#{percent}%</span>"
         else
           percent_and_label = "#{percent}%"
         end
 
-        "<div class='#{[clazz, 'progress-bar', alternative, striped].join(' ').strip()}' role='progressbar' aria-valuenow='#{percent}' aria-valuemin='0' aria-valuemax='100' style='width: #{percent}%'>#{percent_and_label}</div>"
+        style = ["width: #{percent}%", options[:style]].join().strip()
+        id = " id='#{options[:id]}'" if options[:id]
+
+        "<div class='#{clazz}'#{id} role='progressbar' aria-valuenow='#{percent}' aria-valuemin='0' aria-valuemax='100' style='#{style}'>#{percent_and_label}</div>"
       end
 
     end
@@ -61,13 +62,13 @@ module BootstrapProgressbar
     def progress_bar(percent, options = {})
       Private.check_percent(percent)
 
-      if options[:class]
-        clazz = options[:class] 
-        options[:class] = ""
-      end
+      clazz = [options.delete(:class), 'progress'].join(' ').strip()
+      id = " id='#{options.delete(:id)}' " if options[:id]
+      style = " style='#{options.delete(:style)}' " if options[:style]
+
       progress_bar = Private.only_progress_bar(percent, options)
 
-      raw "<div class='#{[clazz, 'progress'].join(' ').strip()}'>#{progress_bar}</div>"
+      raw "<div class='#{clazz}'#{id}#{style}>#{progress_bar}</div>"
     end
 
     # only generate the progress-bar

data/lib/bootstrap_progressbar/version.rb

@@ -1,3 +1,3 @@
 module BootstrapProgressbar
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/bootstrap_progressbar_test.rb

@@ -70,4 +70,19 @@ class BootstrapProgressbarTest < ActionView::TestCase
     assert_equal "<div class='more progress-bar' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width: 50%'><span class='sr-only'>50%</span></div>", result
   end
 
+  test "support selecting an id for progress-bar" do
+    result = simple_progress_bar(0.5, id: 'this-progress-bar')
+    assert_equal "<div class='progress-bar' id='this-progress-bar' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width: 50%'><span class='sr-only'>50%</span></div>", result
+  end
+
+  test "support selecting an id for progress" do
+    result = progress_bar(0.5, id: 'this-progress')
+    assert_equal "<div class='progress' id='this-progress' ><div class='progress-bar' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width: 50%'><span class='sr-only'>50%</span></div></div>", result
+  end
+
+  test "support defining style for progress" do
+    result = progress_bar(0.5, style: 'min-width: 20px;')
+    assert_equal "<div class='progress' style='min-width: 20px;' ><div class='progress-bar' role='progressbar' aria-valuenow='50' aria-valuemin='0' aria-valuemax='100' style='width: 50%'><span class='sr-only'>50%</span></div></div>", result
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_progressbar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - spacewander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
 description: bootstrap_progressbar makes it super easy to create beautiful-looking
   progress bar in rails using Bootstrap 3
 email: