css-colour 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f6f5160b9147fdb467f57053b4409e5bcad6be0
-  data.tar.gz: 3242f8a8af232b6ee693589c84ea542fdbd6cd2a
+  metadata.gz: 3a5dc8b9e9cc2900149305009d4a8a34efbbef24
+  data.tar.gz: a47fd47d0bfb7030713402d6f5161647882e1fbb
 SHA512:
-  metadata.gz: 6e5087cf210526af17d4d4cd5428bbefcc54e59a742d86d521ebcbee26e76b3c14d672664fc958da2f565c618e09d6fd81457db023255bdccb3b2820c8d124ea
-  data.tar.gz: ffc1268bd37bfe4e38da07f8154b0556ee6835a931c7490fe4a4534550119fef026c5b23d0c5d8632eae4c59611446ad4e93b8daf66b550ea9b2ace0a6f5dea4
+  metadata.gz: 1d18a460fa97ae37c07eeb4a07a15cf4c1584c14c23d2290e4eb67a7e299130df8566d3b2148861da509f9fdc4cf0afd494ecb4edfe8179cf5b87ae981bd4c2b
+  data.tar.gz: d9ceea29591f0c954fd75cdf1191c9ef649c23c69dd0caddfae1c3a49241cde5a6de2d61122ac2753383e7f4e5d0d464c455cd08884a202d84737a730ccfac86

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.1.1
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-2.1.1

data/css-colour.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", '~> 0'
-  spec.add_development_dependency "minitest", '~> 0'
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end

data/lib/css-colour.rb

@@ -9,8 +9,7 @@ module CssColour
 
     def initialize(value); self.colour = value; end
 
-    def colour=(value); @colour = clean(value); end
-    def clean(value); value.downcase.gsub(SPACE, NO_SPACE); end
+    def colour=(value); @colour = value.downcase.strip; end
 
     def valid?; inherit? or websafe? or hex? or rgb? or rgba? or hsl? or hsla?; end
 

data/lib/css-colour/constants.rb

@@ -1,9 +1,5 @@
 module CssColour
   module Constants
-    SPACE = /\s/
-
-    NO_SPACE = ''.freeze
-
     INHERIT = 'inherit'.freeze
 
     WEBSAFE = %w(aliceblue antiquewhite aqua aquamarine azure beige bisque black blanchedalmond blue
@@ -53,12 +49,12 @@ module CssColour
       [01]    # 0 or 1
     }x
 
-    HSL = /^hsl\((#{RANGE_0_360}),(#{RANGE_0_100}%),(#{RANGE_0_100}%)\)$/
+    HSL = /^hsl\(\s*(#{RANGE_0_360})\s*,\s*(#{RANGE_0_100}%)\s*,\s*(#{RANGE_0_100}%)\s*\)$/
 
-    HSLA = /^hsla\((#{RANGE_0_360}),(#{RANGE_0_100}%),(#{RANGE_0_100}%),(#{RANGE_ALPHA})\)$/
+    HSLA = /^hsla\(\s*(#{RANGE_0_360})\s*,\s*(#{RANGE_0_100}%),\s*(#{RANGE_0_100}%)\s*,\s*(#{RANGE_ALPHA})\s*\)$/
 
-    RGB = /^rgb\((#{RANGE_0_255}),(#{RANGE_0_255}),(#{RANGE_0_255})\)$/
+    RGB = /^rgb\(\s*(#{RANGE_0_255})\s*,\s*(#{RANGE_0_255})\s*,\s*(#{RANGE_0_255})\s*\)$/
 
-    RGBA = /^rgba\((#{RANGE_0_255}),(#{RANGE_0_255}),(#{RANGE_0_255}),(#{RANGE_ALPHA})\)$/
+    RGBA = /^rgba\(\s*(#{RANGE_0_255})\s*,\s*(#{RANGE_0_255})\s*,\s*(#{RANGE_0_255})\s*,\s*(#{RANGE_ALPHA})\s*\)$/
   end
 end

data/lib/css-colour/version.rb

@@ -1,3 +1,3 @@
 module CssColour
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/validator_test.rb

@@ -15,8 +15,11 @@ describe 'validator test' do
 
   it 'should validate HEX colours' do
     assert CssColour::Validator.new('#123456').valid?
+    assert CssColour::Validator.new(' #123456').valid?
+    assert CssColour::Validator.new('#123456 ').valid?
     assert CssColour::Validator.new('#123').valid?
     assert CssColour::Validator.new('#FF1234').valid?
+    refute CssColour::Validator.new('#1 23456').valid?
     refute CssColour::Validator.new('123456').valid?
     refute CssColour::Validator.new('123').valid?
     refute CssColour::Validator.new('#GG0000').valid?
@@ -25,6 +28,7 @@ describe 'validator test' do
 
   it 'should validate HSL colours' do
     assert CssColour::Validator.new('hsl(0,0%,0%)').valid?
+    assert CssColour::Validator.new('hsl(0, 0%, 0%)').valid?
     assert CssColour::Validator.new('hsl(360,100%,100%)').valid?
     refute CssColour::Validator.new('hsl 0,0%,0%)').valid?
     refute CssColour::Validator.new('hsl(0,0%,0%').valid?
@@ -36,6 +40,7 @@ describe 'validator test' do
 
   it 'should validate HSLA colours' do
     assert CssColour::Validator.new('hsla(0,0%,0%,0)').valid?
+    assert CssColour::Validator.new('hsla(0, 0%, 0%, 0)').valid?
     assert CssColour::Validator.new('hsla(0,0%,0%,0.0)').valid?
     assert CssColour::Validator.new('hsla(360,100%,100%,1)').valid?
     assert CssColour::Validator.new('hsla(360,100%,100%,1.0)').valid?
@@ -50,6 +55,7 @@ describe 'validator test' do
 
   it 'should validate RGB colours' do
     assert CssColour::Validator.new('rgb(0,0,0)').valid?
+    assert CssColour::Validator.new('rgb(0, 0, 0)').valid?
     assert CssColour::Validator.new('rgb(255,255,255)').valid?
     refute CssColour::Validator.new('rgb 0,0,0)').valid?
     refute CssColour::Validator.new('rgb(0,0,0 ').valid?
@@ -63,6 +69,7 @@ describe 'validator test' do
 
   it 'should validate RGBA colours' do
     assert CssColour::Validator.new('rgba(0,0,0,0)').valid?
+    assert CssColour::Validator.new('rgba(0, 0, 0, 0)').valid?
     assert CssColour::Validator.new('rgba(0,0,0,0.0)').valid?
     assert CssColour::Validator.new('rgba(255,255,255,1)').valid?
     assert CssColour::Validator.new('rgba(255,255,255,1.0)').valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css-colour
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Darío Javier Cravero
@@ -28,28 +28,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: "\n    Ruby CSS Colour validator.\n\n    It will tell if a colour is
@@ -62,6 +62,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md