SassyExport 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5f61b639e7e5a3b68e219446d3a4736ec08d79
-  data.tar.gz: ce04ad399009cce61d626752c5be8bba12f1246f
+  metadata.gz: 508de77d8e8dfcc10b363bd5fefbd93e08af85bc
+  data.tar.gz: 5d5e4c8343b0613438ade8808f0ecc00d667bc9b
 SHA512:
-  metadata.gz: 92af948797a97578ce2fad65438508ef0087304434e67d1b5b320304b88989146afbf0a544f03eaf849396cdcf84fa3f8210247874c48060e2bd9474c270fdf5
-  data.tar.gz: d3b6da6afb1d073a89d7762e99a622eed73347d57d249ec3ba6496b017fb5adc2fa3f906cd1586499eb1e73ac741bee73eee9d809bd866049692e04575d801df
+  metadata.gz: 74eae49f688f5dafd07e910685eb4bffcfa3dd06649f0ca8be1554733dfbced8c04601abf431e4cc16412248082d25a62cf836e26eae50d21a8bd401ce039b5b
+  data.tar.gz: 6822ec43ab3c06c45728aa13fddeb8a5fd49038cb0ecfb709ffa05ae2d494617c421402c7216bd80807061644d7bb2afb62cd976ecbc406c1f2bc300d047c3aa

data/README.md

@@ -53,7 +53,9 @@ New JSON file is created at `./json/hello.json`. As you can see, `$path` is rela
 
 #### Breakdown
 
-The `SassyExport()` mixin takes a directory/filename.json `$path`, and a Sass `$map` as arguments. It converts the `$map` into a JSON map through Ruby, and then creates a new file (or updates an existing file), and writes the contents of the json string to it. I'm no Ruby expert, so if you belive that you could improve the small amount of code here, feel free to.
+The `SassyExport()` mixin takes a directory/filename.json `$path`, and a Sass `$map` as arguments. There is also an optional argument `$pretty` which defaults to `false`, but will print pretty JSON (nicely indented) if set to `true`. 
+
+It converts the `$map` into a JSON map through Ruby, and then creates a new file (or updates an existing file), and writes the contents of the JSON string to it. I'm no Ruby expert, so if you belive that you could improve the small amount of code here, feel free to.
 
 Enjoy.
 

data/lib/SassyExport.rb

@@ -7,8 +7,8 @@ Compass::Frameworks.register('SassyExport', :path => extension_path)
 # Version is a number. If a version contains alphas, it will be created as a prerelease version
 # Date is in the form of YYYY-MM-DD
 module SassyExport
-  VERSION = "1.1.0"
-  DATE = "2014-06-04"
+  VERSION = "1.1.1"
+  DATE = "2014-06-05"
 end
 
 # SassyExport : convert passed map to json and write to path/to/filename.json
@@ -27,22 +27,38 @@ module Sass::Script::Functions
             value
         end
 
+        # unquote strings
+        def u(s)
+            unquote(s)
+        end
+
         # recursive parse to array
         def recurs_to_a(array)
             if array.is_a?(Array) 
                 array.map do | l |
                     if l.is_a?(Sass::Script::Value::Map)
+                        # if map, recurse to hash
                         l = recurs_to_h(l)
                     elsif l.is_a?(Sass::Script::Value::List)
+                        # if list, recurse to array
                         l = recurs_to_a(l)
                     elsif l.is_a?(Sass::Script::Value::Bool)
+                        # convert to bool
                         l = l.to_bool
                     elsif l.is_a?(Sass::Script::Value::Number)
+                        # if it's a unitless number, convert to ruby val
                         if l.unitless?
-                            l = l.to_i
+                            l = l.value
+                        # else convert to string
                         else
-                            l = l.to_s
+                            l = u(l)
                         end
+                    elsif l.is_a?(Sass::Script::Value::Color)
+                        # get hex/rgba value for color
+                        l = l.inspect
+                    else
+                        # convert to string
+                        l = u(l)
                     end
                     l
                 end
@@ -56,19 +72,21 @@ module Sass::Script::Functions
             if hash.is_a?(Hash) 
                 hash.inject({}) do | h, (k, v) |
                     if v.is_a?(Sass::Script::Value::Map)
-                        h[k] = recurs_to_h(v)
+                        h[u(k)] = recurs_to_h(v)
                     elsif v.is_a?(Sass::Script::Value::List)
-                        h[k] = recurs_to_a(v)
+                        h[u(k)] = recurs_to_a(v)
                     elsif v.is_a?(Sass::Script::Value::Bool)
-                        h[k] = v.to_bool
+                        h[u(k)] = v.to_bool
                     elsif v.is_a?(Sass::Script::Value::Number)
                         if v.unitless?
-                            h[k] = v.to_i
+                            h[u(k)] = v.value
                         else
-                            h[k] = v.to_s
+                            h[u(k)] = u(v)
                         end
+                    elsif v.is_a?(Sass::Script::Value::Color)
+                        h[u(k)] = v.inspect
                     else
-                        h[k] = v.to_s
+                        h[u(k)] = u(v)
                     end
                     h
                 end
@@ -107,7 +125,7 @@ module Sass::Script::Functions
         # open file [create new file if file does not exist], write string to root/path/to/filename.json
         File.open("#{dir_path}", "w") { |f| f.write(json) }
 
-        # return a null val
+        # return succcess string
         return opts(Sass::Script::Value::String.new('JSON was successfully exported with love by SassyExport'))
     end
     declare :SassyExport, [:path, :map, :pretty]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: SassyExport
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json