arbre 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b53bbea249a4468d48f14a136eda6c20fc65b7
-  data.tar.gz: 17a5b69fd8d6b97bb0c4231ae675e726307044c4
+  metadata.gz: 6c1b05989079a4f6408269a6d5079ac41b957e2c
+  data.tar.gz: 283b93e148607c2d7537ebab5f330b10312f1828
 SHA512:
-  metadata.gz: de40bce2886fe8180f32ca25fb0a6a8eae6cef04d0f8bcd9af568332241f4e5a4aec73a6064fc6af8ddb4e42a78d74b715be61aeff4925d84686f7d0e70d1a79
-  data.tar.gz: 789a7b6cc502b10ce1a2eb2d46fac659500727c22915c0539f511529a1f947cd5d51f6fe2990241adfe0708816831a9cbe62c6c2d4eaed21d9f5994e3161bbba
+  metadata.gz: 747b0ee1ddf4ea35e05aaec1d072d96a65edd94d8b63163f791af329baf91a259bd98fba5aaa49e793b5516b357a9378688e59b35e7a0c1b9bb842c892e88ec8
+  data.tar.gz: 4ebf3319eea32ff425ba13ce734a4c5b11cb5a666a0729c6898f1b9fbb0a326e429d5e3e3eeb421155c8c0e0d6a40fd1b386bfe52a2abf99ecc55e110030ad29

data/.travis.yml

@@ -1,4 +1,4 @@
 script: bundle exec rake
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1

data/CHANGELOG.md

@@ -1,30 +1,38 @@
-## 1.0.2
+## unreleased [☰](https://github.com/activeadmin/arbre/compare/v1.0.3...master)
 
