hypertext 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed751f7bacf414010a50e266e61ad2124e9694b2f58e063c86c07aafdf6a7d0
-  data.tar.gz: f49d0b5f3ebed4ca55ca4ccb1d92eb01491f52069698ab8636da2cb6acae61a0
+  metadata.gz: bbc01410aa9d572f48b9e75e75ea14cd66300afbe1a71c6ce7209c090f011380
+  data.tar.gz: 79762344583a234e0a074d9dbb6adbf7827ef4cde156843766f433c0904349cd
 SHA512:
-  metadata.gz: 8f2fe8239fe6cf432af39a8b2382abe3097b1e9f0b092374cfadc588f5f595a1f690d42ae152c1a389e813d27d2481daa9c2f205ed4f3c10a0624a015d9d969e
-  data.tar.gz: f6da75a9e0c066a835e35abd2583b063b85c0d39d04aa0fe35036a7648625b93e22b0bb296beecd58fef3264f593975da6666ab1d9dfa7352bbb3cd800fad308
+  metadata.gz: ce7a3e26dd27873cafaba381462879e74ab3d6a7ab15636bb570e477ed59352cb8810609eb8ab8887d215916cdf649d6dcc22b8db1202dba6a67e76c4c8811d1
+  data.tar.gz: ec4e97e4bfb9c949c92bb538ddc4a7278bb234198a10068981a96532133d0da4d3386e5572d098b75ca9e1d06e812899adc9ddb48de51741597d8eb33c8e9bea

data/README.md

@@ -15,14 +15,14 @@ A basic example would look like this:
 
 ```ruby
 html = Hypertext.new do |h|
-  h.tag :div, class: "greeting" do |h|
-    h.tag :h1 do |h|
+  h.tag :div, class: "greeting" do
+    h.tag :h1 do
       h.text "hello world"
     end
 
     h.tag :hr
 
-    h.tag :p do |h|
+    h.tag :p do
       h.text "nice to meet you"
     end
   end

data/hypertext.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "hypertext"
-  s.version           = "0.0.1"
+  s.version           = "0.0.2"
   s.summary           = "Hypertext authoring"
   s.description       = "Hypertext authoring with Ruby"
   s.authors           = ["Michel Martens"]

data/lib/hypertext.rb

@@ -51,20 +51,24 @@ class Hypertext
     end
   end
 
-  def tag(name, attributes = {}, &block)
+  def tag(name, attributes = {})
     atts = compile(attributes)
 
     if block_given?
-      @dom.push "<#{name}#{atts}>"
-      @dom.push yield(self.class.new).to_a
-      @dom.push "</#{name}>"
+      @dom << "<#{name}#{atts}>"
+
+      original, @dom = @dom, []
+      yield
+      @dom = original << @dom
+
+      @dom << "</#{name}>"
     else
-      @dom.push "<#{name}#{atts} />"
+      @dom << "<#{name}#{atts} />"
     end
   end
 
   def text(value)
-    @dom.push(escape(value))
+    @dom << escape(value)
   end
 
   def to_a

data/test/all.rb

@@ -2,74 +2,74 @@ scope "Hypertext" do
   test "text" do
     expected = "hello world\n"
 
-    observed = Hypertext.new
-    observed.text "hello world"
+    ht = Hypertext.new
+    ht.text "hello world"
 
-    assert_equal expected, observed.to_s
+    assert_equal expected, ht.to_s
   end
 
   test "self-closing tags" do
     expected = "<br />\n"
 
-    observed = Hypertext.new
-    observed.tag :br
+    ht = Hypertext.new
+    ht.tag :br
 
-    assert_equal expected, observed.to_s
+    assert_equal expected, ht.to_s
   end
 
   test "opening and closing tags" do
     expected = "<span>\n  hello world\n</span>\n"
 
-    observed = Hypertext.new
-    observed.tag :span do |ht|
+    ht = Hypertext.new
+    ht.tag :span do
       ht.text "hello world"
     end
 
-    assert_equal expected, observed.to_s
+    assert_equal expected, ht.to_s
   end
 
   test "nested tags" do
     expected = "<div>\n  <p>\n    hello world\n  </p>\n</div>\n"
 
-    observed = Hypertext.new
-    observed.tag :div do |ht|
-      ht.tag :p do |ht|
+    ht = Hypertext.new
+    ht.tag :div do
+      ht.tag :p do
         ht.text "hello world"
       end
     end
 
-    assert_equal expected, observed.to_s
+    assert_equal expected, ht.to_s
   end
 
   test "passing a block to Hypertext.new" do
     expected = "<br />\n"
 
-    observed = Hypertext.new do |ht|
+    ht = Hypertext.new do |ht|
       ht.tag :br
     end
 
-    assert_equal expected, observed.to_s
+    assert_equal expected, ht.to_s
   end
 
   test "tags with attributes" do
     expected = "<input type=\"text\" name=\"person[name]\" value=\"Foo\" />\n"
 
-    observed = Hypertext.new do |ht|
+    ht = Hypertext.new do |ht|
       ht.tag :input, :type => "text", :name => "person[name]", :value => "Foo"
     end
 
-    assert_equal expected, observed.to_s
+    assert_equal expected, ht.to_s
   end
 
   test "custom indentation" do
     expected = "<p>\n....hello world\n</p>\n"
 
-    observed = Hypertext.new do |ht|
-      ht.tag :p do |ht|
+    ht = Hypertext.new do |ht|
+      ht.tag :p do
         ht.text "hello world"
       end
     end
 
-    assert_equal expected, observed.to_s("....")
+    assert_equal expected, ht.to_s("....")
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hypertext
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest