sassy_hash 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDk3ODY3MjU0ZjMwOWVkZTQ4NDlhMGNkNzRmM2FhM2JkNzE2ZjdiNw==
+    M2IyYzhhNGVmZDdjOTYxZTRkYWNjYzczNjg0N2U2YTg2OTQ5NDEyZA==
   data.tar.gz: !binary |-
-    OTE1MDYyNmI4NGY3NmUyOWJjY2YwZGIzODJkYTY1NjhhYzJjYjk5OA==
+    NWYwYzA4NzdkZjliMzdhN2JjMjNiNTljNzQyODk1NzM2ZTVkODUyMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDY3YWI5ZTRhYzUyNjdkNDg5OThkZmNmODg0MGNhZmRhZDJiMTdkZmJhNjM5
-    MjRmMDFhZDhjOWMyMzI3NDJlZTgwZGY0OGI3NDY2MzZjZjI4ZDdmNWRlYzBi
-    ODBkNTQ0ZDFhZWEwZmQ3MGZmNjkzYWQ1NDBmODVmMzYxZTUyM2Q=
+    NjA5ODM3NjFmODlmMzQ4OWQ2YjE2MWY1MjYwODBmN2Q5MWJmMmE2MGRiMzZm
+    Mjk4YTExNTc2YTg5NTkxZTlhZWM3MmE5ZTM1ZjE5NmJmMzQ2MDcwZDg5NGY0
+    MTllZmE5NmI0ZjdhZWNkODg2NDA4ODI5MzVkZmM1MDcyNGRkZmM=
   data.tar.gz: !binary |-
-    MzUyYzU0ZWU3ZDNjOTlmN2YwY2MyN2MyMjllYTZlMmFlMzIyYWJjZjE4YTAy
-    OTgzYTZhNzQ2MjEwMDgwZDc3ZDQyYzgxNTAxZmIzMDRiMTBlZGE0ZTA2MGI1
-    MzY1MTllMGIxYzk0OTMwNmVkNGJlMTdjYjhjNzcyYjM1N2Y5YjM=
+    M2RlODc3ZjMwMmVkYTJhNDg3OTgxN2IwZTA1MzlkZTFlNWIyNjVlNjVmODY4
+    NTliOWMyZDE4ZWI1YzUyMzhjZmEzMmUwYTMxMmFkMWJhNmEzMTlhM2E2ZWZh
+    ZTQwNWM0ZmRjZjNhZjg1YmQ4Mzg0NDBlNjA2YjQxNDhlODg3ZDg=

data/lib/sassy_hash.rb

@@ -2,10 +2,9 @@ require 'sass'
 require 'sass/scss/rx'
 class SassyHashException < Exception; end
 class SassyHash < Hash
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   VALID_UNIT = %r{(?<unit>#{::Sass::SCSS::RX::NMSTART}#{::Sass::SCSS::RX::NMCHAR}|%*)}
-  VALID_NUMBER = %r{(?<number>#{::Sass::SCSS::RX::NUM})#{VALID_UNIT}}
-
+  VALID_NUMBER = %r{((?<float>^[0-9]*\.[0-9]+)|(?<int>^[0-9]+))#{VALID_UNIT}}
   def self.[](hash_values)
     super(hash_values).tap do |hash|
       hash.sassify!
@@ -34,18 +33,25 @@ class SassyHash < Hash
 
   def self.sass_convert_value(value)
     case value
-    when Integer, Float
-      return ::Sass::Script::Value::Number.new(value)
+    when Integer, Fixnum
+      return ::Sass::Script::Value::Number.new(value.to_i)
+    when Float
+      return ::Sass::Script::Value::Number.new(value.to_f)
     when Symbol
       return ::Sass::Script::Value::String.new(value.to_s)
     when String
-      # color
+      # hex color
       if value =~ ::Sass::SCSS::RX::HEXCOLOR
         return ::Sass::Script::Value::Color.from_hex(value)
       end
       #number
       if matches = value.match(VALID_NUMBER)
-        return ::Sass::Script::Value::Number.new(matches[:number], matches[:unit])
+        num = if matches[:float]
+          matches[:float].to_f
+        elsif matches[:int]
+          matches[:int].to_i
+        end
+        return ::Sass::Script::Value::Number.new(num, matches[:unit])
       end
       #string
       return ::Sass::Script::Value::String.new(value)

data/spec/sass_hash_spec.rb

@@ -54,15 +54,47 @@ describe SassyHash do
     sassy_hash[sass_value(:foo)].value[2].value[2].class.should eq(::Sass::Script::Value::Map)
   end
 
+  it "should create a hash valid for a map" do
+    key = 'primaryColor'
+    hash = {'height' => '120px', key => '#111', 'foo' => 'bar'}
+    sassy_hash = SassyHash[hash]
+    sassy_hash[sass_value(key)].class.should eq(::Sass::Script::Value::Color)
+    sassy_hash[sass_value('height')].class.should eq(::Sass::Script::Value::Number)
+    sassy_hash[sass_value('foo')].class.should eq(::Sass::Script::Value::String)
+  end
+  
+  it "should create nested maps with string keys" do
+    hash = {'foo' => {'bar' => {'baz' => 'hi'}}}
+    sassy_hash = SassyHash[hash]
+    sassy_hash[sass_value('foo')].value[sass_value('bar')].value[sass_value('baz')].value.should eq('hi')
+  end
+
+  it "should create a valid integer number" do
+    hash = {:foo => "120px"}
+    sassy_hash = SassyHash[hash]
+    num = sassy_hash[sass_value(:foo)].value
+    num.class.should eq(Fixnum)
+    num.should eq(120)
+  end
+
+  it "should create a valid float number" do
+    hash = {:foo => '120.5px'}
+    sassy_hash = SassyHash[hash]
+    num = sassy_hash[sass_value(:foo)].value
+    num.class.should eq(Float)
+    num.should eq(120.5)
+  end
+
   {
     "#fff"    => ::Sass::Script::Value::Color,
+    "#111"    => ::Sass::Script::Value::Color,
     "#eeeeee" => ::Sass::Script::Value::Color,
     'foo'     => ::Sass::Script::Value::String,
     0         => ::Sass::Script::Value::Number,
     1.0       => ::Sass::Script::Value::Number,
     "1.0px"   => ::Sass::Script::Value::Number,
     '1px'     => ::Sass::Script::Value::Number,
-    '120px'     => ::Sass::Script::Value::Number,
+    '120px'   => ::Sass::Script::Value::Number,
     :foo      => ::Sass::Script::Value::String,
     true      => ::Sass::Script::Value::Bool,
     false     => ::Sass::Script::Value::Bool

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sassy_hash
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Scott Davis