wavy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d62eec206e250ccd686d9577cf46e130569c320
-  data.tar.gz: 5e1a9cf960c8ee15cd255d303383fce4bb730d2b
+  metadata.gz: ec8ba39833a876b1c873e30574534d17a9d3505e
+  data.tar.gz: 468a62d4bd1c8c8631e5f45a9d9cb57f5b406ab8
 SHA512:
-  metadata.gz: 3bfc1bb1a744ea5bac3fe45ad2797445186d59395724e4ab660984324d5d955cc6f5279b4f73b62ca7af8c8fcb5ba480011b067d6cccb696634e944599aa2ee0
-  data.tar.gz: 5c3d48192889cd154d05136e53dc151fc4ca0c1333b6a15245b65afb5782b395971518471955cdc178f3ffa94d44c52dd4ed0eb23d2b97dc925ea692beedf1f1
+  metadata.gz: 19ad15357ccb0bcd2400716a201bf65b534f539d9e53760c7e9ec92d725c9ebe85b80a9545e69b41347717f233598316a43ec7e83705aece8ac157c38d22fa9a
+  data.tar.gz: 7a71dc3bbe4645f9e7c4c864fba489491b591c16d38001994a307cc8ad71f3b481bd433d15c5ea37d08d79d570162e0100b47b46fafea4f06d9c70fc8203449e

data/lib/wavy/core.rb

@@ -42,19 +42,27 @@ module Wavy
         Wavy::Parsers::Import.extract
 
         if File.directory?(@view)
-          Dir.glob(@view + "/**/*.wavy") do |template|
-            full_path = template.dup
-            full_path.slice! @view
+          template_dir = @view
 
+          Dir.glob(template_dir + "/**/*.wavy") do |template|
             filename = File.basename(template)
 
-            template = FILE_IMPORTER.load(template)
-            render(template, full_path)
+            if filename[0] != "_"
+
+              file_path = File.expand_path(template)
+              full_path = template.dup
+              full_path.slice! template_dir
+
+              filename = File.basename(template)
+
+              template = FILE_IMPORTER.load(template)
+              render(template, full_path, file_path)
+            end
           end
         else
           filename = File.basename(@view)
           template = FILE_IMPORTER.load(@view)
-          render(template, filename)
+          render(template, filename, @view)
         end
 
       rescue Exception => e
@@ -64,37 +72,43 @@ module Wavy
 
     # Saves parsed template.
     #
-    # @param (String) view Content of the view
-    def render(view, filename)
-      output = Wavy::Models::Template.new(view).parse
+    # @param (String) view Content of the template
+    # @param (String) filename The path and filename of the template
+    # @param (String) path Path to where the templates should be saved
+    def render(view, filename, path)
+      output = Wavy::Models::Template.new(view, path).parse
 
       if @save != false
-        filename = filename.gsub("#{FILE_SUFFIX}", "")
-        path = File.expand_path(@save)
+        file_path = filename.gsub("#{FILE_SUFFIX}", "")
+        file_name = File.basename(file_path)
 
-        if filename[0] == "/"
-          filename[0] = "" 
-        end
+        if file_name[0] != "_"
+          path = File.expand_path(@save)
 
-        if path[-1,1] == "/"
-          path = path + filename
-        else
-          path = path + "/" + filename
-        end
-
-        begin
-          dirname = File.dirname(path)
+          if file_path[0] == "/"
+            file_path[0] = "" 
+          end
 
-          unless File.directory?(dirname)
-            FileUtils.mkdir_p(dirname)
+          if path[-1,1] == "/"
+            path = path + file_path
+          else
+            path = path + "/" + file_path
           end
 
-          file = File.open(path, "w")
-          file.write(output) 
-        rescue IOError => e
-          raise 'Could not save file.'
-        ensure
-          file.close unless file == nil
+          begin
+            dirname = File.dirname(path)
+
+            unless File.directory?(dirname)
+              FileUtils.mkdir_p(dirname)
+            end
+
+            file = File.open(path, "w")
+            file.write(output) 
+          rescue IOError => e
+            raise 'Could not save file.'
+          ensure
+            file.close unless file == nil
+          end
         end
       else
         puts output

data/lib/wavy/models/mixins.rb

@@ -4,23 +4,41 @@ module Wavy
 
     class Mixins
 
-      @data = {}
+      @dataFunctions = {}
+      @dataTemplates = {}
 
-      # Add a mixin to the data model.
+      # Add a mixin function to the data model.
       #
       # @param (String) id Unique name of the import
       # @param (Tree::MixinNode) node Mixin node object
-      def self.add(id, node)
-        if !@data[id]
-          @data[id] = node
+      def self.addFunction(id, node)
+        if !@dataFunctions[id]
+          @dataFunctions[id] = node
         end
       end
 
-      # Get all of the mixin definitions.
+      # Add a mixin include to the data model.
       #
-      # @return (Object) @data Object of mixins
-      def self.get()
-        return @data
+      # @param (String) id Unique name of the import
+      # @param (Tree::MixinNode) node Mixin node object
+      def self.addTemplate(id, node)
+        if !@dataTemplates[id]
+          @dataTemplates[id] = node
+        end
+      end
+
+      # Get all of the mixin function definitions.
+      #
+      # @return (Object) @dataFunctions Object of mixins
+      def self.getFunctions()
+        return @dataFunctions
+      end
+
+      # Get all of the mixin include definitions.
+      #
+      # @return (Object) @dataTemplates Object of mixins
+      def self.getTemplates()
+        return @dataTemplates
       end
 
     end

data/lib/wavy/models/template.rb

@@ -7,14 +7,21 @@ module Wavy
       # (String) Original template content
       attr_reader :content
 
+      # (String) Original template path
+      attr_reader :path
+
       # (String) Compiled template content
       attr_reader :compiled
 
       # Creates a new view template
       #
+      # @param (String) content Content of file
+      # @param (String) path Path to file
+      #
       # @return (String) content The view content (string/html)
-      def initialize(content)
+      def initialize(content, path)
         @content = content
+        @path = path
         @compiled = ""
       end
 
@@ -22,7 +29,7 @@ module Wavy
       #
       # @return (String) @compiled Compiled output
       def parse
-        @compiled = Wavy::Parsers::Mixin.parse(@content)
+        @compiled = Wavy::Parsers::Mixin.parse(@content, @path)
 
         return @compiled
       end

data/lib/wavy/nodes/mixin.rb

@@ -4,21 +4,24 @@ module Wavy
 
     class Mixin
 
-      # (Array) Params of mixin
-      attr_reader :params
-      
       # (String) Content within mixin
       attr_reader :content
 
+      # (Array) Params of mixin
+      attr_reader :params
+      
       # Creates a new Mixin node
       #
       # @param (String) name Name of mixin
-      # @param (String) params Specified arguments
       # @param (String) content Content of mixin
-      def initialize(name, params, content)
+      # @param (String|Boolean) params Specified arguments
+      def initialize(name, content, params = false)
         @name = name
-        @params = get_params(params)
         @content = content
+
+        if params != false
+          @params = get_params(params)
+        end
       end
 
       # Converts string of mixin parameters to an array.

data/lib/wavy/parsers/import.rb

@@ -34,7 +34,8 @@ module Wavy
         files = Wavy::Models::Imports.get
 
         files.each do |key, value|
-          Wavy::Parsers::Mixin.defined(value.content)
+          Wavy::Parsers::Mixin.definedFunctions(value.content)
+          #Wavy::Parsers::Mixin.definedTemplates(value.content)
         end
       end
 

data/lib/wavy/parsers/mixin.rb

@@ -7,36 +7,142 @@ module Wavy
       # Finds all user-defined mixins.
       #
       # @param (String) data Content
-      def self.defined(data)
+      def self.definedFunctions(data)
         pattern = /^(@mixin)\s(.*)\((.*)\.*\)\s{((?:[^{}]|{\$([^}]*)}|{{([^}]*)}})*)}/
         matches = data.scan(pattern)
 
         if matches.length > 0
           matches.each do |match|
-            mixin_node = Wavy::Nodes::Mixin.new(match[1], match[2], match[3])
+            name = "function-" + match[1]
+            content = match[3]
+            params = match[2]
 
-            Wavy::Models::Mixins.add(match[1], mixin_node)
+            mixin_node = Wavy::Nodes::Mixin.new(name, content, params)
+
+            Wavy::Models::Mixins.addFunction(name, mixin_node)
+          end
+        end
+      end
+
+      # Finds all user-defined mixins.
+      #
+      # @param (String) content Content
+      # @param (String|Boolean) path Template path
+      def self.definedTemplates(content, path = false)
+        pattern = /(@import)\s\"(.*)\"/
+        matches = content.scan(pattern)
+
+        if matches.length > 0
+          matches.each do |match|
+            file = match[1]
+
+            name = "template-" + file
+
+            if path != false
+              base_dir = File.expand_path(File.dirname(path))
+              file_base_dir = File.expand_path(path)
+              full_filename = base_dir + "/" + file
+
+              # Check if full filename was included
+              if File.file?(full_filename)
+
+                content = FILE_IMPORTER.load(base_dir + "/" + file)
+                content = parse(content, path)
+                mixin_node = Wavy::Nodes::Mixin.new(name, content, false)
+
+                Wavy::Models::Mixins.addTemplate(name, mixin_node)
+              else
+                imported_path_file = File.basename(file)
+
+                if imported_path_file[0] == "_"
+                  imported_path_file[0] = ""
+                else
+                  imported_path_file = file
+                end
+  
+                file_pattern = /(#{imported_path_file})\..*/
+                file_dir = file.scan(/(.*)\//)
+                file_contains_paths = file.include? '/'
+
+                if file_dir[0] || file_contains_paths == false
+                  if file_dir[0]
+                    dir_check_path = base_dir + "/" + file_dir[0][0] + "/*"
+                  else
+                    dir_check_path = base_dir + "/*"
+                  end
+
+                  directory_check = Dir.glob(dir_check_path)
+
+                  if directory_check.length > 0
+
+                    Dir.glob(dir_check_path) do |file_path|
+                      filename = File.basename(file_path)
+                      
+                      if filename[0] == "_"
+                        filename[0] = ""
+
+                        check_file_path = File.dirname(file_path) + "/" + filename
+                      else
+                        check_file_path = File.dirname(file_path) + "/" + filename
+                      end
+
+                      file_matches = check_file_path.scan(file_pattern)
+
+                      if file_matches.length > 0
+                        file_matches.each do |file_match|
+                          file_match = file_match[0]
+
+                          content = FILE_IMPORTER.load(file_path)
+                          content = parse(content, file_path)
+
+                          mixin_node = Wavy::Nodes::Mixin.new(name, content, false)
+
+                          Wavy::Models::Mixins.addTemplate(name, mixin_node)
+                        end
+                      end
+                    end
+                  else
+                    raise "Could not find imported file A: " + file + "\n   From: " + path
+                  end
+                else
+                  raise "Could not find imported file B: " + path
+                end
+              end
+            end
           end
         end
       end
 
-      # Finds all included mixins.
+      # 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)
+      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
+      #
+      # @return (String) template Parsed content
+      def self.parseFunctions(template)
         # Search for mixin includes
         pattern = /(@include)\s(.*)\((.*)\)/
         matches = template.scan(pattern)
 
-        mixins = Wavy::Models::Mixins.get
+        mixins = Wavy::Models::Mixins.getFunctions
 
         # Go through and parse each include
         if matches.length > 0
           matches.each do |match|
-            if(mixins[match[1]])
-              mixin = mixins[match[1]]
+            if(mixins["function-"+match[1]])
+              mixin = mixins["function-"+match[1]]
               params = match[2].split(",");
               content = mixin.content
 
@@ -64,6 +170,43 @@ module Wavy
         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)
+        # Search for mixin includes
+        pattern = /(@import)\s\"(.*)\"/
+        matches = template.scan(pattern)
+
+        mixins = Wavy::Models::Mixins.getTemplates
+
+        # Go through and parse each include
+        if matches.length > 0
+          matches.each do |match|
+            if(mixins["template-"+match[1]])
+
+              mixin = mixins["template-"+match[1]]
+              content = mixin.content
+
+              # Search for includes within mixins
+              content = parse(content, path)
+
+              # 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)
+            end
+          end
+        end
+
+        return template
+      end
+
     end
 
   end

data/lib/wavy/version.rb

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

metadata

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