rulex 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 615cc7d413292fbe99bd79cb0cdaee48d9e6ca91
-  data.tar.gz: 32dfee7e649b5f48c60d1f5e0e2d59e37c01b382
+  metadata.gz: bed57ce48166e9fd4098a7bdb005aa1547f8a387
+  data.tar.gz: 2b7bdd9322fc92f6842bda43a39787dace26fffa
 SHA512:
-  metadata.gz: d506ff5ad0e7037afa8498884f06b4c591de5074b5de206480b21ca90b2e1db5011e36d517993eeb3f89334861e0918e6e0bc184c818b0d9eeda35a34107ccee
-  data.tar.gz: d4f609a790eb152cc056ec6fb26a0bdbb27711e719616dd6d003f5b629689510188f152348d0fbede1513714fcd259ffcda0c4644395ca7c5b02aca46c9c7fc8
+  metadata.gz: 426395fdabefb0a5003eea0a072599ca2df66d663113b754527fc92079ed5da31443a62380932d0bdb106837ccb927d6daf8a6d68e456f17552e50c8b9793a42
+  data.tar.gz: 785ab466a702b3e5a2787f91b457e464a2fc65ca718dc9af3d968610cf29ead1681319855d52ba4ee835b9eec80f8d148cf95607268ecfa7e7227c7813f09ee7

data/lib/rulex/rex/reader.rb

@@ -46,8 +46,16 @@ module Rulex
       end
 
       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
+
         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}
           {type: :command, name: name, arguments: params} 
         when 2
           first = params[0]
@@ -57,21 +65,22 @@ module Rulex
           elsif String === params[0] && String === params[1]
             {type: :command, name: name, arguments: [first, second]}
           else
-            error "something is not quite right with the parameters"
+            raise ArgumentError, "something is not quite right with the parameters"
           end
         else
-          error "wrong number of params"
+          raise ArgumentError, "wrong number of params"
         end
       end
 
-      def tex_command(name, params)
-        add_node_to_content build_tex_command name, params
-      end
 
       def depth
         @content_stack.length - 1
       end
 
+      def tex_command(name, *params)
+        add_node_to_content build_tex_command name, *params
+      end
+
       def tex_environment(name, *args, &block)
         new_node = {type: :environment, name: name, arguments: args}
         @content_stack.push []

data/lib/rulex/tex/writer.rb

@@ -7,30 +7,40 @@ module Rulex
       end
 
       def self.to_str item
+        raise TypeError, "item must be a Hash, got #{item}" unless Hash === item
+        raise ArgumentError, ":type must be defined" unless item[:type]
         case item[:type]
         when :command
+          raise TypeError, "command name must be a Symbol or a String" unless
+                        Symbol === item[:name] or String === item[:name]
+
           str = "\\#{item[:name]}"
           if opts = item[:options]
             str += '[' + opts.join(',') + ']'
           end
-          item[:arguments].each do |arg|
-            str += "{#{arg}}"
+          if args = item[:arguments] and not args.empty?
+            str += '{' + args.join('}{') + '}'
           end
           str += "\n"
         when :text
           res = item[:text]
         when :environment
-          str = "\\begin{#{item[:name]}}\n"
+          str = "\\begin{#{item[:name]}}"
+          if args = item[:arguments] and not args.empty?
+            str += '{' + args.join('}{') + '}'
+          end
+          str += "\n"
           if children = item[:children]
             str += item[:children].inject(""){|acc, c| acc += Rulex::Tex::Writer.to_str c} 
           end
           res = str += "\\end{#{item[:name]}}\n"
         else
           if item[:children]
-            str = ""
-            res = str += item[:children].inject(""){|acc, c| acc += Rulex::Tex::Writer.to_str c} if item[:children] else 
+            raise TypeError, "Children must form an array" unless Array === item[:children]
+            str = item[:children].inject(""){|acc, c| acc += Rulex::Tex::Writer.to_str c} if item[:children] 
+          else 
             ""
-            end
+          end
 
         end
       end

data/lib/rulex/version.rb

@@ -1,3 +1,3 @@
 module Rulex
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

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