sept 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7344a5f0ac93e272ca70fcce0f415daebcdd241
-  data.tar.gz: efbc7e7b29f83528821e3186ce389d6229703ffe
+  metadata.gz: 877a538c2d04ccdf7b6bb1835008707e7c51a6ea
+  data.tar.gz: 05616b59c02b6cc45282a97143b0c1f1e4c7071b
 SHA512:
-  metadata.gz: 1049533138a3de4cd65dd9a20e1b37f76efe74d64d1d36e983af7f3cc52d7792f89e0f0a85573999714c0327269e37b1280345df35775db13254567a3824606b
-  data.tar.gz: 5acdb9e9ca9a43d2b7f3c164d3a166490f750de7b92edf9d545ff024b307798908bbcdd2df5a24a51314aa94171c87cf72897a65ef8821d053e2faf933cfc702
+  metadata.gz: b7e491d390763c0efb8b88950b2234697e110b887bdf80f2a666d9bb9b487e6f8d1dd13c601b5b04a4412578ffa090a2c4c6f7008490936502777ec2338e759d
+  data.tar.gz: a1cf48909ed536bc1d4ff23e6f6ef23a3b12679387f4fd3fd9b531113ec54eb3903ff56ee6f858db065c890090ce5476839d14a3547df9747118a910db4f410e

data/bin/sept

@@ -17,13 +17,13 @@ else
       'validation coming soon'
   when "-v" # version
     # TODO: fetch version from sept.gemspec automatically
-    puts "SEPT HTML version 1.2.2"
+    puts "SEPT HTML version 1.3.0"
   when "-d" # data
-    # TODO: `eval` is bad, add validation or something like that
-    #       maybe json?
+    # TODO: replace this with json
     puts "Passed data as argument"
     sept = Sept.new(eval(ARGV[1]), ARGV[2..-1])
   when '-f' # file
+    # TODO: replace this with json
     puts "Passed data as file"
     sept = Sept.new(eval(File.read ARGV[1]), ARGV[2..-1])
   else

data/lib/sept.rb

@@ -23,7 +23,7 @@
 # - https://github.com/bouncepaw/sept
 class Sept
 
-  # Constructor
+  # Constructor. The only method you would need
   #
   # @param params [Hash] Hash with parameters. Keys are symbols, values are strings.
   # @params files_to_parse [Array] List of files program will try to parse
@@ -34,12 +34,12 @@ class Sept
     files_to_parse.each { |f| self.cook f }
   end
 
-  # Method that generates ready HTML file from Sept file
+  # Method that chains lots of methods
   #
   # @param file [String] Sept file
   # @return [String] HTML file
   def generate(file)
-    self.to_html(self.prepare(SXP.read(file))) % @params
+    self.to_html(self.prepare SXP.read file) % @params
   end
 
   # Function that 'cooks' passed file. It logs some info. The name is bad
@@ -47,13 +47,13 @@ class Sept
   # @param filename [String] Name of file to 'cook'
   def cook(filename)
     unless File.extname(filename) == ".sept"
-      puts "#{filename} is not `.sept` file, so can't parse it!".red
+      puts "ERROR #{filename} is not `.sept` file, so can't parse it!".red
       return
     end
     @html = ''
 
     file = File.read filename
-    puts "got #{filename}, its content is:\n#{file}"
+    puts "Got #{filename}, its content is:\n#{file}"
 
     new_filename = filename[0..-6] + ".html"
     new_file = self.generate file
@@ -61,11 +61,10 @@ class Sept
     # Create file if it does not exist yet
     File.new new_filename, 'w+' unless File.file? new_filename
     File.write new_filename, new_file
-    puts "parsed #{filename} and saved in #{new_filename}:\n #{new_file}"
+    puts "Parsed #{filename} and saved in #{new_filename}:\n #{new_file}"
   end
 
-  # Recursive function that turns everything in `node` to a string and handles
-  # including of other files (well, will handle)
+  # Recursive function that turns everything in `node` to a string
   #
   # @param node [Array, String] A Sept node
   def prepare(node)
@@ -74,29 +73,31 @@ class Sept
         self.prepare sub
       else
         node[i] = sub.to_s
-        # TODO: finish this thing
-        if node[0] == "#include"
-          file = self.generate File.read node[1].to_s
-          node.pop until node.length == 0
-          node[0] = file
-        end
       end
     end
   end
 
-  # Recursive function that generates HTML string.
+  # Recursive function that generates HTML string and handles `#include`
   #
   # @param node [Array, String] A Sept node
   # @return [String]
   def to_html(node)
     if node.is_a? Array
-      if node.length == 1 then @html << "<#{node[0]}/>"
+      if node.length == 1
+        @html << "<#{node[0]}/>"
       else
-        @html << "<#{node[0]}>"
-        node[1..-1].each { |e| self.to_html e }
-        @html << "</#{node[0].split(' ')[0]}>"
+        if node[0] == "#include"
+          file = self.generate File.read node[1].to_s
+          node = []
+          node[0] = file
+        else
+          @html << "<#{node[0]}>"
+          node[1..-1].each { |e| self.to_html e }
+          @html << "</#{node[0].split(' ')[0]}>"
+        end
       end
-    else @html << node
+    else
+      @html << node
     end
 
     @html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sept
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Timur Ismagilov
@@ -10,8 +10,12 @@ bindir: bin
 cert_chain: []
 date: 2017-10-04 00:00:00.000000000 Z
 dependencies: []
-description: Write your HTML pages like Lisp code. Support of included files,     parameters.
-  CLI utility provided.
+description: "    Write your HTML pages like Lisp code. Support of included files,\n
+  \   parameters. CLI utility provided.\n\n    Example:\n    ```\n    (html\n      (head\n
+  \       (title \"Hello world\")\n        (style \".class { color: blue }\"))\n      (body\n
+  \       (\"p class='class'\" \"Note that if a tag has attributes, they are expressed
+  this way\")\n        (p Cool?)\n        (p \"This is %{param}\")))\n    ```\n\n\t\tThen
+  run:\n\t\t```\n\t\tsept -d '{:param=>\"Parameter\"}' file.sept\n\t\t```\n"
 email: bouncepaw2@ya.ru
 executables:
 - sept