sept 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 975454ccdb264c314891b01818ca7bdf7e5f84ab
-  data.tar.gz: 66161ae4a0e167b286aaf34b3e68f5834ad1c349
+  metadata.gz: ff22d39bb85df25a6eb4869e661c2cd4fcb557c7
+  data.tar.gz: 5b94445b1b72e802435e19b118638d56fdd558df
 SHA512:
-  metadata.gz: 7423c55788b587d66e3750398106c8b7aa36d0a13403d043a70d47f44888a5aa745cd27436f43528a68a237a4c4a7185e9fe4ff2abc8448a719c078d482947a5
-  data.tar.gz: e7446316fbe8d43f9c0b7a12d6a344cfcc36d5b7f1011f52f67f8a63c23eda0c67267cb5beecde8e6cc77ae61a655442d873367d1403d033795adeef129abe80
+  metadata.gz: 63d5b3571bbad8f9ce26efef999127cb3e095f7b9c52ced1007c404d6dd9b25d813b2f483e038f6ffbe4c9619e112102e879721afbeb84347ff1aea789292e96
+  data.tar.gz: 344f70a7803b00d9ca08896acbbfc333c53d84ee899b92d907a8a4f8b7f044d138c76157cb9617b29094e33b93e0c9fc87d1ef0a8db2162b4cccd5e5724c1120

data/bin/sept

@@ -1,61 +1,106 @@
 #!/usr/bin/env ruby
-
 %w(sept colorize json).each { |f| require f }
+HELP_MESSAGE =<<-END
+S-Expression Powered Template HyperText Markup Language
+Author: Timur Ismagilov <bouncepaw2@ya.ru>
+Repo:   https://github.com/bouncepaw/sept
+DESCRIPTION
+  This program parses SeptHTML — Lisp-inspired abstraction on HTML. Soon it
+  will support SeptCSS too.  SEPT HTML Just like in Lisp, pages are written in
+  parenthesized syntax — S-expressions.  Elements of sexpr are divided by space
+  character. Strings and other sexprs can be nested inside sexpr, except of the
+  first element — it must be string.  HTML tags are expressed by sexpr with at
+  least one element. For example:
+    (br)                 -> <br>
+    (p Hello)            -> <p>Hello</p>
+    (div (p Hello) (br)) -> <div><p>Hello</p><br></div>
+
+  If a string contains spaces, it must be surrounded by quotes. There is no
+  difference between double and single quotes. C-style escape sequences
+  are supported, I think. For example:
+    (title "Demo page")   -> <title>Demo page</title>
+    (title 'Demo page')   -> <title>Demo page</title>
+    (title "\"Demo page") -> <title>"Demo page</title>
+    (title Demo page)     -> <title>Demopage</title>
+
+  So, second, third, fourth...last elements are children of the tag. To add
+  attribute to a tag, you need to write them as usual after tag name, but they
+  nust be enclosed by quotes. For example:
+    ("button onclick='buttonPressed()'" "Click this button")
+    -> <button onclick='buttonPressed()'>Click this button</button>
+
+  There is CSS-inspired shortcut for class and id attributes. Multiple classes
+  can be written, but only one id can be used and it must be placed after
+  classes. For example:
+    (p.text "This is text")     -> <p class="text">This is text</p>
+    (p.the#best "This is best") -> <p class="the" id="best">This is best</p>
+    (p.one.two Hey)             -> <p class="one two">Hey</p>
+
+CLI UTILITY
+  After installing `sept` gem, `sept` utility is installed too. This section
+  covers it. Several arguments are understood by the program:
+
+    sept -v, sept --version
+      Prints version and exits.
+
+    sept -h, sept --help
+      Prints this message and exits.
+
+    sept -d <data> <files>, sept --data <data> <files>
+      You pass JSON hash to <data> for parser to use as parameters. You can
+      read more about parameters in the section above. <files> are filenames of
+      files, they must have one of extensions supported by Sept. For example:
+        $ sept -d {"name":"John Smith"} bio.septh not_bio
+        `bio.smith` will be parsed and saved in `bio.html`, `not_bio` will be
+        ignored and error message will be printed.
+
+    sept -f <json file> <files>, sept --file <json file> <files>
+      Same as above, but instead of JSON hash, you pass name of the file with
+      JSON hash. For example:
+        $ cat data
+        {"name":"John Smith"}
+        $ sept -f data bio.septh not_bio
+        `bio.smith` will be parsed and saved in `bio.html`, `not_bio` will be
+        ignored and error message will be printed.
+
+    sept <files>
+      Same as above, but no parameters are passed. If any of the files you
+      passed needs it, error message will be printed and the program will stop.
+END
+def validate_list_of_files(list_of_files)
+  correct_ones = []
+  list_of_files.each do |file|
+    if %w(.septh .septc).include? file
+      correct_ones << file
+    else
+      puts "ERROR #{file} is not a Sept file. Use `.septh` or `.septc`".red
+    end
+  end
+end
 
 if ARGV.length == 0
   puts "ERROR No arguments passed!".red
+  exit 1
 else
   case ARGV[0]
   when '-h', '--help' # help
-    puts <<-TEXT
-    S-Expression Powered Template HyperText Markup Language
-
-    EXAMPLE
-      test.sept:
-      (html
-        (head
-          (title Example)
-          (style ".heading { color: red }"))
-        (body
-          ("h1 class='heading'" Example)
-          (p %{param})))
-
-      After running `sept -d {"param":"Paragraph"} test.sept` you will get
-      test.html file:
-      <html>
-        <head>
-          <title>Example</title>
-          <style>.heading { color: red }</style>
-        </head>
-        <body>
-          <h1 class="heading">Example</h1>
-          <p>Paragraph</p>
-        </body>
-      </html>
-
-    SHELL ARGUMENTS
-      sept -v, sept --version
-        Prints version and exits.
-      sept -h, sept --help
-        Prints this message and exit.
-      sept -d <data> <files>, sept --data <data> <files>
-        You pass JSON hash to <data> for parser to use as parameters.
-        <files> are filenames of files.
-      sept -f <json file> <files>, sept --file <json file> <files>
-        Same as above, but instead of JSON hash, you pass name name of the file
-        with JSON hash.
-    TEXT
+    puts HELP_MESSAGE
   when '-v', '--version'
     # TODO: fetch version from sept.gemspec automatically
-    puts "SEPT HTML version 1.4.0"
+    puts "SEPT HTML version 1.4.2"
   when '-d', '--data'
-    puts "Passed data as argument"
-    sept = Sept.new JSON.parse(ARGV[1]), ARGV[2..-1]
-  when '-f', '-file'
-    puts "Passed data as file"
-    sept = Sept.new JSON.parse(File.read ARGV[1]), ARGV[2..-1]
+    puts "Passed data as argument".light_blue
+    params = JSON.parse ARGV[1]
+    list_of_files = validate_list_of_files ARGV[2..-1]
+  when '-f', '--file'
+    puts "Passed data as file".light_blue
+    params = JSON.parse File.read ARGV[1]
+    list_of_files = validate_list_of_files ARGV[2..-1]
   else
-    puts "No passed data"
-    sept = Sept.new({}, ARGV)
+    puts "No passed data".light_blue
+    params = {}
+    list_of_files = validate_list_of_files ARGV
   end
 end
+
+sept = Sept.new(params, list_of_files)

data/lib/sept.rb

@@ -28,7 +28,7 @@ class Sept
   # @param params [Hash] Hash with parameters.
   # @params files_to_parse [Array] List of files program will try to parse
   def initialize(params, files_to_parse)
-    @params = params.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+    @params = params
     @html = ''
 
     files_to_parse.each { |f| self.cook f }
@@ -39,38 +39,34 @@ class Sept
   # @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
   #
   # @param filename [String] Name of file to 'cook'
   def cook(filename)
-    unless File.extname(filename) == ".sept"
-      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}:\n#{file}"
 
