sass-json-vars 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64106623ea0e4f551ffd3fe0e2abb0452ae3f03a
-  data.tar.gz: d94659199cde5cdf68cd31a3ff22a61d7bb882a5
+  metadata.gz: bee8311004adacb3fe1c3aaf810f585f74e0cd8b
+  data.tar.gz: 7fb0ca0f8a34da3ac0d8dd234f71f840fb9db7ec
 SHA512:
-  metadata.gz: 89e4ba7d494b4255e2ce4281c694cbb2a48eda9a91ea6cd4683a5af802821847d182750554e9d87b77ba93f641cb33ed9ae2d0700476329d6e2535e760a709ec
-  data.tar.gz: 04ac9cd7836a11c36d670a14b3097f730badb865c6a169b04c5e112a7d904ed7aa9519a74fbb6e19d17cad9ee288c4b54fdcd6220ff5c31887f05ed91f8b8258
+  metadata.gz: 1207db98b67ade60e3fb44990096d83f1529e1bc8262fb3098dbf357ef80d25a623b3acb4fef9020ce2d61d3a37483fb588bbd5f761ecb3e81d1bf3ca41f93c4
+  data.tar.gz: d6f3ca6e07666a05f9fcceeda7abacd706cea46085dc40e3583808338c71e04ee2047b8aad0d04b8d1e36129fc66546bb253e27980681ba6722a5e9f4d97a551

data/lib/sass-json-vars/importer.rb

@@ -27,18 +27,23 @@ class SassJSONVars::Importer < Sass::Importers::Base
     other.class == self.class
   end
 
-  def self.flat_hash(h, f=[], g={})
-    return g.update({ f.join('-') => h }) unless h.is_a? Hash
-    h.each { |k,r| flat_hash(r,f+[k],g) }
-    g
+  def self.convert_to_sass(item)
+    if item.is_a? Array
+      '(' + item.map { |i| self.convert_to_sass(i) }.join(',') + ')'
+    elsif item.is_a? Hash
+      '(' + item.map {|key, value| key.to_s + ':' + self.convert_to_sass(value) }.join(',') + ')'
+    else
+      item
+    end
   end
 
-  # Returns a Sass::Engine for this sprite object
   def self.sass_engine(uri, importer, options)
-    flattened = self.flat_hash JSON.parse(IO.read(uri))
+    json = JSON.parse(IO.read(uri))
+
+    variables = json.map do |name, value|
+      output = self.convert_to_sass(value);
 
-    variables = flattened.map do |name, value|
-      "$#{name}: #{value}"
+      "$#{name}: #{output}"
     end
 
     Sass::Engine.new(variables.join("\n"))

data/lib/sass-json-vars/version.rb

@@ -1,3 +1,3 @@
 module SassJSONVars
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/readme.md

@@ -1,15 +1,21 @@
 # Sass JSON Vars
 
-A work in progress.
+`@import` json data into Sass `$variables`.
 
-### Eventual Usage
+### Usage
+
+```shell
+gem install sass-json-vars
+```
 
 Place variables in a JSON file:
 
 ```javascript
+// variables.json
 {
-    color: {
-        red: "#c33"
+    "font-sans": "Helvetica, sans-serif",
+    "colors": {
+        "red": "#c33"
     }
 }
 ```
