RubyGems - sept - Versions diffs - 1.3.0 → 1.4.0 - Mend

sept 1.3.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

checksums.yaml +4 -4
data/bin/sept +46 -18
data/lib/sept.rb +40 -5
metadata +13 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877a538c2d04ccdf7b6bb1835008707e7c51a6ea
-  data.tar.gz: 05616b59c02b6cc45282a97143b0c1f1e4c7071b
+  metadata.gz: 975454ccdb264c314891b01818ca7bdf7e5f84ab
+  data.tar.gz: 66161ae4a0e167b286aaf34b3e68f5834ad1c349
 SHA512:
-  metadata.gz: b7e491d390763c0efb8b88950b2234697e110b887bdf80f2a666d9bb9b487e6f8d1dd13c601b5b04a4412578ffa090a2c4c6f7008490936502777ec2338e759d
-  data.tar.gz: a1cf48909ed536bc1d4ff23e6f6ef23a3b12679387f4fd3fd9b531113ec54eb3903ff56ee6f858db065c890090ce5476839d14a3547df9747118a910db4f410e
+  metadata.gz: 7423c55788b587d66e3750398106c8b7aa36d0a13403d043a70d47f44888a5aa745cd27436f43528a68a237a4c4a7185e9fe4ff2abc8448a719c078d482947a5
+  data.tar.gz: e7446316fbe8d43f9c0b7a12d6a344cfcc36d5b7f1011f52f67f8a63c23eda0c67267cb5beecde8e6cc77ae61a655442d873367d1403d033795adeef129abe80

data/bin/sept CHANGED Viewed

@@ -1,31 +1,59 @@
 #!/usr/bin/env ruby
-%w(sept colorize).each { |f| require f }
+%w(sept colorize json).each { |f| require f }
 if ARGV.length == 0
   puts "ERROR No arguments passed!".red
 else
   case ARGV[0]
-  when "-h" # help
-    puts 'S-Expression Powered Template HyperText Markup Language',
-      'To get version, run `sept -v`',
-      'To pass some data, run `sept -d <data> files...`',
-      '<data> is a ruby hash ({:key => "value",})',
-      'To pass some data via file, run `sept -f <datafile> files...`',
-      '<datafile> is a file with ruby hash',
-      'Be careful! Any ruby code can be passed along with hash,',
-      'validation coming soon'
-  when "-v" # version
+  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
+  when '-v', '--version'
     # TODO: fetch version from sept.gemspec automatically
-    puts "SEPT HTML version 1.3.0"
-  when "-d" # data
-    # TODO: replace this with json
+    puts "SEPT HTML version 1.4.0"
+  when '-d', '--data'
     puts "Passed data as argument"
-    sept = Sept.new(eval(ARGV[1]), ARGV[2..-1])
-  when '-f' # file
-    # TODO: replace this with json
+    sept = Sept.new JSON.parse(ARGV[1]), ARGV[2..-1]
+  when '-f', '-file'
     puts "Passed data as file"
-    sept = Sept.new(eval(File.read ARGV[1]), ARGV[2..-1])
+    sept = Sept.new JSON.parse(File.read ARGV[1]), ARGV[2..-1]
   else
     puts "No passed data"
     sept = Sept.new({}, ARGV)

data/lib/sept.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-%w(sxp colorize).each { |f| require f }
+%w(sxp colorize json).each { |f| require f }
 # Markup as it should have been
 # Write your page as s-expression structure
@@ -25,10 +25,10 @@ class Sept
   # Constructor. The only method you would need
   #
-  # @param params [Hash] Hash with parameters. Keys are symbols, values are strings.
+  # @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
+    @params = params.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
     @html = ''
     files_to_parse.each { |f| self.cook f }
@@ -91,9 +91,10 @@ class Sept
           node = []
           node[0] = file
         else
-          @html << "<#{node[0]}>"
+          temp = self.unfold_tag node[0]
+          @html << "<#{temp}>"
           node[1..-1].each { |e| self.to_html e }
-          @html << "</#{node[0].split(' ')[0]}>"
+          @html << "</#{temp.split(' ')[0]}>"
         end
       end
     else
@@ -102,5 +103,39 @@ class Sept
     @html
   end
+  # Function that unfolds dot-notation and hash-notation
+  # p.class.class-to#id onclick="..."
+  # 'p class="class class-too" id="id" onclick="..."'
+  # #id must be after .classes
+  #
+  # @param tag [String] String like `tag.class.class2#id other-arg=""`
+  # @return [String] Unfolded tag
+  def unfold_tag(tag)
+    halves = tag.split(' ')
+    half = halves[0]
+    id = ''
+    if half.include? '#'
+      temp = half.split('#')
+      id = temp[-1]
+      half = temp[0..-2].join('')
+    end
+    klass = ''
+    if half.include? '.'
+      temp = half.split('.')
+      klass = temp[1..-1].join(' ')
+      half = temp[0]
+    end
+    tag_name = half
+    ret = tag_name
+    ret << " class='#{klass}'" unless klass.empty?
+    ret << " id='#{id}'" unless id.empty?
+    ret << " #{halves[1]}" unless halves[1].nil?
+    ret
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sept
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Timur Ismagilov
@@ -10,12 +10,18 @@ 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,\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"
+description: |2
+      Write your HTML pages like Lisp code. Support of included files,
+      parameters. CLI utility provided. Run `sept -h` for more info
+      (html
+        (head
+          (title "Hello world")
+          (style ".red { color: blue }"))
+        (body
+          (p.red#cool-and-good "Handy classes and ids. Id must be last")
+          ("p onclick='func()'" "Other attributes are expressed that way")
+          (p "This is %{param}")))
 email: bouncepaw2@ya.ru
 executables:
 - sept