-    new_filename = filename[0..-6] + ".html"
-    new_file = self.generate file
+    filename = filename[0..-5] + 'html'
+    file = self.generate file
 
     # 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}"
+    File.new filename, 'w+' unless File.file? filename
+    File.write filename, file
+    puts "Parsed and saved in #{filename}:\n#{file}"
   end
 
   # Recursive function that turns everything in `node` to a string
   #
   # @param node [Array, String] A Sept node
-  def prepare(node)
+  def self.prepare(node)
     node.each_with_index do |sub, i|
       if sub.is_a? Array
-        self.prepare sub
+        Sept.prepare sub
       else
         node[i] = sub.to_s
       end
@@ -91,7 +87,7 @@ class Sept
           node = []
           node[0] = file
         else
-          temp = self.unfold_tag node[0]
+          temp = Sept.unfold_tag node[0]
           @html << "<#{temp}>"
           node[1..-1].each { |e| self.to_html e }
           @html << "</#{temp.split(' ')[0]}>"
@@ -111,7 +107,7 @@ class Sept
   #
   # @param tag [String] String like `tag.class.class2#id other-arg=""`
   # @return [String] Unfolded tag
-  def unfold_tag(tag)
+  def self.unfold_tag(tag)
     halves = tag.split(' ')
     half = halves[0]
 
@@ -129,8 +125,7 @@ class Sept
       half = temp[0]
     end
 
-    tag_name = half
-    ret = tag_name
+    ret = half
     ret << " class='#{klass}'" unless klass.empty?
     ret << " id='#{id}'" unless id.empty?
     ret << " #{halves[1]}" unless halves[1].nil?

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sept
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Timur Ismagilov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies: []
 description: |2
-      Write your HTML pages like Lisp code. Support of included files,
-      parameters. CLI utility provided. Run `sept -h` for more info
+      Write your HTML pages like Lisp code. CLI utility. Run `sept -h` for info
 
       (html
         (head