teepee 0.7.13 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e751967e7997f82ea66c79b025aeaaea9e31fb
-  data.tar.gz: 518c880d2425f637c31d379e81e88f59888d075d
+  metadata.gz: 60e3482978d3b2df2fe9f75b4713d2efed2b1d1d
+  data.tar.gz: dbc9c8e2aa8ac22c61da85428f233678c3fe43e1
 SHA512:
-  metadata.gz: 22eaf3449e3eeb6d448b95d59b6a7e7c6bd3bb393321e6bbadacc6b8bbcbd9094a01a86f29508750f7fcba76f063ca56f8bd9232cfa190019eb664d93bc7803f
-  data.tar.gz: 96083ada29bf091be21bccc75fe02cfb46d6047989708be4a39b895dd3b9436a8c803dcdd5986c431c0740ee65d7f155228efe82e0279eed49be93089cd3a4dd
+  metadata.gz: 533499ebcbbb7abcda31e7c145078d5363e6f66cb3f51c27dfb84e759549b5fc4bf2257e12b06155d11f4e890605722fabe35a14a574dd405173ddc75e82c9b8
+  data.tar.gz: c909a17971f3f676bdaaec9297b9881af81faa232afd766c7c9367f605949833ae1952ed15f018db884b5be01461af80d4bc929f4250a5a693e47ea274a10369

data/lib/teepee/command-parser.rb

@@ -224,6 +224,9 @@ module Teepee
            "href",
            "url"
         @@commander.link expressions
+      when "img",
+           "image"
+        @@commander.image expressions
       when "user",
            "user-id",
            "user_id"

data/lib/teepee/commander.rb

@@ -74,11 +74,23 @@ module Teepee
     def html_tag tag, expressions, attribs=nil
       opening_tag = if attribs
                       attribs_string = attribs.map {|k,v| %{#{k}="#{v}"}}.join " "
-                      "<#{tag} #{attribs_string}>"
+                      if expressions.nil?
+                        "<#{tag} #{attribs_string}/>"
+                      else
+                        "<#{tag} #{attribs_string}>"
+                      end
                     else
-                      "<#{tag}>"
+                      if expressions.nil?
+                        "<#{tag}/>"
+                      else
+                        "<#{tag}>"
+                      end
                     end
-      opening_tag + expressions.map(&:to_html).join + "</#{tag}>"
+      if expressions.nil?
+        opening_tag
+      else
+        opening_tag + expressions.map(&:to_html).join + "</#{tag}>"
+      end
     end
 
     def tb_href target, string
@@ -175,7 +187,7 @@ module Teepee
     end
 
     def br
-      "\n<br/>\n"
+      html_tag :br, nil
     end
 
     def cos angle
@@ -270,6 +282,20 @@ module Teepee
       command_error "Complex numbers are not yet supported."
     end
 
+    def image expressions
+      uri, *alt_text = expressions
+      uri = ERB::Util.html_escape uri.to_s
+      if not valid_uri? uri
+        command_error "Not a valid URI for the image."
+      else
+        if alt_text.empty?
+          html_tag :img, nil, {src: uri}
+        else
+          html_tag :img, nil, {src: uri, alt: alt_text}
+        end
+      end
+    end
+
     def it expressions
       html_tag :i, expressions
     end
@@ -344,7 +370,7 @@ module Teepee
     def log base, number
       if number.nil?
         number, base = base, number
-        ensure_numeric Math.log number # default to natural logarithm
+        ensure_numeric Math.log10 number # default to log base 10
       else
         ensure_numeric Math.log number, base
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teepee
 version: !ruby/object:Gem::Version
-  version: 0.7.13
+  version: 0.7.14
 platform: ruby
 authors:
 - Christopher Mark Gore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport