arbre 1.0.3 → 1.3.0

data/lib/arbre/context.rb

@@ -1,4 +1,5 @@
 require 'arbre/element'
+require 'ruby2_keywords'
 
 module Arbre
 
@@ -42,7 +43,7 @@ module Arbre
       @_current_arbre_element_buffer = [self]
 
       super(self)
-      instance_eval &block if block_given?
+      instance_eval(&block) if block_given?
     end
 
     def arbre_context
@@ -74,7 +75,7 @@ module Arbre
     # Webservers treat Arbre::Context as a string. We override
     # method_missing to delegate to the string representation
     # of the html.
-    def method_missing(method, *args, &block)
+    ruby2_keywords def method_missing(method, *args, &block)
       if cached_html.respond_to? method
         cached_html.send method, *args, &block
       else

data/lib/arbre/element.rb

@@ -1,18 +1,20 @@
 require 'arbre/element/builder_methods'
 require 'arbre/element/proxy'
 require 'arbre/element_collection'
+require 'ruby2_keywords'
 
 module Arbre
 
   class Element
     include BuilderMethods
 
-    attr_accessor :parent
+    attr_reader :parent
     attr_reader :children, :arbre_context
 
     def initialize(arbre_context = Arbre::Context.new)
       @arbre_context = arbre_context
       @children = ElementCollection.new
+      @parent = nil
     end
 
     def assigns
@@ -171,7 +173,7 @@ module Arbre
     #  3. Call the method on the helper object
     #  4. Call super
     #
-    def method_missing(name, *args, &block)
+    ruby2_keywords def method_missing(name, *args, &block)
       if current_arbre_element.respond_to?(name)
         current_arbre_element.send name, *args, &block
       elsif assigns && assigns.has_key?(name)

data/lib/arbre/element/builder_methods.rb

@@ -65,17 +65,16 @@ module Arbre
       # Returns true if the object should be converted into a text node
       # and appended into the DOM.
       def appendable_tag?(tag)
-        is_appendable = !tag.is_a?(Arbre::Element) && tag.respond_to?(:to_s)
-
-        # In ruby 1.9, Arraay.new.to_s prints out an empty array ("[]"). In
+        # Array.new.to_s prints out an empty array ("[]"). In
         # Arbre, we append the return value of blocks to the output, which
         # can cause empty arrays to show up within the output. To get
         # around this, we check if the object responds to #empty?
         if tag.respond_to?(:empty?) && tag.empty?
-          is_appendable = false
+          false
+        else
+          !tag.is_a?(Arbre::Element) && tag.respond_to?(:to_s)
         end
 
-        is_appendable
       end
     end
 

data/lib/arbre/html/tag.rb

@@ -20,7 +20,10 @@ module Arbre
         attributes = extract_arguments(args)
         self.content = args.first if args.first
 
-        set_for_attribute(attributes.delete(:for))
+        for_value = attributes[:for]
+        unless for_value.is_a?(String) || for_value.is_a?(Symbol)
+          set_for_attribute(attributes.delete(:for))
+        end
 
         attributes.each do |key, value|
           set_attribute(key, value)

data/lib/arbre/rails/template_handler.rb

@@ -1,10 +1,12 @@
 module Arbre
   module Rails
     class TemplateHandler
-      def call(template)
+      def call(template, source = nil)
+        source = template.source unless source
+
         <<-END
         Arbre::Context.new(assigns, self) {
-          #{template.source}
+          #{source}
         }.to_s
         END
       end

data/lib/arbre/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,21 +27,51 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: An Object Oriented DOM Tree in Ruby
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: Arbre makes it easy to generate HTML directly in Ruby
 email:
 - gregdbell@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- CHANGELOG.md
+- README.md
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- arbre.gemspec
+- docs/Gemfile
+- docs/_config.yml
+- docs/_includes/footer.html
+- docs/_includes/google-analytics.html
+- docs/_includes/head.html
+- docs/_includes/toc.html
+- docs/_includes/top-menu.html
+- docs/_layouts/default.html
+- docs/index.md
+- docs/stylesheets/main.css
 - lib/arbre.rb
 - lib/arbre/component.rb
 - lib/arbre/context.rb
@@ -57,36 +90,7 @@ files:
 - lib/arbre/rails/rendering.rb
 - lib/arbre/rails/template_handler.rb
 - lib/arbre/version.rb
