trekky 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 390f90e19c233cd7d43cd50f0529294d81ef92e8
-  data.tar.gz: df0ae3e0f3be95610d90e039949f017fcd5593c8
+  metadata.gz: 658ace6e980518452b3b20e7523eca8da443d715
+  data.tar.gz: 2b7543546f879aa19b6ea310ce2ec9191caf209c
 SHA512:
-  metadata.gz: bf4f75bcc8e9eaa547b9c715fd5f0a9d041d67a651b6ac7d1222cdf6b97c87e86fa7b46b034eb6aa298ef0f3341ff18da6360b6462a8ec437f3e329c28d83d1e
-  data.tar.gz: 89a0941b374a5cacf4686b858edfd6b477a4e2b1f1ac34b117a68962c9162b62f57540ebc6810b17e14240e8ed9883c0d7e59c3a787b6134a9ef5956cae37555
+  metadata.gz: 9de6ab2de5dca2eb8707155a8317f84708a972b4df5449e283627d056c2d2b8d1f16ba7f10886c1408396389948491ca739a515474ec9a1e4f269bfb1024d34b
+  data.tar.gz: d7e7049202d3dba5d361925badafc3e374d07fd99b9a2f9efdc69a6d2d2f12cf89a050370e4743080a20eb36adde2c870c37b7a6d1dcddc6612b491e2c3191a9

data/lib/trekky.rb

@@ -9,9 +9,9 @@ class Trekky
 
   def render_to(target_dir)
     @context.sources.each do |source|
-      output = source.render
       path = target_path(target_dir, source)
-
+      output = source.render
+      output = source.render_errors unless source.valid?
       STDOUT.puts "Writing #{source.path} to #{path}"
       write(output, path)
     end
@@ -20,7 +20,7 @@ class Trekky
   private
 
   def target_path(target_dir, source)
-    path = File.join(target_dir, source.path.gsub(source_dir, ''))
+    path = File.join(target_dir, source.path.gsub(@context.source_dir, ''))
     if type = source.type
       path.gsub(/\.#{type}/, '')
     else
@@ -33,8 +33,4 @@ class Trekky
     File.open(path, "wb") {|f| f.write(output) }
   end
 
-  def source_dir
-    @context.source_dir
-  end
-
 end

data/lib/trekky/haml_source.rb

@@ -12,24 +12,26 @@ class Trekky
     end
 
     def render(options = {}, &block)
-      if block_given? || options[:layout] == false
+      clear_errors
+      @output = if block_given? || options[:layout] == false
         render_input(&block)
       else
-        output = render_input
+        buffer = render_input
         if layout
           layout.render do |name|
             if regions.has_key?(name)
               regions[name]
             else
-              output
+              buffer
             end
           end
         else
-          output
+          buffer
         end
       end
     rescue Exception => error
-      render_error(error)
+      STDOUT.puts "Adding error: #{error.message}"
+      add_error error
     end
 
     def partial(name)
@@ -64,14 +66,5 @@ class Trekky
       @context.layouts.first
     end
 
-    def render_error(e)
-      STDERR.puts "Error #{e.message}"
-      e.backtrace.each do |line|
-        STDERR.puts "  #{line}"
-      end
-      nil
-    end
-
   end
-
 end

data/lib/trekky/sass_source.rb

@@ -3,10 +3,27 @@ require 'sass'
 
 class Trekky
   class SassSource < Source
+    HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+));)/
+    HTML_ESCAPE = {
+      '&' => '&amp;',
+      '>' => '&gt;',
+      '<' => '&lt;',
+      '"' => '&quot;',
+      "'" => '&#39;'
+    }
 
     def render
+      clear_errors
       Sass.load_paths << @context.source_dir
-      Sass::Engine.new(input, options).render
+      @output = Sass::Engine.new(input, options).render
+    rescue Exception => error
+      STDOUT.puts "Adding error: #{error.message}"
+      add_error error
+    end
+
+    def render_error(error)
+      input = error.message.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP, HTML_ESCAPE)
+      sprintf('body::before{ content:"%s" }', input)
     end
 
     def options

data/lib/trekky/source.rb

@@ -2,21 +2,20 @@ class Trekky
 
   class Source
 
+    attr_reader :output, :context, :path, :errors
+
     def initialize(context, path)
       @path = path
       @context = context
+      @errors = []
     end
 
     def render(&block)
-      raise NotImplementedError      
-    end
-
-    def path
-      @path
+      raise NotImplementedError
     end
 
-    def context
-      @context
+    def valid?
+      @errors.empty?
     end
 
     def type
@@ -31,5 +30,31 @@ class Trekky
       File.read(path)
     end
 
+    def add_error(error)
+      @errors << error
+      nil
+    end
+
+    def clear_errors
+      @errors = []
+    end
+
+    def render_errors
+      @errors.map do |error|
+        render_error(error)
+      end.join("<br/>")
+    end
+
+    def render_error(error)
+      Haml::Engine.new(<<-INPUT.gsub(" "*8, "")).render(self, {error: error})
+        %h1 File: #{path}
+        %h3 Error: #{error.message}
+        %pre
+          %code
+            - error.backtrace.each do |line|
+              = line
+              %br
+      INPUT
+    end
   end
-end
+end

data/lib/trekky/static_source.rb

@@ -5,7 +5,8 @@ class Trekky
   class StaticSource < Source
 
     def render
-      input
+      clear_errors
+      @output = input
     end
 
     def type

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: trekky
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Lucas Florio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Simple, very simple, sass and haml compiler.
@@ -92,17 +92,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.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple, very simple, sass and haml compiler for dear designer friend.