commaparty 0.0.1 → 0.0.2pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb1260fe51a78f3ddb15ecaf6dde6b7bf4454153
-  data.tar.gz: 20b13794581d73bc1c5320e13823db4f9110785e
+  metadata.gz: 3ff205c728b610398ebae49f09f8b3f7bd76b7aa
+  data.tar.gz: 2fa31a4f7a4267c4a4ddadc1d8288f6b7872f7c2
 SHA512:
-  metadata.gz: d740c51a965cb0432cf7115707abedcb8865f855460aa527eab4688e9678b553be9143898919799e17f889fd30d22f8db462c939a4ae43675ec6768d64b84e06
-  data.tar.gz: 79977c9adcd41ff2140d07156ad2f9874d54e1b4c8edffc062027765292c2388335ba63f8c5aad710582b9a7e7290d16f4efb2dc29fe3659f897fa422bdd8ef1
+  metadata.gz: 3b6b55a5955129843ad2c48b2f203c4e46126bc3a3c66fbf87df990d1aaf416a13418165cb60b1aa0e4b5e0f2f7a621ba33c7b2598238a860b62a8abc54921fe
+  data.tar.gz: 49d7511cb62731b6b664d4bb866252e85a492992930ef8c92f8d17db5e8416e80c9488459cfbc9057f811dc2f3939413c88f73896e1cad61c3f06b2994a77386

data/README.md

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

data/lib/commaparty/markup.rb

@@ -9,25 +9,19 @@ 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)
-      Nokogiri::XML::Builder.new do |doc|
-        elements.each do |element|
-          create_child(doc, element)
+      doc = Nokogiri::XML::Builder.new do |doc|
+        doc.root do |root|
+          elements.each do |element|
+            create_child(root, element)
+          end
         end
-      end
+      end.doc.root.children.to_html
     end
 
     def create_child(node, element)
@@ -37,7 +31,7 @@ module CommaParty
 
     def make_nodes(parent, children)
       children.each do |child|
-        if child.is_a?(String) || child.is_a?(Fixnum) || child.nil?
+        if child.is_a?(String) || child.is_a?(Fixnum)
           parent << child.to_s
         else
           create_child(parent, child)

data/lib/commaparty/version.rb

@@ -1,3 +1,3 @@
 module CommaParty
-  VERSION = "0.0.1"
+  VERSION = "0.0.2pre"
 end

data/lib/commaparty/xml.rb

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

data/lib/commaparty.rb

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

data/spec/commaparty/destructure_element_spec.rb

@@ -46,7 +46,7 @@ describe CommaParty::DestructureElement do
       expect(body).to eq([[:li, "one"], [:li, "two"], [:li, "three"]])
     end
 
-    it 'destructures an element with a tag in the body' do
+    it 'wat' do
       tag, attributes, body = described_class.new([:p, [:em, "hello"]]).call
       expect(tag).to eq(:p_)
       expect(attributes).to eq({})

data/spec/commaparty/markup_spec.rb

@@ -7,69 +7,42 @@ describe CommaParty::Markup do
 
     it 'generates a single tag' do
       html = described_class.new([:tag]).call
-      expect(html).to eq("<tag></tag>\n")
+      expect(html).to eq("<tag></tag>")
     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>\n")
+      expect(html).to eq("<tag attribute=\"something\"></tag>")
     end
 
     it 'generates a single tag with a value' do
       html = described_class.new([:tag, 'value']).call
-      expect(html).to eq("<tag>value</tag>\n")
+      expect(html).to eq("<tag>value</tag>")
     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>\n")
+      expect(html).to eq("<div>\n<tag1></tag1><tag2></tag2>\n</div>")
     end
 
     it 'generates nested tags' do
       html = described_class.new([:theparent, [:tag1], [:tag2]]).call
-      expect(html).to eq("<theparent><tag1></tag1><tag2></tag2></theparent>\n")
+      expect(html).to eq("<theparent><tag1></tag1><tag2></tag2></theparent>")
     end
 
     it 'handles tags with the same names as ruby methods' do
       html = described_class.new([:parent]).call
-      expect(html).to eq("<parent></parent>\n")
+      expect(html).to eq("<parent></parent>")
     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>\n")
+      expect(html).to eq("<tag class=\"one two three\" id=\"id\"></tag>")
     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>\n")
-    end
-
-    it 'handles nils in the tag body' do
-      html = described_class.new([:div, nil]).call
-      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]]]])
+      expect(html).to eq("<ul>\n<li>one</li>\n<li>two</li>\n<li>three</li>\n</ul>")
     end
 
   end

data/spec/commaparty/parse_body_spec.rb

@@ -3,7 +3,7 @@ require 'commaparty/parse_body'
 
 describe CommaParty::ParseBody do
 
-  it 'returns [] for tags with no body' do
+  it 'returns nil for tags with no body' do
     body = described_class.new([:tag]).call
     expect(body).to eq([])
   end

data/spec/commaparty_spec.rb

@@ -3,46 +3,40 @@ require 'commaparty'
 describe CommaParty do
 
   it 'has a helpful html method' do
-    expect(CommaParty.html([:tag])).to match("<html><tag></tag></html>\n")
+    expect(CommaParty.html([:tag])).to match('<html><tag></tag></html>')
   end
 
   it 'has a helpful xml method' do
-    expect(CommaParty.xml([:tag])).to match("<tag/>\n")
+    expect(CommaParty.xml([:tag])).to match('<tag/>')
   end
 
   it 'has a helpful markup method' do
-    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]))
+    expect(CommaParty.markup([:tag])).to match('<tag></tag>')
   end
 
   context 'converts ruby syntax to html string' do
-    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"}
+    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>"}
 
     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>\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"}
+      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>"}
     end
 
     context 'css shorthand' do
-      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" }
+      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>" }
     end
 
     context 'different shaped trees' do
-      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" }
+      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>" }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commaparty
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2pre
 platform: ruby
 authors:
 - Connor Mendenhall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -88,7 +88,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3