rulex 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf20eb535ac1da63faf659b6a8adc218a8c668d
-  data.tar.gz: d597b856dbc1584e6bb58e8d1882444ad9a439df
+  metadata.gz: c0b7e37b8df7d840e4e80107918b400adf154118
+  data.tar.gz: 6c174975e1eae9fc164383f81a918ee363da107d
 SHA512:
-  metadata.gz: 6184f8d0366f77597729c749dba54a6e4d78a5aede1db6107566f314e2f4b2a146a9920f70327c75ac9f893b7dc72d4d81e3b3f44d151f3bf4089a3ef8b0d445
-  data.tar.gz: 165875c0edbb36db64c69033a29f392c8fe3163581633b063268fc6d56b8ac4530e56ea414bc5cf9ff4fc2755f44823446e7ff522fa70eda9dfc511264aa1b3c
+  metadata.gz: 5e47edef1e0851c47b8bb2622ae257824f5dc27bb004199aa5d7fbf2fcbf0253356f09e4deea3eeadd29ebd8bc32d7d252d18c072428736ecba65a7815821553
+  data.tar.gz: 456de3ad1e30f61e8482f7cf08f7199df06f3dc6dc5eed962718dca3f37f4fc096cd703bb1cfb05ab86bb3a0b0dd6185f82c383a9b7a7e7b7a010b916fc62c9d

data/README.md

@@ -1,5 +1,7 @@
 # Rulex
 
+[![Join the chat at https://gitter.im/Nicowcow/rulex](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Nicowcow/rulex?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ![Travis-CI badge](https://api.travis-ci.org/Nicowcow/rulex.svg)
 [![Code Climate](https://codeclimate.com/github/Nicowcow/rulex/badges/gpa.svg)](https://codeclimate.com/github/Nicowcow/rulex)
 [![Test Coverage](https://codeclimate.com/github/Nicowcow/rulex/badges/coverage.svg)](https://codeclimate.com/github/Nicowcow/rulex/coverage)
@@ -70,7 +72,7 @@ end
 document do
   section "A Short Lecture on How to Count"
 
-  # You can use markdown
+  # You can use markdown (though you need `pandoc` to be installed)
   md "Pay attention, the following is *very* important."
 
 # You can of course call the functions you defined (AND NOT BE LIMITED TO 9 ******* ARGUMENTS)
@@ -179,9 +181,7 @@ That's the point. Seriously, the code might need some refactoring, and can alway
 
 * `Rulex::Tex::Grammar::Document` is a big misnommer! It should be changed to something that reflects better what its role is.
 * `Rulex::Rex::Reader#raw` might not be the best name either. Maybe change it to text.
-* Add markdown support to `Rulex::Rex::Reader` through Pandoc
 * The parser needs some beefin-up (not sure what it does with spaces, especially with command options)
-* Maybe add some syntax for LaTeX commands to output text directly rather than store the command in the tree
 * Coffee is on me if you write a Vim plugin
 * Another coffee if you also write a Rake task.
 * There should be some special delimiters like Ruby's `#{...}` (maybe `#< ... >`) which would translate all method calls to `pure_` method calls. That would make inlining method calls in strings much easier.

data/lib/rulex/rex/reader.rb

@@ -1,13 +1,34 @@
 require 'pandoc-ruby'
+require 'yaml'
+
+#grammar_path = File.join(File.dirname(File.expand_path(__FILE__)),
+#'rulex.treetop')
+#Treetop.load grammar_path
+
+
+
+
+# Used when reading YAML
+class Object
+  def deep_symbolize_keys
+    return self.inject({}){|memo,(k,v)| memo[k.to_sym] = v.deep_symbolize_keys; memo} if self.is_a? Hash
+    return self.inject([]){|memo,v    | memo           << v.deep_symbolize_keys; memo} if self.is_a? Array
+    return self
+  end
+end
+
 
 module Rulex
   module Rex
     class Reader
-
       def initialize
         @content = []
         @content_stack = [@content]
         @latex_reader = Rulex::Tex::Reader.new
+        @delimiters = {
+          raw: { open: "<##", close: "##>"},
+          tex: { open: "<(#", close: "#)>"}
+        }
       end
 
       # Feeds instructions, either as a [String] or Rulex instructions (parsed and then interpreted
@@ -28,9 +49,20 @@ module Rulex
         instance_eval rex_to_ruby str
       end
 
-      # There are a few characters ('\\', '\[' and '\]') that even %q[] escapes
       def rex_to_ruby str
-        str.gsub(/<##(((?!##>)[\s\S])+)##>/) { |m| "raw %q[" + $1.gsub("\\","\\\\\\\\") + "]"}
+        @delimiters.inject(str) do |str, d|
+          key = d.first
+          val = d[1]
+
+          open_delimiter = Regexp.escape val[:open]
+          close_delimiter = Regexp.escape val[:close]
+
+          regexp = /#{open_delimiter}(((?!#{close_delimiter})[\s\S])+)#{close_delimiter}/
+
+          # There are a few characters ('\\', '\[' and '\]') that even %q[] "un"-escapes,
+          # hence the second gsub
+          str.gsub(regexp) { |m| "#{key} %q[" + $1.gsub("\\","\\\\\\\\") + "]"}
+        end
       end
 
       def add_node_to_content node
@@ -55,8 +87,37 @@ module Rulex
         append_nodes_to_content @latex_reader.read(str).to_a
       end
 
-      def import filepath
-        read File.open(filepath).read
+
+      # TODO
+      def import str
+        import_file str
+      end
+
+
+      # Reads a file, given a filepath
+      # @filepath a [String]
+      # @return self (the Rulex::Rex::Reader)
+      def import_file filepath
+        content = File.read(filepath)
+        import_content content
+      end
+
+
+      # Reads some content
+      # @content a [String]
+      # @return self (the Rulex::Rex::Reader)
+      def import_content content
+        if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+          content = $'
+          data = YAML.load($1).deep_symbolize_keys
+        end
+        content ||= ""
+        data ||= {}
+        if(delimiters = data[:delimiters])
+          @delimiters.merge! delimiters
+        end
+
+        read content
       end
 
       def export
@@ -66,14 +127,14 @@ module Rulex
       def build_tex_command(name, params)
 
         fail ArgumentError, "Command name must be a String or a Symbol, got #{name} of type #{name.class}" unless
-            String === name or Symbol === name
+        String === name or Symbol === name
 
         case params.length
         when 0
           {type: :command, name: name}
         when 1
           fail ArgumentError "Command arguments must all be String s or Symbol s, got #{params}" unless
-            params.all?{|s| String === s or Symbol === s}
+          params.all?{|s| String === s or Symbol === s}
           {type: :command, name: name, arguments: params} 
         when 2
           first = params[0]

data/lib/rulex/version.rb

@@ -1,3 +1,3 @@
 module Rulex
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulex
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nicolas Mattia
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop