staticmatic 0.11.0.alpha.6 → 0.11.0.alpha.7

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :patch: 0
-:build: alpha.6
+:build: alpha.7

data/lib/staticmatic/helpers.rb

@@ -27,7 +27,7 @@ module StaticMatic
         # Bit of a hack here - adds any stylesheets that exist in the site/ dir that haven't been generated from source sass
         Dir[File.join(@staticmatic.site_dir, 'stylesheets', '*.css')].each do |filename|
           search_filename = File.basename(filename).chomp(File.extname(filename))
-
+          puts search_filename
           already_included = false
           stylesheet_directories.each do |path|
             if File.basename(path).include?(search_filename)
@@ -44,9 +44,11 @@ module StaticMatic
           filename_without_extension = File.basename(path).chomp(File.extname(path))
           
           if !filename_without_extension.match(/^\_/)
-            path = path.gsub(/#{@staticmatic.base_dir}\/(src|site)\//, "").
-                                 gsub(/#{filename_without_extension}\.(sass|scss|css)/, "")
-          
+            
+            path = path.gsub(/#{@staticmatic.src_dir}/, "").
+                        gsub(/#{@staticmatic.site_dir}/, "").
+                        gsub(/#{filename_without_extension}\.(sass|scss|css)/, "")
+                        
             options[:href] = "#{relative_path}#{path}#{filename_without_extension}.css"
             output << tag(:link, options)
           end

data/lib/staticmatic/mixins/render.rb

@@ -80,17 +80,21 @@ module StaticMatic::RenderMixin
     # full_file_path = File.join(@src_dir, 'stylesheets', source_dir, "#{source}.sass")
     full_file_path = Dir[File.join(@src_dir, 'stylesheets', source_dir, "#{source}.{sass,scss}")].first
 
-    begin
-      sass_options = { :load_paths => [ File.join(@src_dir, 'stylesheets') ] }.merge(self.configuration.sass_options)
-
-      if File.extname(full_file_path) == ".scss"
-        sass_options[:syntax] = :scss
-      end
+    if full_file_path && File.exist?(full_file_path)
+      begin
+        sass_options = { :load_paths => [ File.join(@src_dir, 'stylesheets') ] }.merge(self.configuration.sass_options)
       
-      stylesheet = Sass::Engine.new(File.read(full_file_path), sass_options)
-      stylesheet.to_css
-    rescue Exception => e
-      render_rescue_from_error(StaticMatic::TemplateError.new(full_file_path, e))
+        if File.extname(full_file_path) == ".scss"
+          sass_options[:syntax] = :scss
+        end
+      
+        stylesheet = Sass::Engine.new(File.read(full_file_path), sass_options)
+        stylesheet.to_css
+      rescue Exception => e
+        render_rescue_from_error(StaticMatic::TemplateError.new(full_file_path, e))
+      end
+    else
+      raise StaticMatic::Error.new("", source, "Stylesheet not found")
     end
   end
 

data/lib/staticmatic/template_error.rb

@@ -6,13 +6,17 @@ class StaticMatic::TemplateError < StandardError
   def initialize(template, original_exception)
     @template, @original_exception = template, original_exception
     @backtrace = original_exception.backtrace
-
-    @source = File.read(template)
+    
+    if template
+      @source = File.read(template)
+    else 
+      @source = ""
+    end
   end
   
   # TODO: Replace 'haml|sass' with any registered engines
   def line_number
-    @line_number ||= $2 if backtrace.find { |line| line =~ /\((haml|sass)\)\:(\d+)/ }
+    @line_number ||= $2 if backtrace.find { |line| line =~ /\((haml|sass|scss)\)\:(\d+)/ }
   end
   
   def filename

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 11
   - 0
   - alpha
-  - 6
-  version: 0.11.0.alpha.6
+  - 7
+  version: 0.11.0.alpha.7
 platform: ruby
 authors: 
 - Stephen Bartholomew