vae 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWYwNWIxZWM2ZmU3NmMzNmRkM2MyMmIxNDFjMmRlMWQ0ZmE1ZGQzYQ==
+    YzE3ZDY1ZjdmN2NjMjcyMzY0Njc0MWQ4Y2Q0NTI3NDVkODQ3OWI2YQ==
   data.tar.gz: !binary |-
-    ODI1MDllMjllZjY0ODZjOTdkOTk3ZmVhOTM3NDE2NGEyMWZiNWVjYQ==
+    MDlkY2YwZTI2ZWFmYmQ2ZWUzZTczMTQwOTQzMmQ4MTQyYmVkZDhhYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTljZTVhODA3OWY0ZmRhZDlhNzAzOTUwZmU1ZWE4Yjk1YjRiNGZlODg4NDgx
-    ZWVjZWMzN2NjNzFhODE5Yjk2YWZhNmUzODNjNDY5NWYyMjBmMDFhNWY5MjA1
-    MmFjYzg5MTg1NTNjMzEyZjZjNzI1MGNhYmJiZGNjMTBjODg2ZTE=
+    NjVjMDY1MGVkNDIwNDNlYzBkMTY0ZmI5YmM1MDM2ODllZGZlZWJiNjMyMjk4
+    M2VlMTY1NDBhZTRmYWI1ZGE1NDM5YWY0NGY0YWE0ODAwZDU4Y2RmOWZkOGU4
+    YjA2NjNhYjIwMDVkNmViMDA1YzJiNmUwZjQ2MmExYzJiYmE3NTQ=
   data.tar.gz: !binary |-
-    NzhkN2MwODVlZDdiMDIxZWNjMmMxNWU1Zjc0YzBjNTM0ZjgyOTkyZmM5OGIx
-    OGVmMzllNGQ2OWIzZGI2NjcwYjliZmM1YWVhMjk4YmYyZTcyODg1OTllNzQw
-    YWI5OWVjNDBjNjRjNzE1MzRlM2YyZmMyNDkyM2I3ZmMyYWE3YTk=
+    M2JkYTAzZGY3Yjc2NTMwMGMxMzAzYjZjYzI4NGE4ZTFjMzhmMTFkNGZmMzRk
+    M2M0ZTRkOWNlMTU0NmEzYjMyNDg1MWI4ODI0NmQxMGNhZGE1YjU1MWVmZjli
+    MjI4NmNhODZkNWVkNDVjOGIwY2FjOWMyNjRiZWU1OGIyYzBmNGU=

data/lib/vae_site_servlet.rb

@@ -102,7 +102,12 @@ class VaeSiteServlet < Servlet
     return nil unless local_path.length > 0
     get_source_file(local_path)
   end
-  
+ 
+  def get_line_from_sass_exception(exception)
+    return exception.message.scan(/:(\d+)/).first.first if exception.is_a?(::SyntaxError)
+    exception.backtrace[0].scan(/:(\d+)/).first.first
+  end 
+
   def not_modified?(req, res, mtime, etag)
     return true if (ims = req.params['IF_MODIFIED_SINCE']) && Time.parse(ims) >= mtime
     return true if (inm = req.params['IF_NONE_MATCH']) && WEBrick::HTTPUtils::split_header_value(inm).member?(etag)
@@ -113,10 +118,12 @@ class VaeSiteServlet < Servlet
     begin
       options = Compass.sass_engine_options
       options[:load_paths] << File.dirname(local_path) 
+      options[:syntax] = :scss if local_path =~ /\.scss$/
       engine = Sass::Engine.new(open(local_path, "rb").read, options)
       engine.render
     rescue Sass::SyntaxError => e
       e.message
+      "Sass Syntax Error on line #{get_line_from_sass_exception(e)} #{e.message}"
     end
   end
 
@@ -139,7 +146,7 @@ class VaeSiteServlet < Servlet
       else
         mtype = WEBrick::HTTPUtils::mime_type(local_path, WEBrick::HTTPUtils::DefaultMimeTypes)
         res.header['last-modified'] = mtime.httpdate
-        if req.params["REQUEST_URI"] =~ /.sass$/
+        if req.params["REQUEST_URI"] =~ /\.(sass|scss)$/
           res.header['Content-Type'] = "text/css"
           res.body << render_sass(local_path)
         else

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.6.1"
+VER = "0.6.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png