sass-json-vars 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzJiZmUzZjIxODQ1YzNhOTc1NDU1OWYzZTQxOGVmNGYzZDA4ZjZhNg==
-  data.tar.gz: !binary |-
-    ODFhYzM4ZDIxODU1ZWE5NWM3MzU4MDFkMmFkYzY5MWIyYmNjYjQ4YQ==
+SHA1:
+  metadata.gz: 965ec563b6eb40a36d01af3e91b0dab01f922cee
+  data.tar.gz: 7ca2475cef5ed0c10d217c1ea442e078c45018bd
 SHA512:
-  metadata.gz: !binary |-
-    NWIzMGMxZmUxYThmMThlZWM1NTI1NGYzNDZjYWQxMjBiNWRiZWRhMGE2MmZi
-    ODE3ZjhiZjgwY2ZjMzg1Y2VmNGQ5MjVkZGNiNzdmOWZjMDdlMGNkYzgyYTE5
-    NjE1OGUxMzllNDM3NDI0MjQ2MTEwZTRmZGIzMDc5OTAzZGEwZTk=
-  data.tar.gz: !binary |-
-    ZGI5YzMyYTZkOTVjZTA5ODdmZTFmMWYzYjM4ZmQ0MzY5YzljOTFlYzhmMDQ4
-    MjJlMDM5ZTQwNWNiZmY0OTBlYjQ0YjJhYzk3YTcxN2I4ODQ1OGJmYzhjNzk0
-    YjI1MGM1YWEyZDJhZDk5ODQyMzgyNTRkNjg3Y2ZmMGMwYzhiMDA=
+  metadata.gz: b21412c04ba406055516f573af4b0ea48fce4d073900f18bf6efe59a9e7e02e797db0097de75ffaaf7b836de30f9940af8a793047d1e4d07a7c3d5d9da4eb2d0
+  data.tar.gz: a1ad110731657f57d0ce505023caf821b48330ff850688eab4405e2523f5195407d51cae039e6310c428e4efebbbe71abbdad7db7c44fbd94f0e897aee85e5f8

data/Rakefile

@@ -9,3 +9,5 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
+
+task :default => :test

data/lib/sass-json-vars.rb

@@ -1,4 +1,2 @@
-module SassJSONVars; end
-
 require 'sass-json-vars/importer'
 require 'sass-json-vars/monkeypatch'

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

@@ -4,9 +4,12 @@ require 'json'
 class SassJSONVars::Importer < Sass::Importers::Filesystem
 
   def watched_file?(uri)
-    uri =~ /\.json$/ && uri.start_with?(root + File::SEPARATOR)
+    uri =~ /\.json$/ &&
+      uri.start_with?(root + File::SEPARATOR)
   end
 
+  protected
+
   def extensions
     {'json' => :scss}
   end
@@ -15,36 +18,18 @@ class SassJSONVars::Importer < Sass::Importers::Filesystem
     File.extname(name) == '.json'
   end
 
-  def find(name, options)
-    super(name, options) if json? name
-  end
-
-  def find_relative(name, base, options)
-    super(name, base, options) if json? name
-  end
-
-  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
-
   private
 
   def _find(dir, name, options)
+    return unless json? name
+
     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
+    json      = JSON.parse(IO.read(full_filename))
+    variables = json.map { |key, value| "$#{key}: #{_convert_to_sass(value)}" }.join("\n")
 
-    sass_engine(full_filename, options)
+    Sass::Engine.new(variables)
   end
 
   def _convert_to_sass(item)
@@ -64,5 +49,4 @@ class SassJSONVars::Importer < Sass::Importers::Filesystem
   def _make_map(item)
     '(' + item.map {|key, value| key.to_s + ':' + _convert_to_sass(value) }.join(',') + ')'
   end
-
 end

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

@@ -1,3 +1,3 @@
 module SassJSONVars
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sass-json-vars
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nate Hunzaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Allows the use of JSON to declare variables with @import 'file.json'.
@@ -57,17 +57,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.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Allows the use of JSON to declare variables with @import 'file.json'.