-- spec/arbre/integration/html_spec.rb
-- spec/arbre/unit/component_spec.rb
-- spec/arbre/unit/context_spec.rb
-- spec/arbre/unit/element_finder_methods_spec.rb
-- spec/arbre/unit/element_spec.rb
-- spec/arbre/unit/html/class_list_spec.rb
-- spec/arbre/unit/html/tag_attributes_spec.rb
-- spec/arbre/unit/html/tag_spec.rb
-- spec/arbre/unit/html/text_node_spec.rb
-- spec/rails/integration/forms_spec.rb
-- spec/rails/integration/rendering_spec.rb
-- spec/rails/rails_spec_helper.rb
-- spec/rails/stub_app/config/database.yml
-- spec/rails/stub_app/config/routes.rb
-- spec/rails/stub_app/db/schema.rb
-- spec/rails/stub_app/log/.gitignore
-- spec/rails/stub_app/public/favicon.ico
-- spec/rails/support/mock_person.rb
-- spec/rails/templates/arbre/_partial.arb
-- spec/rails/templates/arbre/_partial_with_assignment.arb
-- spec/rails/templates/arbre/empty.arb
-- spec/rails/templates/arbre/page_with_arb_partial_and_assignment.arb
-- spec/rails/templates/arbre/page_with_assignment.arb
-- spec/rails/templates/arbre/page_with_erb_partial.arb
-- spec/rails/templates/arbre/page_with_partial.arb
-- spec/rails/templates/arbre/simple_page.arb
-- spec/rails/templates/erb/_partial.erb
-- spec/spec_helper.rb
-- spec/support/bundle.rb
-homepage: ''
+homepage: https://github.com/activeadmin/arbre
 licenses:
 - MIT
 metadata: {}
@@ -98,46 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
-test_files:
-- spec/arbre/integration/html_spec.rb
-- spec/arbre/unit/component_spec.rb
-- spec/arbre/unit/context_spec.rb
-- spec/arbre/unit/element_finder_methods_spec.rb
-- spec/arbre/unit/element_spec.rb
-- spec/arbre/unit/html/class_list_spec.rb
-- spec/arbre/unit/html/tag_attributes_spec.rb
-- spec/arbre/unit/html/tag_spec.rb
-- spec/arbre/unit/html/text_node_spec.rb
-- spec/rails/integration/forms_spec.rb
-- spec/rails/integration/rendering_spec.rb
-- spec/rails/rails_spec_helper.rb
-- spec/rails/stub_app/config/database.yml
-- spec/rails/stub_app/config/routes.rb
-- spec/rails/stub_app/db/schema.rb
-- spec/rails/stub_app/log/.gitignore
-- spec/rails/stub_app/public/favicon.ico
-- spec/rails/support/mock_person.rb
-- spec/rails/templates/arbre/_partial.arb
-- spec/rails/templates/arbre/_partial_with_assignment.arb
-- spec/rails/templates/arbre/empty.arb
-- spec/rails/templates/arbre/page_with_arb_partial_and_assignment.arb
-- spec/rails/templates/arbre/page_with_assignment.arb
-- spec/rails/templates/arbre/page_with_erb_partial.arb
-- spec/rails/templates/arbre/page_with_partial.arb
-- spec/rails/templates/arbre/simple_page.arb
-- spec/rails/templates/erb/_partial.erb
-- spec/spec_helper.rb
-- spec/support/bundle.rb
-has_rdoc: 
+test_files: []

data/.gitignore

@@ -1,10 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-benchmarks
-.rvmrc
-.ruby-version
-.ruby-gemset
-tags
-.DS_Store

data/.travis.yml

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

data/Gemfile

@@ -1,16 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec
-
-group :test do
-  gem 'rspec'
-  gem 'rack'
-  gem 'pry'
-end
-
-group :rails do
-  gem 'rails'
-  gem 'rspec-rails'
-  gem 'combustion'
-  gem 'capybara'
-end

data/Rakefile

@@ -1,18 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
-
-task :console do
-  require 'irb'
-  require 'irb/completion'
-
-  require 'pry'
-  require 'arbre'
-
-  ARGV.clear
-  IRB.start
-end

data/arbre.gemspec

@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "arbre/version"
-
-Gem::Specification.new do |s|
-  s.name        = "arbre"
-  s.version     = Arbre::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Greg Bell"]
-  s.email       = ["gregdbell@gmail.com"]
-  s.homepage    = ""
-  s.summary     = %q{An Object Oriented DOM Tree in Ruby}
-  s.description = %q{An Object Oriented DOM Tree in Ruby}
-  s.license     = "MIT"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency("activesupport", ">= 3.0.0")
-end

data/spec/arbre/integration/html_spec.rb

