commaparty 0.0.3pre → 0.0.4pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ccf4025df7a717391079619f63559d9018095a7
-  data.tar.gz: 1245299fe3cca38daa9748b5e4db70ba8fdd15c2
+  metadata.gz: d65c386526a36e92368ff878973c043eb17c3978
+  data.tar.gz: 6cf03a286ed901941f92fc07e524baa55f570ed2
 SHA512:
-  metadata.gz: 374c05013a8e124e6a993192866604231007c6f9c8cdaccbb0ae711afebe49a832aa4c773444763f208f04db9a1699fc0eff8c509c022e817e451bcb14dda2f2
-  data.tar.gz: b646a876669d879644a3aef76d10aa7cd7ecb788cc4ee548f78f7786efda463d2421ed903ee74f10b913ee0156d943c28301ecee6808a5193376c1340dc45905
+  metadata.gz: 0be2894400b3eb941b789afbdfe9a336c9512198efc9016dfd41320620d30a4cda20c22183f8d4abac90f62ac342875fec16dd27e80cb97de8e0e97add24d39a
+  data.tar.gz: cbc489039ff84a4131eb58ced7f781125d4300e8b6741e968cedf88f08bb975d53f3a3a265688d3a608865b8b6d682a0daa35f3f2163cb6a249fff70bf6135d7

data/README.md

@@ -1,5 +1,7 @@
 CommaParty
 ======
