sass-json-vars 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bee8311004adacb3fe1c3aaf810f585f74e0cd8b
-  data.tar.gz: 7fb0ca0f8a34da3ac0d8dd234f71f840fb9db7ec
+  metadata.gz: d4ce9ac9d7f27e142c4220cb100d7e2b14c6ea8a
+  data.tar.gz: 2dfca0a31019e3e0850c6e6907d33aef2e73febe
 SHA512:
-  metadata.gz: 1207db98b67ade60e3fb44990096d83f1529e1bc8262fb3098dbf357ef80d25a623b3acb4fef9020ce2d61d3a37483fb588bbd5f761ecb3e81d1bf3ca41f93c4
-  data.tar.gz: d6f3ca6e07666a05f9fcceeda7abacd706cea46085dc40e3583808338c71e04ee2047b8aad0d04b8d1e36129fc66546bb253e27980681ba6722a5e9f4d97a551
+  metadata.gz: 9bf0243a85026b1f841e25a2bcae4fd029e6989c300076e889a31a00b55be05ccab63cbcaed3f9e2b680546d98bcd036fa8f1d49f79be503bd80a4025399dd2d
+  data.tar.gz: 7499e303158c6f7f9497cccaf25359121a9e011f3bf26ebdb47f6090d50e341c8180bd983d2d1d53fd875553b3703b907b7bfec35cfee70213e67faa69629d7a

data/lib/sass-json-vars.rb

@@ -1,5 +1,4 @@
 module SassJSONVars; end
 
 require 'sass-json-vars/importer';
-
-Sass.load_paths << SassJSONVars::Importer.new()
+require 'sass-json-vars/monkeypatch';

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

@@ -1,51 +1,64 @@
 require 'sass'
 require 'json'
 
-class SassJSONVars::Importer < Sass::Importers::Base
+class SassJSONVars::Importer < Sass::Importers::Filesystem
 
-  def find(uri, options)
-    if File.extname(uri) == '.json'
-      self.class.sass_engine(uri, self, options)
-    else
-      nil
-    end
+  def watched_file?(uri)
+    filename =~ /\.json$/ && filename.start_with?(root + File::SEPARATOR)
   end
 
-  def find_relative(uri, base, options)
-    nil
+  def extensions
+    {'json' => :scss}
   end
 
-  def to_s
-    self.class.name
+  def find(name, options)
+    File.extname(name) == '.json' ? super(name, options) : nil
   end
 
-  def hash
-    self.class.name.hash
+  def find_relative(name, base, options)
+    File.extname(name) == '.json' ? super(name, base, options) : nil
   end
 
-  def eql?(other)
-    other.class == self.class
+  def sass_engine(uri, options)
+    json = JSON.parse(IO.read(uri))
+
+    variables = json.map do |name, value|
+      output = _convert_to_sass(value);
+      "$#{name}: #{output}"
+    end
+
+    Sass::Engine.new(variables.join("\n"))
   end
 
-  def self.convert_to_sass(item)
+  private
+
+  def _find(dir, name, options)
+    full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
+    return unless full_filename && File.readable?(full_filename)
+
+    options[:syntax] = syntax
+    options[:filename] = full_filename
+    options[:importer] = self
+
+    sass_engine(full_filename, options)
+  end
+
+  def _convert_to_sass(item)
     if item.is_a? Array
-      '(' + item.map { |i| self.convert_to_sass(i) }.join(',') + ')'
+      _make_list(item)
     elsif item.is_a? Hash
-      '(' + item.map {|key, value| key.to_s + ':' + self.convert_to_sass(value) }.join(',') + ')'
+      _make_map(item)
     else
       item
     end
   end
 
-  def self.sass_engine(uri, importer, options)
-    json = JSON.parse(IO.read(uri))
-
-    variables = json.map do |name, value|
-      output = self.convert_to_sass(value);
-
-      "$#{name}: #{output}"
-    end
+  def _make_list(item)
+    '(' + item.map { |i| _convert_to_sass(i) }.join(',') + ')'
+  end
 
-    Sass::Engine.new(variables.join("\n"))
+  def _make_map(item)
+    '(' + item.map {|key, value| key.to_s + ':' + _convert_to_sass(value) }.join(',') + ')'
   end
+
 end

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

@@ -0,0 +1,19 @@
+require 'sass-json-vars/importer'
+
+# Taken from https://github.com/chriseppstein/sass-css-importer/blob/master/lib/sass/css_importer/monkey_patches.rb
+# TODO: This feels wrong, surely there must be a better way to handle this
+
+class Sass::Engine
+  alias initialize_without_json_importer initialize
+
+  def initialize(template, options={})
+    initialize_without_json_importer(template, options)
+
+    json_importer = self.options[:load_paths].find {|lp| lp.is_a?(SassJSONVars::Importer) }
+
+    unless json_importer
+      root = File.dirname(options[:filename] || ".")
+      self.options[:load_paths] << SassJSONVars::Importer.new(root)
+    end
+  end
+end

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

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

data/readme.md

@@ -1,5 +1,7 @@
 # Sass JSON Vars
 
+[![Build Status](https://travis-ci.org/vigetlabs/sass-json-vars.png?branch=master)](https://travis-ci.org/vigetlabs/sass-json-vars) [![Gem Version](https://badge.fury.io/rb/sass-json-vars.png)](http://badge.fury.io/rb/sass-json-vars)
+
 `@import` json data into Sass `$variables`.
 
 ### Usage

data/test/fixtures/lists/style.scss

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

data/test/fixtures/maps/style.scss

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

data/test/fixtures/sass/style.sass

@@ -0,0 +1,4 @@
+@import "variables.json"
+
+body
+    color: $color-red

data/test/fixtures/sass/variables.json

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

data/test/fixtures/strings/style.scss

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

data/test/sass-json-vars_test.rb

@@ -3,32 +3,7 @@ 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_strings
+   def test_strings
     scss = Sass.compile_file("test/fixtures/strings/style.scss")
     assert_equal "body {\n  color: #cc3333; }\n", scss
   end

data/test/sass_test.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+require 'sass'
+require 'sass-json-vars'
+
+class SassTest < Test::Unit::TestCase
+  def test_sass_syntax
+    scss = Sass.compile_file("test/fixtures/sass/style.sass")
+    assert_equal "body {\n  color: #cc3333; }\n", scss
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-json-vars
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nate Hunzaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -34,15 +34,19 @@ files:
 - Rakefile
 - lib/sass-json-vars.rb
 - lib/sass-json-vars/importer.rb
+- lib/sass-json-vars/monkeypatch.rb
 - lib/sass-json-vars/version.rb
 - readme.md
 - test/fixtures/lists/style.scss
 - test/fixtures/lists/variables.json
 - test/fixtures/maps/style.scss
 - test/fixtures/maps/variables.json
+- test/fixtures/sass/style.sass
+- test/fixtures/sass/variables.json
 - test/fixtures/strings/style.scss
 - test/fixtures/strings/variables.json
 - test/sass-json-vars_test.rb
+- test/sass_test.rb
 homepage: https://github.com/vigetlabs/sass-json-vars
 licenses:
 - MIT
@@ -72,6 +76,9 @@ test_files:
 - test/fixtures/lists/variables.json
 - test/fixtures/maps/style.scss
 - test/fixtures/maps/variables.json
+- test/fixtures/sass/style.sass
+- test/fixtures/sass/variables.json
 - test/fixtures/strings/style.scss
 - test/fixtures/strings/variables.json
 - test/sass-json-vars_test.rb
+- test/sass_test.rb