livingstyleguide 2.0.0.alpha.2 → 2.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97dd9be7998179472959f4e7960605b573e36fa1
-  data.tar.gz: 29cc7df7aa57af22558c1dba29eac0fe5d335337
+  metadata.gz: 7a51a7d18383f9d9667786275263bc1b71af49b0
+  data.tar.gz: a6ef46207a4b6add73873de1a2141629f8da8917
 SHA512:
-  metadata.gz: 31aec84356a0b49da04a65d92dbbf6358f520f173528ed95f9cc755362f280ca3efb6311be04672776fa24acdc011c0498ce4122d9340b9d73f840dea2871937
-  data.tar.gz: 5e685372e9cc6d331e6164c4a8738b0de7b4e6a6357079ba36a64282afd80275dc2522bc68710fa352980ea4dde892e7fcf3728ece11ada5ffe94b16e2dc3934
+  metadata.gz: 79e37f2e32f51c8478f69d0f958fc0a19a6dc187854ffd604bb9a6688ee0e14735b08167293bf7aa29b03d55d7c8972ad6243971b3a3b30b34016cfa2aadd14a
+  data.tar.gz: 8b9f37570cecc6ebb507cdb703dee17c401e4761c16bfaa2afd92f325fed36a56614a3ef2e5473383c7f5ae59a961287c6603713ae1a45371cb36d5803eb7d5b

data/lib/livingstyleguide/document.rb

@@ -39,12 +39,12 @@ class LivingStyleGuide::Document < ::Tilt::Template
   end
 
   def source
-    @source ||= set_highlights(@erb.gsub(/<%.*?%>\n?/, ''))
+    @source ||= set_highlights(erb.gsub(/<%.*?%>\n?/, ''))
   end
 
   def css
     scss_with_lsg = "#{scss}; @import 'livingstyleguide';"
-    ::Sass::Engine.new(scss_with_lsg, syntax: :scss).render
+    render_scss(scss_with_lsg)
   end
 
   def id
@@ -102,7 +102,7 @@ class LivingStyleGuide::Document < ::Tilt::Template
 
   private
   def parse_filters
-    (@type == :erb ? data.gsub('<%', '<%%') : data).gsub(/\G(.*?)((```.+?```)|\Z)/m) do
+    data.gsub('<%', '<%%').gsub(/\G(.*?)((```.+?```)|\Z)/m) do
       content, code_block = $1, $2
       content.gsub(/^@([\w\d_-]+)(?: ([^\{\n]+))?(?: *\{\n((?:.|\n)*?)\n\}|\n((?:  .*\n)+))?/) do
         name, arguments, block = $1, $2 || '', $3 || $4
@@ -150,6 +150,17 @@ class LivingStyleGuide::Document < ::Tilt::Template
       "section-#{Digest::SHA256.hexdigest(data)[0...6]}"
     end
   end
+
+  private
+  def scss_template
+    ::LivingStyleGuide.default_options[:scss_template] || Tilt['scss']
+  end
+
+  private
+  def render_scss(scss)
+    sass_options = options.merge(custom: { sprockets_context: @scope })
+    scss_template.new(file, sass_options){ scss }.render(@scope)
+  end
 end
 
 Tilt.register 'lsg', LivingStyleGuide::Document

data/lib/livingstyleguide/filters/import.rb

@@ -3,10 +3,15 @@ require 'tilt'
 LivingStyleGuide.add_filter :import do |glob, data = nil|
   glob << '.lsg' unless glob =~ /\.(\w+|\*)$/
   glob.gsub!(/[^\/]+$/, '{_,}\\0')
+  if document.file
+    glob = File.join(File.dirname(document.file), glob)
+  end
+
   if data
     require 'json'
     data = JSON.parse("{#{data}}")
   end
+
   Dir.glob(glob).map do |file|
     if file =~ /\.s[ac]ss$/
       document.depend_on file

data/lib/livingstyleguide/integration/rails.rb

@@ -4,6 +4,7 @@ if defined?(Rails) and defined?(Rails::Railtie)
   class LivingStyleGuideRailtie < Rails::Railtie
     initializer 'living_style_guide.assets' do
       Rails.application.assets.register_engine('.lsg', ::LivingStyleGuide::Document)
+      LivingStyleGuide.default_options[:scss_template] = ::Sass::Rails::ScssTemplate
     end
   end
 

data/lib/livingstyleguide/version.rb

@@ -1,3 +1,3 @@
 module LivingStyleGuide
-  VERSION = '2.0.0.alpha.2'
+  VERSION = '2.0.0.alpha.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2
+  version: 2.0.0.alpha.3
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax