wavy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec8ba39833a876b1c873e30574534d17a9d3505e
-  data.tar.gz: 468a62d4bd1c8c8631e5f45a9d9cb57f5b406ab8
+  metadata.gz: 822ce721c0f7b44814c30ae88dc79fe9f545c638
+  data.tar.gz: 327d19af49b0f994bed7422133e609fc8e2fd8cb
 SHA512:
-  metadata.gz: 19ad15357ccb0bcd2400716a201bf65b534f539d9e53760c7e9ec92d725c9ebe85b80a9545e69b41347717f233598316a43ec7e83705aece8ac157c38d22fa9a
-  data.tar.gz: 7a71dc3bbe4645f9e7c4c864fba489491b591c16d38001994a307cc8ad71f3b481bd433d15c5ea37d08d79d570162e0100b47b46fafea4f06d9c70fc8203449e
+  metadata.gz: 18ed4d2f4f01eecd450316f9c67ff56bd915b0fa52c08cc650c3b6b6ca00e6c2c12faecab8c95f123ceb50e0f640972ca606613d9b5e327c4e0a4ca847f867d0
+  data.tar.gz: f8b3afbb9092ba731eceaed653c5cb57179d4ae8f46c3d72e84ae407721c2cd2808140b2610fd5ef33cfa12ad4b312eb7a6d39bea02f639605a7d523fcaecb01

data/lib/wavy/parsers/mixin.rb

@@ -4,6 +4,93 @@ module Wavy
 
     class Mixin
 
+      # Parses all function and template mixins
+      #
+      # @param (String) data Content
+      # @param (String|Boolean) path Template path
+      #
+      # @return (String) data Parsed content
+      def self.parse(template, path = false)
+        template = parseTemplates(template, path)
+
+        return template
+      end
+
+      # Finds all included mixin functions.
+      #
+      # @param (String) data Content
+      # @param (String) path Template path
+      #
+      # @return (String) data Parsed content
+      def self.parseTemplates(template, path)
+        pattern = /(@import)\s\"(.*)\"/
+
+        indent = ""
+        template_new = ""
+
+        saved_templates = Wavy::Models::Mixins.getTemplates
+
+        template.each_line.with_index do |line, i|
+          matches = line.scan(pattern)
+
+          line = parseFunctions(line)
+
+          if matches.length > 0
+            matches.each do |match|
+              if(saved_templates["template-"+match[1]])
+                imported_file = saved_templates["template-"+match[1]]
+              else
+                Wavy::Parsers::Mixin.definedTemplate(line, path)
+                saved_templates = Wavy::Models::Mixins.getTemplates
+
+                imported_file = saved_templates["template-"+match[1]]
+              end
+
+              content = imported_file.content
+
+              find = "@import \"#{match[1]}\""
+
+              new_content = ""
+
+              current_indent = indent.dup
+              current_indent << line.slice(0..(line.index(find)))
+              current_indent[-1] = ""
+
+              same_line = false
+              
+              if current_indent.strip.empty? == false
+                same_line = true
+              end
+
+              content = parseFunctions(content)
+
+              content.each_line.with_index do |content_line, ii|
+                if same_line == true
+                  content_line = content_line.strip
+                  content_line.delete!("\n")
+                else
+                  if i > 0 && ii > 0
+                    new_content << current_indent
+                  end
+                end
+
+                new_content << content_line
+              end
+
+              new_line = current_indent
+              new_line << new_content
+              new_line << "\n"
+
+              line = new_line
+            end
+          end
+
+          template_new << line
+        end
+
+        return template_new
+      end
+
       # Finds all user-defined mixins.
       #
       # @param (String) data Content
@@ -28,7 +115,7 @@ module Wavy
       #
       # @param (String) content Content
       # @param (String|Boolean) path Template path
-      def self.definedTemplates(content, path = false)
+      def self.definedTemplate(content, path = false)
         pattern = /(@import)\s\"(.*)\"/
         matches = content.scan(pattern)
 
@@ -93,7 +180,7 @@ module Wavy
                           file_match = file_match[0]
 
                           content = FILE_IMPORTER.load(file_path)
-                          content = parse(content, file_path)
+                          content = parseTemplates(content, file_path)
 
                           mixin_node = Wavy::Nodes::Mixin.new(name, content, false)
 
@@ -113,19 +200,6 @@ module Wavy
         end
       end
 
-      # Parses all function and template mixins
-      #
-      # @param (String) data Content
-      # @param (String|Boolean) path Template path
-      #
-      # @return (String) data Parsed content
-      def self.parse(template, path = false)
-        template = parseFunctions(template)
-        template = parseTemplates(template, path)
-
-        return template
-      end
-
       # Finds all included mixin functions.
       #
       # @param (String) template Content
@@ -158,48 +232,70 @@ module Wavy
               end
 
               # Search for includes within mixins
-              content = parse(content)
+              content = parseFunctions(content)
 
               # Find mixin string to replace
               find = "@include #{match[1]}(#{match[2]})"
-              template = template.gsub(find, content)
-            end
-          end
-        end
 
-        return template
-      end
+              indent = ""
+              new_template = ""
+              new_content = ""
 
-      # Finds all included mixin functions.
-      #
-      # @param (String) data Content
-      # @param (String) path Template path
-      #
-      # @return (String) data Parsed content
-      def self.parseTemplates(template, path)
-        # Search for mixin includes
-        pattern = /(@import)\s\"(.*)\"/
-        matches = template.scan(pattern)
+              template.each_line.with_index do |line, i|
+                matches = line.scan(find)
 
-        mixins = Wavy::Models::Mixins.getTemplates
+                if matches.length > 0
+                  current_indent = indent.dup
+                  current_indent << line.slice(0..(line.index(find)))
+                  current_indent[-1] = ""
 
-        # Go through and parse each include
-        if matches.length > 0
-          matches.each do |match|
-            if(mixins["template-"+match[1]])
+                  line.delete!("\n")
 
-              mixin = mixins["template-"+match[1]]
-              content = mixin.content
+                  same_line = false
 
-              # Search for includes within mixins
-              content = parse(content, path)
+                  if current_indent.strip.empty? == false
+                    same_line = true
+                  end
 
-              # Find mixin string to replace
-              find = "@import \"#{match[1]}\""
-              template = template.gsub(find, content)
-            else
-              Wavy::Parsers::Mixin.definedTemplates(template, path)
-              template = parseTemplates(template, path)
+                  content_tab_length = 0
+
+                  content.each_line.with_index do |content_line, ii|
+                    match_indent = content_line.scan(/^(\s*|\t*)\S/)
+
+                    if same_line == true
+                      content_line = content_line.strip
+                      content_line.delete!("\n")
+                    else
+                      if ii > 1 && same_line == false
+                        new_content << current_indent
+                      end
+
+                      if ii == 1 && match_indent[0] && match_indent[0][0]
+                        content_tab_length = match_indent[0][0].length
+                      end
+
+                      if match_indent[0] && match_indent[0][0] && match_indent[0][0].length >= content_tab_length
+                        content_line.slice!(0, content_tab_length)
+                      end
+
+                    end
+
+                    if ii > 0
+                      new_content << content_line
+                    end
+                  end
+
+                  if same_line == true && i == (template.lines.count-1)
+                    line << "\n"
+                  end
+
+                  line = line.gsub(find, new_content)
+                end
+
+                new_template << line
+              end
+
+              template = new_template
             end
           end
         end

data/lib/wavy/utils/filesys.rb

@@ -35,6 +35,23 @@ module Wavy
         load(new_name, false)
       end
 
+      def guess_indent(file)
+        i = 0
+        file.each_line.with_index {|line, i|
+          break if i > 3
+          match = /^\s+/.match(line)
+          next unless match
+          return {
+            :tab? => line.start_with?("\t"),
+            :indent => match[0].size
+          }
+        }
+        return { # returns default settings
+          :tab? => true,
+          :indent => 4
+        }
+      end
+
     end
 
   end

data/lib/wavy/version.rb

@@ -1,6 +1,6 @@
 module Wavy
 
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 
   class Version
 

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: wavy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Matthew Govaere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies: []
-description: Wavy is a simple templating engine for HTML – Inspired By Sass
+description: Wavy is a templating engine for preprocessing HTML, heavily influenced
+  by the simplicity of Sass. Think Sass for HTML.
 email: matthew.govaere@gmail.com
 executables:
 - wavy
@@ -57,5 +58,5 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: A simple templating engine for preprocessing HTML.
+summary: A simple templating engine for HTML – Inspired By Sass
 test_files: []