anjlab-bootstrap-rails 1.4.0.12 → 1.4.0.13

data/Rakefile

@@ -38,4 +38,12 @@ task "update-twitter" do
       f.write "//= require #{js}\n"
     end
   end
-end
+end
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end

data/bootstrap-rails.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "railties", "~> 3.0"
   gem.add_dependency "thor",     "~> 0.14"
+  gem.add_dependency "sass"
   gem.add_development_dependency "bundler", ">= 1.0.0"
   gem.add_development_dependency "rails",   "~> 3.0"
 end

data/lib/bootstrap-rails.rb

@@ -1,3 +1,4 @@
+require "rails"
 require "bootstrap-rails/version"
 
 module Bootstrap

data/lib/bootstrap-rails/ie_hex_str.rb

@@ -8,13 +8,8 @@ module Sass::Script::Functions
     assert_type color, :Color
     alpha = (color.alpha * 255).round
     alpha = alpha.to_s(16).rjust(2, '0')
-    color_string = color.to_s.tr('#','')
-    color_values = color_string.split('')
-    
-    r, g, b = *color_values
-    if color_values.size == 3
-      color_string = "#{r}#{r}#{g}#{g}#{b}#{b}"
-    end
+    color_string = color.rgb.map {|num| num.to_s(16).rjust(2, '0')} .join
+
     Sass::Script::String.new("##{alpha}#{color_string}")
   end
   declare :ie_hex_str, :args => [:color]

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "1.4.0.12"
+    VERSION = "1.4.0.13"
   end
 end

data/test/ie_hex_str_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+require 'sass/script'
+
+class IeHexStrText < Test::Unit::TestCase
+  def test_named_color
+    assert_equal("#ffffffff", evaluate("ie_hex_str(#ffffff)"))
+  end
+
+  def test_rgba_color
+    assert_equal("#1affffff", evaluate("ie_hex_str(rgba(255, 255, 255, 0.1))"))
+  end
+
+  def test_rgb_color
+    assert_equal("#ffffffff", evaluate("ie_hex_str(rgb(255, 255, 255))"))
+  end
+
+  def test_hsl_color
+    assert_equal("#ffffffff", evaluate("ie_hex_str(hsl(100%, 100%, 100%))"))
+  end
+
+  private
+
+  def evaluate(value)
+    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require "bootstrap-rails"
+require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0.12
+  version: 1.4.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2011-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70106579303860 !ruby/object:Gem::Requirement
+  requirement: &70291325873160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70106579303860
+  version_requirements: *70291325873160
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70106579302700 !ruby/object:Gem::Requirement
+  requirement: &70291325872240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70106579302700
+  version_requirements: *70291325872240
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70291325871500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70291325871500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70106579302240 !ruby/object:Gem::Requirement
+  requirement: &70291325870820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70106579302240
+  version_requirements: *70291325870820
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70106579301660 !ruby/object:Gem::Requirement
+  requirement: &70291325870220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70106579301660
+  version_requirements: *70291325870220
 description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
   projects
 email:
@@ -73,6 +84,8 @@ files:
 - lib/bootstrap-rails/ie_hex_str.rb
 - lib/bootstrap-rails/railtie.rb
 - lib/bootstrap-rails/version.rb
+- test/ie_hex_str_test.rb
+- test/test_helper.rb
 - vendor/assets/javascripts/bootstrap-alerts.js
 - vendor/assets/javascripts/bootstrap-buttons.js
 - vendor/assets/javascripts/bootstrap-dropdown.js
@@ -115,4 +128,6 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects
-test_files: []
+test_files:
+- test/ie_hex_str_test.rb
+- test/test_helper.rb