trekky 0.0.7.rc3 → 0.0.7.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b9aec1a5d263db19517c2dbae4a6b8860c16fb
-  data.tar.gz: eb8d218d698a83f6def8f82c8769c6151791a063
+  metadata.gz: 8a26adaa407a6fa2e89ea74733ceb53f4d8f3d47
+  data.tar.gz: bc6f465397df5c408d13a5b5104abfdd90730398
 SHA512:
-  metadata.gz: 439ce4280105f0ce47a4e2aa070f9c23dacd60b1a768282c972930e9e29b2def2a49d1a45d7f61ccbde3c3d2701993070bda890fae311626155a86e932c4bf44
-  data.tar.gz: fbcd0e90819f05fdde98d4f42ca404ad1b076d34c4c21feb3e317cc9e82cb547dd76f4384adb1841875a53d236045350a1395405c06c54c276ac06ce1b6a7276
+  metadata.gz: ff5ac2ce498134ce8930baf1e9d6367a3cc94131c7966c9cab18d2d6f9a1da84548166ef9c8568d5d2eff473af81aa1e2dd5330c37a0b4430d6fa9b67029cf17
+  data.tar.gz: 2912e3b48012184ef79b98c5bcff2f5c7459dbc238edb28ed2ad3416262e25df7575c0012133ddad5d72101f8492ff7f0abc4906d214bd27684d388a283b126e

data/bin/trekky

@@ -16,6 +16,7 @@ Clap.run ARGV,
     exit
   }
 
+
 trekky = Trekky.new(source)
 
 unless daemon 

data/lib/trekky.rb

@@ -13,7 +13,9 @@ class Trekky
   end
 
   def render_to(target_dir)
-    @context.sources.each do |source|
+    target_dir = Pathname.new(target_dir).expand_path
+
+    @context.each_source do |source|
       path = target_path(target_dir, source)
       output = source.render
       output = source.render_errors unless source.valid?
@@ -25,7 +27,7 @@ class Trekky
   private
 
   def target_path(target_dir, source)
-    path = File.join(target_dir, source.path.gsub(@context.source_dir, ''))
+    path = File.join(target_dir, source.path.to_s.gsub(@context.source_dir.to_s, ''))
     if type = source.type
       path.gsub(/\.#{type}/, '')
     else

data/lib/trekky/context.rb

@@ -1,3 +1,4 @@
+require 'pathname'
 require_relative 'data'
 require_relative 'haml_source'
 require_relative 'sass_source'
@@ -9,54 +10,77 @@ class Trekky
     attr_reader :source_dir
 
     def initialize(source_dir)
-      @source_dir = source_dir
-      @files = { layouts: [], partials: [], sources: [] }
-      build
+      @source_dir = Pathname.new(source_dir).expand_path
     end
 
-    def sources
-      @files[:sources]
+    def each_source
+      files[:sources].each do |path|
+        yield build_source(path)
+      end
     end
 
     def partials
-      @files[:partials]
+      files[:partials]
     end
 
     def layouts
-      @files[:layouts]
+      files[:layouts]
     end
 
     def find_partial(name)
-      partials.find {|p| p.path == File.join(source_dir, name)}
+      if partial = partials.find { |path| path == (source_dir + name) }
+        build_source(partial)
+      end
+    end
+
+    def find_layout(name)
+      layout = layouts.find do |path| 
+        layout_path = source_dir + "layouts/#{name}"
+        path == layout_path
+      end
+
+      if layout
+        build_source(layout)
+      end
     end
 
     def data
       @data ||= Data.new(data_path)
     end
 
-    private
-
-    def build
-      Dir.glob(File.join(source_dir, "**/*")).each do |path|
-
-        next if File.directory?(path)
+    def layout
+      if path = layouts.first
+        build_source(path)
+      end
+    end
 
-        source = build_source(path)
+    private
 
-        if path.include?("#{source_dir}/layouts")
-          @files[:layouts] << source
-          next
-        end
+    def files
+      @files ||= find_files
+    end
 
-        if File.basename(path)[0] == '_'
-          @files[:partials] << source
-          next
+    def find_files
+      all_files = { layouts: [], partials: [], sources: [] }
+
+      paths.inject(all_files) do |hash, path|
+        unless path.directory?
+          if path.to_s.include?("#{source_dir}/layouts")
+            hash[:layouts].push(path)
+          elsif path.basename.to_s[0] == '_'
+            hash[:partials].push(path)
+          else
+            hash[:sources].push(path)
+          end
         end
-
-        @files[:sources] << source
+        hash
       end
     end
 
+    def paths
+      Pathname.glob(source_dir + "**/*")
+    end
+
     def build_source(path)
       type = File.extname(path)[1..-1].intern
       find_source_class(type).new(self, path)
@@ -74,6 +98,5 @@ class Trekky
       File.join(Dir.pwd, 'data')
     end
 
-
   end
 end

data/lib/trekky/haml_source.rb

@@ -55,11 +55,22 @@ class Trekky
     private
 
     def render_input(locals = {}, &block)
-      Haml::Engine.new(input).render(self, locals, &block)
+      Haml::Engine.new(body).render(self, locals, &block)
     end
 
     def layout
-      @context.layouts.first
+      name = header["layout"] || 'default.haml' 
+      context.find_layout(name)
+    end
+
+    def read_file
+      regexp = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+      content = File.read(path)
+      if m = regexp.match(content)
+        return YAML.load(m[0]), m.post_match
+      else
+        return {}, content
+      end
     end
 
   end

data/lib/trekky/sass_source.rb

@@ -15,14 +15,14 @@ class Trekky
     def render
       clear_errors
       Sass.load_paths << @context.source_dir
-      @output = Sass::Engine.new(input, options).render
+      @output = Sass::Engine.new(body, options).render
     rescue Exception => error
       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)
+      text = error.message.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP, HTML_ESCAPE)
+      sprintf('body::before{ content:"%s" }', text)
     end
 
     def options

data/lib/trekky/source.rb

@@ -1,13 +1,17 @@
+# encoding: UTF-8
+
 class Trekky
 
   class Source
 
     attr_reader :output, :context, :path, :errors
+    attr_reader :body, :header
 
     def initialize(context, path)
       @path = path
       @context = context
       @errors = []
+      read
     end
 
     def data
@@ -30,12 +34,12 @@ class Trekky
       File.extname(path)
     end
 
-    def input
-      File.read(path)
+    def read
+      @header, @body = read_file
     end
 
     def add_error(error)
-      STDOUT.puts "ERROR: #{error.message} (#{path})"
+      STDOUT.puts "ERROR: #{error.message} (#{path}) -> #{error.backtrace.first}"
       @errors << error
       nil
     end
@@ -44,6 +48,10 @@ class Trekky
       @errors = []
     end
 
+    def read_file
+      return {}, File.read(path)
+    end
+
     def render_errors
       @errors.map do |error|
         render_error(error)

data/lib/trekky/static_source.rb

@@ -6,7 +6,7 @@ class Trekky
 
     def render
       clear_errors
-      @output = input
+      @output = body
     end
 
     def type

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: trekky
 version: !ruby/object:Gem::Version
-  version: 0.0.7.rc3
+  version: 0.0.7.rc4
 platform: ruby
 authors:
 - Lucas Florio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-21 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.
@@ -93,17 +93,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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple, very simple, sass and haml compiler for dear designer friend.