@@ -1,250 +0,0 @@
-require 'spec_helper'
-
-describe Arbre do
-
-  let(:helpers){ nil }
-  let(:assigns){ {} }
-
-  it "should render a single element" do
-    expect(arbre {
-      span "Hello World"
-    }.to_s).to eq("<span>Hello World</span>\n")
-  end
-
-  it "should render a child element" do
-    expect(arbre {
-      span do
-        span "Hello World"
-      end
-    }.to_s).to eq <<-HTML
-<span>
-  <span>Hello World</span>
-</span>
-HTML
-  end
-
-  it "should render an unordered list" do
-    expect(arbre {
-      ul do
-        li "First"
-        li "Second"
-        li "Third"
-      end
-    }.to_s).to eq <<-HTML
-<ul>
-  <li>First</li>
-  <li>Second</li>
-  <li>Third</li>
-</ul>
-HTML
-  end
-
-   it "should allow local variables inside the tags" do
-     expect(arbre {
-       first = "First"
-       second = "Second"
-       ul do
-         li first
-         li second
-       end
-     }.to_s).to eq <<-HTML
-<ul>
-  <li>First</li>
-  <li>Second</li>
-</ul>
-HTML
-   end
-
-
-  it "should add children and nested" do
-    expect(arbre {
-      div do
-        ul
-        li do
-          li
-        end
-      end
-    }.to_s).to eq <<-HTML
-<div>
-  <ul></ul>
-  <li>
-    <li></li>
-  </li>
-</div>
-HTML
-  end
-
-
-  it "should pass the element in to the block if asked for" do
-    expect(arbre {
-      div do |d|
-        d.ul do
-          li
-        end
-      end
-    }.to_s).to eq <<-HTML
-<div>
-  <ul>
-    <li></li>
-  </ul>
-</div>
-HTML
-  end
-
-
-  it "should move content tags between parents" do
-    expect(arbre {
-      div do
-        span(ul(li))
-      end
-    }.to_s).to eq <<-HTML
-<div>
-  <span>
-    <ul>
-      <li></li>
-    </ul>
-  </span>
-</div>
-HTML
-  end
-
-  it "should add content to the parent if the element is passed into block" do
-    expect(arbre {
-      div do |d|
-        d.id = "my-tag"
-        ul do
-          li
-        end
-      end
-    }.to_s).to eq <<-HTML
-<div id="my-tag">
-  <ul>
-    <li></li>
-  </ul>
-</div>
-HTML
-  end
-
-  it "should have the parent set on it" do
-    list, item = nil
-    arbre {
-      list = ul do
-        li "Hello"
-        item = li "World"
-      end
-    }
-    expect(item.parent).to eq list
-  end
-
-  it "should set a string content return value with no children" do
-    expect(arbre {
-      li do
-        "Hello World"
-      end
-    }.to_s).to eq <<-HTML
-<li>Hello World</li>
-HTML
-  end
-
-  it "should turn string return values into text nodes" do
-    node = nil
-    arbre {
-      list = li do
-        "Hello World"
-      end
-      node = list.children.first
-    }
-    expect(node).to be_a Arbre::HTML::TextNode
-  end
-
-  it "should not render blank arrays" do
-    expect(arbre {
-      tbody do
-        []
-      end
-    }.to_s).to eq <<-HTML
-<tbody></tbody>
-HTML
-  end
-
-  describe "self-closing nodes" do
-
-    it "should not self-close script tags" do
-      expect(arbre {
-        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"
-      }.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"
-      }.to_s).to eq("<link rel=\"stylesheet\"/>\n")
-    end
-
-    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
-
-  describe "html safe" do
-
-    it "should escape the contents" do
-      expect(arbre {
-        span("<br />")
-      }.to_s).to eq <<-HTML
-<span>&lt;br /&gt;</span>
-HTML
-    end
-
-    it "should return html safe strings" do
-      expect(arbre {
-        span("<br />")
-      }.to_s).to be_html_safe
-    end
-
-    it "should not escape html passed in" do
-      expect(arbre {
-        span(span("<br />"))
-      }.to_s).to eq <<-HTML
-<span>
-  <span>&lt;br /&gt;</span>
-</span>
-HTML
-    end
-
-    it "should escape string contents when passed in block" do
-      expect(arbre {
-        span {
-          span {
-            "<br />"
-          }
-        }
-      }.to_s).to eq <<-HTML
-<span>
-  <span>&lt;br /&gt;</span>
-</span>
-HTML
-    end
-
-    it "should escape the contents of attributes" do
-      expect(arbre {
-        span(class: "<br />")
-      }.to_s).to eq <<-HTML
-<span class="&lt;br /&gt;"></span>
-HTML
-    end
-
-  end
-
-end