+[![Build Status](https://travis-ci.org/ecmendenhall/commaparty.png?branch=master)](https://travis-ci.org/ecmendenhall/commaparty)
+
 CommaParty is a Ruby implementation of Clojure's
 [Hiccup](https://github.com/weavejester/hiccup/) HTML generation library.
 It uses arrays to represent elements, and hashes to represent an element's

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/commaparty/markup.rb

@@ -9,19 +9,25 @@ module CommaParty
     end
 
     def call
+      build(@hiccup).doc.to_html
+    end
+
+    def builder
       build(@hiccup)
     end
 
+    def hiccup
+      @hiccup.flatten(1)
+    end
+
     private
 
     def build(elements)
-      doc = Nokogiri::XML::Builder.new do |doc|
-        doc.root do |root|
-          elements.each do |element|
-            create_child(root, element)
-          end
+      Nokogiri::XML::Builder.new do |doc|
+        elements.each do |element|
+          create_child(doc, element)
         end
-      end.doc.root.children.to_html
+      end
     end
 
     def create_child(node, element)

data/lib/commaparty/version.rb

@@ -1,3 +1,3 @@
 module CommaParty
-  VERSION = "0.0.3pre"
+  VERSION = "0.0.4pre"
 end

data/lib/commaparty/xml.rb

@@ -9,20 +9,13 @@ module CommaParty
     end
 
     def initialize(markup)
-      @markup = CommaParty::Markup.new(markup).call
+      @markup = CommaParty::Markup.new(markup)
     end
 
     def call
-      build(@markup)
+      @markup.builder.to_xml
     end
 
-    private
-
-    def build(markup)
-      Nokogiri::XML::Builder.new do |doc|
-        doc << markup
-      end.to_xml
-    end
   end
 
 end

data/lib/commaparty.rb

@@ -17,5 +17,9 @@ module CommaParty
     CommaParty::Markup.new(hiccup).call
   end
 
+  def self.builder(hiccup)
+    CommaParty::Markup.new(hiccup).builder
+  end
+
 end
 

data/spec/commaparty/markup_spec.rb

@@ -7,47 +7,69 @@ describe CommaParty::Markup do
 
     it 'generates a single tag' do
       html = described_class.new([:tag]).call
-      expect(html).to eq("<tag></tag>")
+      expect(html).to eq("<tag></tag>\n")
     end
 
     it 'generates a single tag with an attribute' do
       html = described_class.new([:tag, {attribute: 'something'}]).call
-      expect(html).to eq("<tag attribute=\"something\"></tag>")
+      expect(html).to eq("<tag attribute=\"something\"></tag>\n")
     end
 
     it 'generates a single tag with a value' do
       html = described_class.new([:tag, 'value']).call
-      expect(html).to eq("<tag>value</tag>")
+      expect(html).to eq("<tag>value</tag>\n")
     end
 
     it 'generates two sibling tags' do
       html = described_class.new([:div, [:tag1], [:tag2]]).call
-      expect(html).to eq("<div>\n<tag1></tag1><tag2></tag2>\n</div>")
+      expect(html).to eq("<div>\n<tag1></tag1><tag2></tag2>\n</div>\n")
     end
 
     it 'generates nested tags' do
       html = described_class.new([:theparent, [:tag1], [:tag2]]).call
-      expect(html).to eq("<theparent><tag1></tag1><tag2></tag2></theparent>")
+      expect(html).to eq("<theparent><tag1></tag1><tag2></tag2></theparent>\n")
     end
 
     it 'handles tags with the same names as ruby methods' do
       html = described_class.new([:parent]).call
-      expect(html).to eq("<parent></parent>")
+      expect(html).to eq("<parent></parent>\n")
     end
 
     it 'handles tags with shortcut syntax' do
       html = described_class.new([:'tag.one.two.three#id']).call
-      expect(html).to eq("<tag class=\"one two three\" id=\"id\"></tag>")
+      expect(html).to eq("<tag class=\"one two three\" id=\"id\"></tag>\n")
     end
 
     it 'handles seqs in the tag body' do
       html = described_class.new([:ul, ["one", "two", "three"].map {|n| [:li, n]}]).call
-      expect(html).to eq("<ul>\n<li>one</li>\n<li>two</li>\n<li>three</li>\n</ul>")
+      expect(html).to eq("<ul>\n<li>one</li>\n<li>two</li>\n<li>three</li>\n</ul>\n")
     end
 
     it 'handles nils in the tag body' do
       html = described_class.new([:div, nil]).call
-      expect(html).to eq("<div></div>")
+      expect(html).to eq("<div></div>\n")
+    end
+  end
+
+  describe 'Generating builders' do
+
+    it 'returns a Nokogiri builder' do
+      builder = described_class.new([:div]).builder
+      expect(builder.class).to eq(Nokogiri::XML::Builder)
+    end
+
+    it 'produces the same XML' do
+      markup = described_class.new([:div, [:span, 'lol']])
+      expect(markup.builder.doc.to_html).to eq(markup.call)
+    end
+
+  end
+
+  describe 'Retrieving hiccup' do
+
+    it 'returns its hiccup' do
+      hiccup = described_class.new([:div, [:ul, (1..3).map {|n| [:li, n]}]]).hiccup
+      expect(hiccup).to eq([:div, [:ul, [[:li, 1], [:li, 2], [:li, 3]]]])
     end
 
   end

data/spec/commaparty_spec.rb

@@ -3,40 +3,46 @@ require 'commaparty'
 describe CommaParty do
 
   it 'has a helpful html method' do
-    expect(CommaParty.html([:tag])).to match('<html><tag></tag></html>')
+    expect(CommaParty.html([:tag])).to match("<html><tag></tag></html>\n")
   end
 
   it 'has a helpful xml method' do
-    expect(CommaParty.xml([:tag])).to match('<tag/>')
+    expect(CommaParty.xml([:tag])).to match("<tag/>\n")
   end
 
   it 'has a helpful markup method' do
-    expect(CommaParty.markup([:tag])).to match('<tag></tag>')
+    expect(CommaParty.markup([:tag])).to match("<tag></tag>\n")
+  end
+
+  it 'has a helpful builder method' do
+    builder = CommaParty.builder([:tag])
+    expect(builder.class).to eq(Nokogiri::XML::Builder)
+    expect(builder.doc.to_html).to eq(CommaParty.markup([:tag]))
   end
 
   context 'converts ruby syntax to html string' do
-    it { expect(CommaParty.markup [:script]).to eq "<script></script>" }
-    it { expect(CommaParty.markup [:p, "hello"]).to eq "<p>hello</p>" }
-    it { expect(CommaParty.markup [:p, [:em, "hello"]]).to eq "<p><em>hello</em></p>" }
-    it { expect(CommaParty.markup [:span, {:class => "foo"}, "bar"]).to eq "<span class=\"foo\">bar</span>" }
-    it { expect(CommaParty.markup [:div, {id: "email", class: "selected starred"}, "..."]).to eq "<div id=\"email\" class=\"selected starred\">...</div>" }
-    it { expect(CommaParty.markup [:a, {:href => "http://github.com"}, "GitHub"]).to eq "<a href=\"http://github.com\">GitHub</a>"}
+    it { expect(CommaParty.markup [:script]).to eq "<script></script>\n" }
+    it { expect(CommaParty.markup [:p, "hello"]).to eq "<p>hello</p>\n" }
+    it { expect(CommaParty.markup [:p, [:em, "hello"]]).to eq "<p><em>hello</em></p>\n" }
+    it { expect(CommaParty.markup [:span, {:class => "foo"}, "bar"]).to eq "<span class=\"foo\">bar</span>\n" }
+    it { expect(CommaParty.markup [:div, {id: "email", class: "selected starred"}, "..."]).to eq "<div id=\"email\" class=\"selected starred\">...</div>\n" }
+    it { expect(CommaParty.markup [:a, {:href => "http://github.com"}, "GitHub"]).to eq "<a href=\"http://github.com\">GitHub</a>\n"}
 
     context 'collections' do
-      it { expect(CommaParty.markup [:ul, ['a','b'].map { |x| [:li, x]}]).to eq "<ul>\n<li>a</li>\n<li>b</li>\n</ul>"}
-      it { expect(CommaParty.markup [:ul, (11...13).map { |n| [:li, n]}]).to eq "<ul>\n<li>11</li>\n<li>12</li>\n</ul>"}
+      it { expect(CommaParty.markup [:ul, ['a','b'].map { |x| [:li, x]}]).to eq "<ul>\n<li>a</li>\n<li>b</li>\n</ul>\n"}
+      it { expect(CommaParty.markup [:ul, (11...13).map { |n| [:li, n]}]).to eq "<ul>\n<li>11</li>\n<li>12</li>\n</ul>\n"}
     end
 
     context 'css shorthand' do
-      it { expect(CommaParty.markup [:'p.hi', "hello"]).to eq "<p class=\"hi\">hello</p>" }
-      it { expect(CommaParty.markup [:'p#hi', "hello"]).to eq "<p id=\"hi\">hello</p>" }
-      it { expect(CommaParty.markup [:'p.hi.greet.left', "hello"]).to eq "<p class=\"hi greet left\">hello</p>" }
-      it { expect(CommaParty.markup [:'p#hi.greet.left', "hello"]).to eq "<p class=\"greet left\" id=\"hi\">hello</p>" }
+      it { expect(CommaParty.markup [:'p.hi', "hello"]).to eq "<p class=\"hi\">hello</p>\n" }
+      it { expect(CommaParty.markup [:'p#hi', "hello"]).to eq "<p id=\"hi\">hello</p>\n" }
+      it { expect(CommaParty.markup [:'p.hi.greet.left', "hello"]).to eq "<p class=\"hi greet left\">hello</p>\n" }
+      it { expect(CommaParty.markup [:'p#hi.greet.left', "hello"]).to eq "<p class=\"greet left\" id=\"hi\">hello</p>\n" }
     end
 
     context 'different shaped trees' do
-      it { expect(CommaParty.markup [:p, "Hello ", [:em, "World!"]]).to eq "<p>Hello <em>World!</em></p>" }
-      it { expect(CommaParty.markup [:div, [:p, "Hello"], [:em, "World!"]]).to eq "<div>\n<p>Hello</p>\n<em>World!</em>\n</div>" }
+      it { expect(CommaParty.markup [:p, "Hello ", [:em, "World!"]]).to eq "<p>Hello <em>World!</em></p>\n" }
+      it { expect(CommaParty.markup [:div, [:p, "Hello"], [:em, "World!"]]).to eq "<div>\n<p>Hello</p>\n<em>World!</em>\n</div>\n" }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commaparty
 version: !ruby/object:Gem::Version
-  version: 0.0.3pre
+  version: 0.0.4pre
 platform: ruby
 authors:
 - Connor Mendenhall