@@ -20,6 +26,13 @@ Import the file in Sass to expose variable names:
 @import "variables.json"
 
 body {
-    color: $color-red;
+    color: map-get($colors, red);
+    font: $font-sans;
 }
 ```
+
+Require sass-json-vars when compiling
+
+```shell
+sass style.scss -r sass-json-vars
+```

data/test/fixtures/lists/style.scss

@@ -0,0 +1,5 @@
+@import 'test/fixtures/lists/variables.json';
+
+body {
+	color: nth($colors, 1);
+}

data/test/fixtures/lists/variables.json

@@ -0,0 +1,3 @@
+{
+    "colors" : ["#c33", "#33c"]
+}

data/test/fixtures/maps/style.scss

@@ -0,0 +1,5 @@
+@import 'test/fixtures/maps/variables.json';
+
+body {
+	color: map-get($colors, red); 
+}

data/test/fixtures/maps/variables.json

@@ -0,0 +1,5 @@
+{
+    "colors" : {
+        "red": "#c33"
+    }
+}

data/test/fixtures/strings/style.scss

@@ -0,0 +1,5 @@
+@import 'test/fixtures/strings/variables.json';
+
+body {
+	color: $color-red;
+}

data/test/fixtures/strings/variables.json

@@ -0,0 +1,4 @@
+{
+    "color-red"  : "#c33",
+    "color-blue" : "#33c"
+}

data/test/sass-json-vars_test.rb

@@ -3,17 +3,43 @@ require 'sass'
 require 'sass-json-vars'
 
 class SassJSONVarsTest < Test::Unit::TestCase
+  def test_can_convert_arrays_to_lists
+    flattened = SassJSONVars::Importer.convert_to_sass(['#c33', '#33c'])
+    assert_equal '(#c33,#33c)', flattened
+  end
+
+  def test_can_convert_nested_arrays_to_lists
+    flattened = SassJSONVars::Importer.convert_to_sass([['#c33', 'red'], '#33c'])
+    assert_equal '((#c33,red),#33c)', flattened
+  end
+
+  def test_can_convert_hashes_to_maps
+    flattened = SassJSONVars::Importer.convert_to_sass({ red: '#c33' })
+    assert_equal '(red:#c33)', flattened
+  end
+
+  def test_can_convert_nested_hashes_to_maps
+    flattened = SassJSONVars::Importer.convert_to_sass({ colors: { red: '#c33' } })
+    assert_equal '(colors:(red:#c33))', flattened
+  end
+
+  def test_can_convert_complicated_objects
+    flattened = SassJSONVars::Importer.convert_to_sass({ colors: ['red', 'blue', 'green'] })
+    assert_equal '(colors:(red,blue,green))', flattened
+  end
 
-  def test_can_flatten_hashes
-    flattened = SassJSONVars::Importer.flat_hash({
-      :color => { :red => "#c33" }
-    })
-    assert_match '#c33', flattened['color-red']
+  def test_strings
+    scss = Sass.compile_file("test/fixtures/strings/style.scss")
+    assert_equal "body {\n  color: #cc3333; }\n", scss
   end
 
-  def test_importability
-    scss = Sass.compile_file("test/fixtures/full_path.scss")
+  def test_lists
+    scss = Sass.compile_file("test/fixtures/lists/style.scss")
     assert_equal "body {\n  color: #cc3333; }\n", scss
   end
 
+  def test_maps
+    scss = Sass.compile_file("test/fixtures/maps/style.scss")
+    assert_equal "body {\n  color: #cc3333; }\n", scss
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-json-vars
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Nate Hunzaker
@@ -36,8 +36,12 @@ files:
 - lib/sass-json-vars/importer.rb
 - lib/sass-json-vars/version.rb
 - readme.md
-- test/fixtures/full_path.scss
-- test/fixtures/variables.json
+- test/fixtures/lists/style.scss
+- test/fixtures/lists/variables.json
+- test/fixtures/maps/style.scss
+- test/fixtures/maps/variables.json
+- test/fixtures/strings/style.scss
+- test/fixtures/strings/variables.json
 - test/sass-json-vars_test.rb
 homepage: https://github.com/vigetlabs/sass-json-vars
 licenses:
@@ -64,6 +68,10 @@ signing_key:
 specification_version: 4
 summary: Allows the use of JSON to declare variables with @import 'file.json'.
 test_files:
-- test/fixtures/full_path.scss
-- test/fixtures/variables.json
+- test/fixtures/lists/style.scss
+- test/fixtures/lists/variables.json
+- test/fixtures/maps/style.scss
+- test/fixtures/maps/variables.json
+- test/fixtures/strings/style.scss
+- test/fixtures/strings/variables.json
 - test/sass-json-vars_test.rb

data/test/fixtures/full_path.scss

@@ -1,5 +0,0 @@
-@import 'test/fixtures/variables.json';
-
-body {
-	color: $color-red;
-}

data/test/fixtures/variables.json

@@ -1,6 +0,0 @@
-{
-    "color" : {
-        "red"  : "#c33",
-        "blue" : "#33c"
-    }
-}