sassy_hash 0.0.6 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2IyYzhhNGVmZDdjOTYxZTRkYWNjYzczNjg0N2U2YTg2OTQ5NDEyZA==
-  data.tar.gz: !binary |-
-    NWYwYzA4NzdkZjliMzdhN2JjMjNiNTljNzQyODk1NzM2ZTVkODUyMQ==
+SHA1:
+  metadata.gz: 13bb9d51c0ace3269e1bf46373158e9844dd8539
+  data.tar.gz: a437a190e0fecda328a42441cecef347a53e4ac9
 SHA512:
-  metadata.gz: !binary |-
-    NjA5ODM3NjFmODlmMzQ4OWQ2YjE2MWY1MjYwODBmN2Q5MWJmMmE2MGRiMzZm
-    Mjk4YTExNTc2YTg5NTkxZTlhZWM3MmE5ZTM1ZjE5NmJmMzQ2MDcwZDg5NGY0
-    MTllZmE5NmI0ZjdhZWNkODg2NDA4ODI5MzVkZmM1MDcyNGRkZmM=
-  data.tar.gz: !binary |-
-    M2RlODc3ZjMwMmVkYTJhNDg3OTgxN2IwZTA1MzlkZTFlNWIyNjVlNjVmODY4
-    NTliOWMyZDE4ZWI1YzUyMzhjZmEzMmUwYTMxMmFkMWJhNmEzMTlhM2E2ZWZh
-    ZTQwNWM0ZmRjZjNhZjg1YmQ4Mzg0NDBlNjA2YjQxNDhlODg3ZDg=
+  metadata.gz: 0825378dd64e2885f48b7c41ebb6be89204f2fafcc7b83b17375f8b3790a834760dea6e42c4924c26994805d22bf7093bad1f68de78070491afd2eb363e2fce3
+  data.tar.gz: 6043501fe1e13cd1b4ce5f3e23261812cbed1205cc8055702622fb4f379b08ef455dafb0db1d10cf1251f5a106e365f2160b5048f51c483347959e3b655cd89d

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+## 0.1.0
+* Full color parsing support

data/lib/sassy_hash.rb

@@ -1,10 +1,15 @@
+
 require 'sass'
 require 'sass/scss/rx'
 class SassyHashException < Exception; end
 class SassyHash < Hash
-  VERSION = "0.0.6"
-  VALID_UNIT = %r{(?<unit>#{::Sass::SCSS::RX::NMSTART}#{::Sass::SCSS::RX::NMCHAR}|%*)}
-  VALID_NUMBER = %r{((?<float>^[0-9]*\.[0-9]+)|(?<int>^[0-9]+))#{VALID_UNIT}}
+  VERSION       = "0.1.0"
+  VALID_UNIT    = %r{(?<unit>#{::Sass::SCSS::RX::NMSTART}#{::Sass::SCSS::RX::NMCHAR}|%*)}
+  FLOAT_OR_INT_MATCH  = %r{(?<float>^[0-9]*\.[0-9]+)|(?<int>^[0-9]+)}
+  FLOAT_OR_INT = %r{(^[0-9]*\.[0-9]+|^[0-9]+)}
+  VALID_NUMBER  = %r{(#{FLOAT_OR_INT_MATCH})#{VALID_UNIT}}
+  RGB_REGEX     = %r{(rgba?\((?<colors>([^)]*))\))}
+
   def self.[](hash_values)
     super(hash_values).tap do |hash|
       hash.sassify!
@@ -31,6 +36,25 @@ class SassyHash < Hash
     super(key, value)
   end
 
+  def self.parse_color(value)
+    sass_colors = Sass::Script::Value::Color::COLOR_NAMES
+    if sass_colors.has_key?(value)
+      return ::Sass::Script::Value::Color.new sass_colors[value]
+    end
+      # hex color
+    if value =~ Sass::SCSS::RX::HEXCOLOR
+      return ::Sass::Script::Value::Color.from_hex(value)
+    end
+
+    if matches = value.match(RGB_REGEX)
+      colors = matches[:colors].split(',')
+      colors.map!(&:to_f)
+      return ::Sass::Script::Value::Color.new colors
+    end
+
+    nil
+  end
+
   def self.sass_convert_value(value)
     case value
     when Integer, Fixnum
@@ -40,10 +64,8 @@ class SassyHash < Hash
     when Symbol
       return ::Sass::Script::Value::String.new(value.to_s)
     when String
-      # hex color
-      if value =~ ::Sass::SCSS::RX::HEXCOLOR
-        return ::Sass::Script::Value::Color.from_hex(value)
-      end
+      color = self.parse_color(value)
+      return color unless color.nil?
       #number
       if matches = value.match(VALID_NUMBER)
         num = if matches[:float]

data/spec/sass_hash_spec.rb

@@ -85,10 +85,35 @@ describe SassyHash do
     num.should eq(120.5)
   end
 
+
+  it "should correctly parse an rbg value" do
+    string = "rgb(255, 255, 255)"
+    color = SassyHash.sass_convert_value(string)
+    color.send(:hex_str).should eq('#ffffff')
+  end
+
+  it "should correctly parse an rbga value" do
+    string = "rgb(255, 255, 255, 1.0)"
+    color = SassyHash.sass_convert_value(string)
+    color.send(:hex_str).should eq('#ffffff')
+  end
+
+  it "should parse raw color names" do
+    {"green" => '#008000', "blue" => '#0000ff', "orange" => '#ffa500', "fuchsia" => '#ff00ff'}.each do |color, hex|
+      color = SassyHash.sass_convert_value(color)
+      color.send(:hex_str).should eq(hex)
+    end
+  end
+
   {
     "#fff"    => ::Sass::Script::Value::Color,
     "#111"    => ::Sass::Script::Value::Color,
     "#eeeeee" => ::Sass::Script::Value::Color,
+    "rgb(1.0, 1.0, 1.0)" => ::Sass::Script::Value::Color,
+    "rgba(1.0, 51, 1.0, 0.5)" => ::Sass::Script::Value::Color,
+    "green" => ::Sass::Script::Value::Color,
+    "yellow" => ::Sass::Script::Value::Color,
+    "aqua" => ::Sass::Script::Value::Color,
     'foo'     => ::Sass::Script::Value::String,
     0         => ::Sass::Script::Value::Number,
     1.0       => ::Sass::Script::Value::Number,

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sassy_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Scott Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   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: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3rc2
 description: SassyHash is a Hash extension that is directly injectable into a Sass::Script::Value::Map
@@ -59,8 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,17 +81,17 @@ require_paths:
 - lib
 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: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hash converter for Sass::Script::Value::Map