livingstyleguide 2.0.0.alpha.7 → 2.0.0.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 438f69eb3ec2f4eb23b292b249efdb90c1717626
-  data.tar.gz: c756e5fde9db9cca59a375b44476f75f81ca71d3
+  metadata.gz: 5e3b015481d2b291fe4ba908445a84a459d76419
+  data.tar.gz: 116a75025030319420a75c8fa6a74110a81252fa
 SHA512:
-  metadata.gz: faf35f680b14f27dd18da04a9700a8bce0ff8fe3397a08f1c5cd38372b1c0a3630b4937e193b5a2eab9dfd8ca4fefd0c81728fd31e0155957438a64f814b8e92
-  data.tar.gz: eb1c5979afdcfd392e66bd0f220106d86911e66c2ea0e7d963b63a26434c005a84f37486682d9b752bbbe1ce86c412d7a15a6b7cc7d9e1dd962ae38221f7b177
+  metadata.gz: 1eaa5240a3bf3afb259c544b76207a060ae9fcadb0da48edeb52af8d31d314a036741e59043fb1a78fa7628866a951d1e0fd2a17ec918cf058d50824592a5956
+  data.tar.gz: 7d06db6a008fea6c480440f241c9497baadf0a3fab357cacaf06f62c8048f410a1aacded48de4e300c1c09c36a05654e532e8a4c0955f4dbfbaca6b059f6b3e3

data/lib/livingstyleguide/document.rb

@@ -38,9 +38,6 @@ class LivingStyleGuide::Document < ::Tilt::Template
     @css = ''
     @locals = {}
     @defaults = { global: {} }
-    @head = ""
-    @header = ""
-    @footer = ""
   end
 
   def highlighted_source
@@ -64,6 +61,16 @@ class LivingStyleGuide::Document < ::Tilt::Template
     @id ||= generate_id
   end
 
+  def path
+    if file
+      File.dirname(file)
+    elsif options.has_key?(:livingstyleguide)
+      options[:livingstyleguide].path
+    else
+      "."
+    end
+  end
+
   def erb
     @erb ||= parse_filters do |name, arguments, options, block|
       options = %Q(document.defaults[:global].merge(document.defaults[:@#{name}] || {}).merge(#{options.inspect}))
@@ -72,6 +79,9 @@ class LivingStyleGuide::Document < ::Tilt::Template
   end
 
   def evaluate(scope, locals, &block)
+    @head = ""
+    @header = ""
+    @footer = ""
     @scope = scope
     result = ERB.new(erb).result(@filters.get_binding)
     @source = result
@@ -247,8 +257,9 @@ class LivingStyleGuide::Document < ::Tilt::Template
   private
   def render_scss(scss)
     sass_options = options.merge(custom: { sprockets_context: @scope })
+    sass_options[:load_paths] ||= []
+    sass_options[:load_paths] << Dir.pwd
     if defined?(Compass)
-      sass_options[:load_paths] ||= []
       Compass.sass_engine_options[:load_paths].each do |path|
         sass_options[:load_paths] << path
       end

data/lib/livingstyleguide/filters/import_and_use.rb

@@ -3,9 +3,7 @@ require 'tilt'
 def map_files(glob, &block)
   glob << '.lsg' unless glob =~ /\.(\w+|\*)$/
   glob.gsub!(/[^\/]+$/, '{_,}\\0')
-  if document.file
-    glob = File.join(File.dirname(document.file), glob)
-  end
+  glob = File.join(document.path, glob)
 
   Dir.glob(glob).map do |file|
     document.depend_on file

data/lib/livingstyleguide/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: livingstyleguide
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.7
+  version: 2.0.0.alpha.8
 platform: ruby
 authors:
 - Nico Hagenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minisyntax
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate beautiful front-end style guides