-* make `Element#inspect` behave correctly in Ruby 2.0 (@seanlinsley, #16)
-* prevent `Arbre::Element#flatten` infinite recursion (@seanlinsley, #32)
-* make `find_by_class` correctly find children by class (@kaapa, #33)
+## 1.0.3 [☰](https://github.com/activeadmin/arbre/compare/v1.0.2...v1.0.3)
 
-## 1.0.1
+* Performance improvements [#40][] by [@alexesDev][]
+* Added all void elements as self-closing tags [#39][] by [@OscarBarrett][]
+* Missing tags added [#36][] / [#39][] by [@dtaniwaki][] and [@OscarBarrett][]
 
-* Template handler converts to string to satisfy Rack::Lint (@jpmckinney, #6)
+## 1.0.2 [☰](https://github.com/activeadmin/arbre/compare/v1.0.1...v1.0.2)
+
+* make `Element#inspect` behave correctly in Ruby 2.0 [#16][] by [@seanlinsley][]
+* prevent `Arbre::Element#flatten` infinite recursion [#32][] by [@seanlinsley][]
+* make `find_by_class` correctly find children by class [#33][] by [@kaapa][]
+
+## 1.0.1 [☰](https://github.com/activeadmin/arbre/compare/v1.0.0...v1.0.1)
+
+* Template handler converts to string to satisfy Rack::Lint [#6][] by [@jpmckinney][]
 * Fix to `Tag#add_class` when passing a string of classes to Tag build method
-  (@gregbell, #7)
-* Not longer uses the default separator (@LTe, #4)
+  [#4][] by [@gregbell][]
+* Not longer uses the default separator [#7][] by [@LTe][]
 
-## 1.0.0
+## 1.0.0 [☰](https://github.com/activeadmin/arbre/compare/v1.0.0.rc4...v1.0.0)
 
 * Added support for the use of `:for` with non Active Model objects
 
-## 1.0.0.rc4
+## 1.0.0.rc4 [☰](https://github.com/activeadmin/arbre/compare/v1.0.0.rc3...v1.0.0.rc4)
 
 * Fix issue where user could call `symbolize_keys!` on a
   HashWithIndifferentAccess which doesn't implement the method
 
-## 1.0.0.rc3
+## 1.0.0.rc3 [☰](https://github.com/activeadmin/arbre/compare/v1.0.0.rc2...v1.0.0.rc3)
 
 * Implemented `Arbre::HTML::Tag#default_id_for_prefix`
 
-## 1.0.0.rc2
+## 1.0.0.rc2 [☰](https://github.com/activeadmin/arbre/compare/v1.0.0.rc1...v1.0.0.rc2)
 
 * Fixed bug where Component's build methods were being rendered within the
   parent context.
@@ -32,3 +40,22 @@
 ## 1.0.0.rc1
 
 Initial release and extraction from Active Admin
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#4]: https://github.com/activeadmin/arbre/issues/4
+[#6]: https://github.com/activeadmin/arbre/issues/6
+[#7]: https://github.com/activeadmin/arbre/issues/7
+[#16]: https://github.com/activeadmin/arbre/issues/16
+[#32]: https://github.com/activeadmin/arbre/issues/32
+[#33]: https://github.com/activeadmin/arbre/issues/33
+[#36]: https://github.com/activeadmin/arbre/issues/36
+[#39]: https://github.com/activeadmin/arbre/issues/39
+[#40]: https://github.com/activeadmin/arbre/issues/40
+[@LTe]: https://github.com/LTe
+[@OscarBarrett]: https://github.com/OscarBarrett
+[@alexesDev]: https://github.com/alexesDev
+[@dtaniwaki]: https://github.com/dtaniwaki
+[@gregbell]: https://github.com/gregbell
+[@jpmckinney]: https://github.com/jpmckinney
+[@kaapa]: https://github.com/kaapa
+[@seanlinsley]: https://github.com/seanlinsley

data/README.md

@@ -58,7 +58,7 @@ class Panel < Arbre::Component
   def build(title, attributes = {})
     super(attributes)
 
-    h3(title, :class => "panel-title")
+    h3(title, class: "panel-title")
   end
 end
 ```
@@ -71,7 +71,7 @@ You can now use this panel in any Arbre context:
 
 ```ruby
 html = Arbre::Context.new do
-  panel "Hello World", :id => "my-panel" do
+  panel "Hello World", id: "my-panel" do
     span "Inside the panel"
   end
 end
@@ -92,7 +92,7 @@ To insert unwrapped text nodes use `text_node`:
 
 ```ruby
 html = Arbre::Context.new do
-  panel "Hello World", :id => "my-panel" do
+  panel "Hello World", id: "my-panel" do
     span "Inside the panel"
     text_node "Plain text"
   end

data/Rakefile

@@ -4,7 +4,7 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 task :console do
   require 'irb'

data/lib/arbre/context.rb

@@ -17,7 +17,7 @@ module Arbre
   # within the block. To pass local variables into the Context, use the
   # assigns param.
   #
-  #     html = Arbre::Context.new({:one => 1}) do
+  #     html = Arbre::Context.new({one: 1}) do
   #       h1 "Your number #{one}"
   #     end
   #
@@ -67,8 +67,8 @@ module Arbre
     end
     alias :length :bytesize
 
-    def respond_to?(method)
-      super || cached_html.respond_to?(method)
+    def respond_to_missing?(method, include_all)
+      super || cached_html.respond_to?(method, include_all)
     end
 
     # Webservers treat Arbre::Context as a string. We override

data/lib/arbre/element.rb

@@ -47,7 +47,7 @@ module Arbre
 
       if child.respond_to?(:parent)
         # Remove the child
-        child.parent.remove_child(child) if child.parent
+        child.parent.remove_child(child) if child.parent && child.parent != self
         # Set ourselves as the parent
         child.parent = self
       end

data/lib/arbre/html/class_list.rb

@@ -7,10 +7,7 @@ module Arbre
     class ClassList < Set
 
       def self.build_from_string(class_names)
-        list = new
-        list.add(class_names)
-
-        list
+        new.add(class_names)
       end
 
       def add(class_names)

data/lib/arbre/html/document.rb

@@ -29,7 +29,7 @@ module Arbre
 
       def build_head
         @head = head do
-          meta :"http-equiv" => "Content-type", :content => "text/html; charset=utf-8"
+          meta :"http-equiv" => "Content-type", content: "text/html; charset=utf-8"
         end
       end
 

data/lib/arbre/html/html5_elements.rb

@@ -7,11 +7,11 @@ module Arbre
                        :dfn, :div, :dl, :dt, :em, :embed, :fieldset, :figcaption, :figure,
                        :footer, :form, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hgroup, 
                        :hr, :html, :i, :iframe, :img, :input, :ins, :keygen, :kbd, :label, 
-                       :legend, :li, :link, :map, :mark, :menu, :meta, :meter, :nav, :noscript, 
-                       :object, :ol, :optgroup, :option, :output, :pre, :progress, :q,
+                       :legend, :li, :link, :map, :mark, :menu, :menuitem, :meta, :meter, :nav, :noscript, 
+                       :object, :ol, :optgroup, :option, :output, :param, :pre, :progress, :q,
                        :s, :samp, :script, :section, :select, :small, :source, :span,
-                       :strong, :style, :sub, :summary, :sup, :table, :tbody, :td,
-                       :textarea, :tfoot, :th, :thead, :time, :title, :tr, :ul, :var, :video ]
+                       :strong, :style, :sub, :summary, :sup, :svg, :table, :tbody, :td,
+                       :textarea, :tfoot, :th, :thead, :time, :title, :tr, :track, :ul, :var, :video, :wbr ]
 
     HTML5_ELEMENTS = [ :p ] + AUTO_BUILD_ELEMENTS
 

data/lib/arbre/html/tag.rb

@@ -6,6 +6,10 @@ module Arbre
     class Tag < Element
       attr_reader :attributes
 
+      # See: http://www.w3.org/html/wg/drafts/html/master/syntax.html#void-elements
+      SELF_CLOSING_ELEMENTS = [ :area, :base, :br, :col, :embed, :hr, :img, :input, :keygen, :link,
+                            :menuitem, :meta, :param, :source, :track, :wbr ]
+
       def initialize(*)
         super
         @attributes = Attributes.new
@@ -130,7 +134,7 @@ module Arbre
       end
 
       def self_closing_tag?
-        %w|br link meta|.include?(tag_name)
+        SELF_CLOSING_ELEMENTS.include?(tag_name.to_sym)
       end
 
       def no_child?

data/lib/arbre/rails/forms.rb

@@ -16,8 +16,8 @@ module Arbre
           proxy_call_to_form :select, *args
         end
 
-        def respond_to?(name)
-          if form_builder && form_builder.respond_to?(name)
+        def respond_to_missing?(method, include_all)
+          if form_builder && form_builder.respond_to?(method, include_all)
             true
           else
             super

data/lib/arbre/version.rb

@@ -1,3 +1,3 @@
 module Arbre
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/arbre/integration/html_spec.rb

@@ -171,26 +171,28 @@ HTML
 
     it "should not self-close script tags" do
       expect(arbre {
-        script :type => 'text/javascript'
+        script type: 'text/javascript'
       }.to_s).to eq("<script type=\"text/javascript\"></script>\n")
     end
 
     it "should self-close meta tags" do
       expect(arbre {
-        meta :content => "text/html; charset=utf-8"
+        meta content: "text/html; charset=utf-8"
       }.to_s).to eq("<meta content=\"text/html; charset=utf-8\"/>\n")
     end
 
     it "should self-close link tags" do
       expect(arbre {
-        link :rel => "stylesheet"
+        link rel: "stylesheet"
       }.to_s).to eq("<link rel=\"stylesheet\"/>\n")
     end
 
-    it "should self-close br tags" do
-      expect(arbre {
-        br
-      }.to_s).to eq("<br/>\n")
+    Arbre::HTML::Tag::SELF_CLOSING_ELEMENTS.each do |tag|
+      it "should self-close #{tag} tags" do
+        expect(arbre {
+          send(tag)
+        }.to_s).to eq("<#{tag}/>\n")
+      end
     end
 
   end
@@ -237,7 +239,7 @@ HTML
 
     it "should escape the contents of attributes" do
       expect(arbre {
-        span(:class => "<br />")
+        span(class: "<br />")
       }.to_s).to eq <<-HTML
 <span class="&lt;br /&gt;"></span>
 HTML

data/spec/arbre/unit/element_finder_methods_spec.rb

@@ -69,8 +69,8 @@ describe Arbre::Element, "Finder Methods" do
 
     it "should return a child element" do
       html = arbre do
-        div :class => "some_class"
-        div :class => "my_class"
+        div class: "some_class"
+        div class: "my_class"
       end
       elements = html.get_elements_by_class_name("my_class")
       expect(elements.size).to eq(1)
@@ -79,9 +79,9 @@ describe Arbre::Element, "Finder Methods" do
 
     it "should return multple child elements" do
       html = arbre do
-        div :class => "some_class"
-        div :class => "my_class"
-        div :class => "my_class"
+        div class: "some_class"
+        div class: "my_class"
+        div class: "my_class"
       end
       elements = html.get_elements_by_class_name("my_class")
       expect(elements.size).to eq(2)
@@ -91,9 +91,9 @@ describe Arbre::Element, "Finder Methods" do
 
     it "should return elements that match one of several classes" do
       html = arbre do
-        div :class => "some_class this_class"
-        div :class => "some_class"
-        div :class => "other_class"
+        div class: "some_class this_class"
+        div class: "some_class"
+        div class: "other_class"
 
       end
       elements = html.get_elements_by_class_name("this_class")
@@ -103,8 +103,8 @@ describe Arbre::Element, "Finder Methods" do
 
     it "should return a grandchild element" do
       html = arbre do
-        div :class => "some_class" do
-          div :class => "my_class"
+        div class: "some_class" do
+          div class: "my_class"
         end
       end
       elements = html.get_elements_by_class_name("my_class")

data/spec/arbre/unit/element_spec.rb

@@ -19,7 +19,7 @@ describe Arbre::Element do
     end
 
     it "should have a set of local assigns" do
-      context = Arbre::Context.new :hello => "World"
+      context = Arbre::Context.new hello: "World"
       element = Arbre::Element.new(context)
       expect(element.assigns[:hello]).to eq("World")
     end
@@ -56,7 +56,7 @@ describe Arbre::Element do
 
   describe "passing in assigns" do
     let(:post){ double }
-    let(:assigns){ {:post => post} }
+    let(:assigns){ {post: post} }
 
     it "should be accessible via a method call" do
       element = Arbre::Element.new(Arbre::Context.new(assigns))

data/spec/arbre/unit/html/class_list_spec.rb

@@ -8,7 +8,7 @@ describe Arbre::HTML::ClassList do
       list = Arbre::HTML::ClassList.build_from_string("first second")
       expect(list.size).to eq(2)
 
-      expect(list.to_a.sort).to eq(%w{first second})
+      expect(list).to match_array(%w{first second})
     end
 
   end

data/spec/arbre/unit/html/tag_attributes_spec.rb

@@ -6,10 +6,10 @@ describe Arbre::HTML::Tag, "Attributes" do
 
   describe "attributes" do
 
-    before { tag.build :id => "my_id" }
+    before { tag.build id: "my_id" }
 
     it "should have an attributes hash" do
-      expect(tag.attributes).to eq({:id => "my_id"})
+      expect(tag.attributes).to eq({id: "my_id"})
     end
 
     it "should render the attributes to html" do
@@ -43,7 +43,7 @@ describe Arbre::HTML::Tag, "Attributes" do
     end
 
     it "should remove an attribute" do
-      expect(tag.attributes).to eq({:id => "my_id"})
+      expect(tag.attributes).to eq({id: "my_id"})
       expect(tag.remove_attribute(:id)).to eq("my_id")
       expect(tag.attributes).to eq({})
     end

data/spec/arbre/unit/html/tag_spec.rb

@@ -5,24 +5,24 @@ describe Arbre::HTML::Tag do
   let(:tag){ Arbre::HTML::Tag.new }
 
   describe "building a new tag" do
-    before { tag.build "Hello World", :id => "my_id" }
+    before { tag.build "Hello World", id: "my_id" }
 
     it "should set the contents to a string" do
       expect(tag.content).to eq("Hello World")
     end
 
     it "should set the hash of options to the attributes" do
-      expect(tag.attributes).to eq({ :id => "my_id" })
+      expect(tag.attributes).to eq({ id: "my_id" })
     end
   end
 
   describe "creating a tag 'for' an object" do
-    let(:model_name){ double(:singular => "resource_class")}
-    let(:resource_class){ double(:model_name => model_name) }
-    let(:resource){ double(:class => resource_class, :to_key => ['5'])}
+    let(:model_name){ double(singular: "resource_class")}
+    let(:resource_class){ double(model_name: model_name) }
+    let(:resource){ double(class: resource_class, to_key: ['5'])}
 
     before do
-      tag.build :for => resource
+      tag.build for: resource
     end
     it "should set the id to the type and id" do
       expect(tag.id).to eq("resource_class_5")
@@ -34,10 +34,10 @@ describe Arbre::HTML::Tag do
 
 
     describe "for an object that doesn't have a model_name" do
-      let(:resource_class){ double(:name => 'ResourceClass') }
+      let(:resource_class){ double(name: 'ResourceClass') }
 
       before do
-        tag.build :for => resource
+        tag.build for: resource
       end
 
       it "should set the id to the type and id" do
@@ -93,7 +93,7 @@ describe Arbre::HTML::Tag do
 
     it "should create a class list from a string" do
       tag = Arbre::HTML::Tag.new
-      tag.build(:class => "first-class")
+      tag.build(class: "first-class")
       tag.add_class "second-class"
       expect(tag.class_list.size).to eq(2)
     end

data/spec/rails/integration/forms_spec.rb

@@ -10,7 +10,7 @@ describe "Building forms" do
 
     let(:form) do
       arbre do
-        form_for MockPerson.new, :url => "/" do |f|
+        form_for MockPerson.new, url: "/" do |f|
           f.label :name
           f.text_field :name
         end
@@ -22,7 +22,7 @@ describe "Building forms" do
     end
 
     it "should include the hidden authenticity token" do
-      expect(html).to include '<input name="authenticity_token" type="hidden" value="AUTH_TOKEN" />'
+      expect(html).to include '<input type="hidden" name="authenticity_token" value="AUTH_TOKEN" />'
     end
 
     it "should create a label" do
@@ -39,7 +39,7 @@ describe "Building forms" do
 
     let(:form) do
       arbre do
-        form_for MockPerson.new, :url => "/" do |f|
+        form_for MockPerson.new, url: "/" do |f|
           f.label :name
           f.text_field :name
           f.fields_for :permission do |pf|
@@ -51,7 +51,7 @@ describe "Building forms" do
     end
 
     it "should render nested label" do
-      expect(html).to have_selector("form label[for=mock_person_permission_admin]", :text => "Admin")
+      expect(html).to have_selector("form label[for=mock_person_permission_admin]", text: "Admin")
     end
 
     it "should render nested label" do
@@ -67,7 +67,7 @@ describe "Building forms" do
   describe "forms with other elements" do
     let(:form) do
       arbre do
-        form_for MockPerson.new, :url => "/" do |f|
+        form_for MockPerson.new, url: "/" do |f|
 
           div do
             f.label :name
@@ -79,9 +79,9 @@ describe "Building forms" do
             f.text_field :name
           end
 
-          div :class => "permissions" do
+          div class: "permissions" do
             f.fields_for :permission do |pf|
-              div :class => "permissions_label" do
+              div class: "permissions_label" do
                 pf.label :admin
               end
               pf.check_box :admin

data/spec/rails/integration/rendering_spec.rb

@@ -33,7 +33,7 @@ class TestController < ActionController::Base
 end
 
 
-describe TestController, "Rendering with Arbre", :type => :request do
+describe TestController, "Rendering with Arbre", type: :request do
   let(:body){ response.body }
 
   it "should render the empty template" do
@@ -44,8 +44,8 @@ describe TestController, "Rendering with Arbre", :type => :request do
   it "should render a simple page" do
     get "/test/render_simple_page"
     expect(response).to be_success
-    expect(body).to have_selector("h1", :text => "Hello World")
-    expect(body).to have_selector("p", :text => "Hello again!")
+    expect(body).to have_selector("h1", text: "Hello World")
+    expect(body).to have_selector("p", text: "Hello again!")
   end
 
   it "should render an arb partial" do
@@ -69,15 +69,15 @@ EOS
   end
 
   it "should render with instance variables" do
-    get "test/render_with_instance_variable"
+    get "/test/render_with_instance_variable"
     expect(response).to be_success
-    expect(body).to have_selector("h1", :text => "From Instance Var")
+    expect(body).to have_selector("h1", text: "From Instance Var")
   end
 
   it "should render an arbre partial with assignments" do
-    get "test/render_partial_with_instance_variable"
+    get "/test/render_partial_with_instance_variable"
     expect(response).to be_success
-    expect(body).to have_selector("p", :text => "Partial: From Instance Var")
+    expect(body).to have_selector("p", text: "Partial: From Instance Var")
   end
 
 end

data/spec/rails/rails_spec_helper.rb

@@ -19,7 +19,7 @@ require 'rails/support/mock_person'
 require 'arbre/rails'
 
 Rails.application.routes.draw do
-  get 'test/:action', :controller => "test"
+  get 'test/:action', controller: "test"
 end
 
 module AdditionalHelpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
@@ -140,3 +140,4 @@ test_files:
 - spec/rails/templates/erb/_partial.erb
 - spec/spec_helper.rb
 - spec/support/bundle.rb
+has_rdoc: