arbre 1.2.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9702ea598ff503038115048f407b05a69f1cf441cb061b33ca2586197b6fa6a9
-  data.tar.gz: 3c5ce4c57dd03b32fe470aad04075d1daa9e7f195fa2bae26e562bc85bd1767b
+  metadata.gz: 167ce642a1b64eb122a2d02ce8a1d738a0c480303769ad7a896df8afbfa2f197
+  data.tar.gz: 0a4a5d4b7e788155b66eeca1dfdae4ed138403449cda43d915e76fd52bdbdb84
 SHA512:
-  metadata.gz: fed97f8796827e8d807b8878cee2a55d32c05c1d8d730b49b77ced63fd94ad8aae8812dd8f79f2ee7981ea7a732b60de5bc70b5711d3c3b25ccfc0575eb8ee5f
-  data.tar.gz: fdc92e7b702113922416fe6b3ac0c4d669d34e8068e176aa87a47d65025bb379c462fad30b17b6a8e1d36e5b76d9434916056b34139611ccdf31ba457651b27f
+  metadata.gz: 31df82dc237aeb220e55fa3ae4bc1fb6d39cb7189cffe36ad2f4839a01ead4336cd1f556a7005ebfb608d258988407db479d9cef855c68016f0b646279e8a2a6
+  data.tar.gz: 53b572e7001fccc30d284865292613b3f33a35e73f7c4f95a56db7c6c4e96b42721c73d87130b7fc1c402b04acdd2562106efec0c8d7b60ef1ee8bd7bd5034c5

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Master (unreleased)
 
+## 1.5.0 [☰](https://github.com/activeadmin/arbre/compare/v1.4.0...v1.5.0)
+
+* Avoid mutating string literals. [#292][] by [@tomgilligan][]
+* Allow activesupport 7.0. [#314][] by [@tagliala][]
+* Drop ruby 2.5 support. [#315][] by [@alejandroperea][]
+* Fix keyword delegation in form component. [#318][] by [@deivid-rodriguez][]
+
+## 1.4.0 [☰](https://github.com/activeadmin/arbre/compare/v1.3.0...v1.4.0)
+
+* Allow activesupport 6.1 prereleases. [#242][] by [@deivid-rodriguez][]
+
+## 1.3.0 [☰](https://github.com/activeadmin/arbre/compare/v1.2.1...v1.3.0)
+
+* Drop ruby 2.3 support. [#152][] by [@deivid-rodriguez][]
+* Drop ruby 2.4 support. [#177][] by [@deivid-rodriguez][]
+* Fix ruby 2.7 kwargs warnings. [#202][] and [#205][] by [@deivid-rodriguez][]
+
+## 1.2.1 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0...v1.2.1)
+
+* Revert [#64][] to fix several regressions, at the cost of reintroducing [#46][]. [#121][] by [@deivid-rodriguez][]
+
 ## 1.2.0 [☰](https://github.com/activeadmin/arbre/compare/v1.2.0.rc1...v1.2.0)
 
 _No changes_.
@@ -72,15 +93,27 @@ Initial release and extraction from Active Admin
 [#36]: https://github.com/activeadmin/arbre/issues/36
 [#39]: https://github.com/activeadmin/arbre/issues/39
 [#40]: https://github.com/activeadmin/arbre/issues/40
+[#46]: https://github.com/activeadmin/arbre/issues/46
 [#49]: https://github.com/activeadmin/arbre/issues/49
 [#59]: https://github.com/activeadmin/arbre/issues/59
 [#64]: https://github.com/activeadmin/arbre/pull/64
 [#78]: https://github.com/activeadmin/arbre/pull/78
 [#110]: https://github.com/activeadmin/arbre/pull/110
+[#121]: https://github.com/activeadmin/arbre/pull/121
+[#152]: https://github.com/activeadmin/arbre/pull/152
+[#177]: https://github.com/activeadmin/arbre/pull/177
+[#202]: https://github.com/activeadmin/arbre/pull/202
+[#205]: https://github.com/activeadmin/arbre/pull/205
+[#242]: https://github.com/activeadmin/arbre/pull/242
+[#292]: https://github.com/activeadmin/arbre/pull/292
+[#314]: https://github.com/activeadmin/arbre/pull/314
+[#315]: https://github.com/activeadmin/arbre/pull/315
+[#318]: https://github.com/activeadmin/arbre/pull/318
 
 [@aramvisser]: https://github.com/aramvisser
 [@LTe]: https://github.com/LTe
 [@OscarBarrett]: https://github.com/OscarBarrett
+[@alejandroperea]: https://github.com/alejandroperea
 [@alexesDev]: https://github.com/alexesDev
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
 [@dlackty]: https://github.com/dlackty
@@ -92,3 +125,5 @@ Initial release and extraction from Active Admin
 [@seanlinsley]: https://github.com/seanlinsley
 [@timoschilling]: https://github.com/timoschilling
 [@varyonic]: https://github.com/varyonic
+[@tagliala]: https://github.com/tagliala
+[@tomgilligan]: https://github.com/tomgilligan

data/README.md

@@ -3,7 +3,7 @@
 [Arbre][docs] makes it easy to generate HTML directly in Ruby. This gem was extracted from [Active Admin](https://github.com/activeadmin/active_admin).
 
 [![Version         ][rubygems_badge]][rubygems]
-[![Travis CI       ][travis_badge]][travis]
+[![Github Actions  ][actions_badge]][actions]
 [![Tidelift        ][tidelift_badge]][tidelift]
 
 ## Goals
@@ -33,10 +33,10 @@ Tidelift will coordinate the fix and disclosure.
 
 [rubygems_badge]: http://img.shields.io/gem/v/arbre.svg
 [rubygems]: https://rubygems.org/gems/arbre
-[travis_badge]: http://img.shields.io/travis/activeadmin/arbre/master.svg
-[travis]: https://travis-ci.org/activeadmin/arbre
+[actions_badge]: https://github.com/activeadmin/arbre/workflows/ci/badge.svg
+[actions]: https://github.com/activeadmin/arbre/actions
 [tidelift_badge]: https://tidelift.com/badges/github/activeadmin/arbre
-[tidelift]: https://tidelift.com/subscription/pkg/rubygems-arbre?utm_source=rubygems-arbre&utm_medium=readme
+[tidelift]: https://tidelift.com/subscription/pkg/rubygems-arbre?utm_source=rubygems-arbre&utm_medium=referral&utm_campaign=readme
 
 [docs]: https://activeadmin.github.io/arbre/
 [stackoverflow]: http://stackoverflow.com/questions/tagged/arbre

data/docs/Gemfile

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 gem 'github-pages'
 gem 'jekyll-redirect-from'

data/lib/arbre/component.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   class Component < Arbre::HTML::Div
 

data/lib/arbre/context.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 require 'arbre/element'
+require 'ruby2_keywords'
 
 module Arbre
 
@@ -74,7 +76,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/builder_methods.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   class Element
 

data/lib/arbre/element/proxy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   class Element
     class Proxy < BasicObject

data/lib/arbre/element.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
 require 'arbre/element/builder_methods'
 require 'arbre/element/proxy'
 require 'arbre/element_collection'
+require 'ruby2_keywords'
 
 module Arbre
 
@@ -172,26 +174,17 @@ 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)
         assigns[name]
       elsif helpers.respond_to?(name)
-        helper_capture(name, *args, &block)
+        helpers.send(name, *args, &block)
       else
         super
       end
     end
 
-    # The helper might have a block that builds Arbre elements
-    # which will be rendered (#to_s) inside ActionView::Base#capture.
-    # We do not want such elements added to self, so we push a dummy
-    # current_arbre_element.
-    def helper_capture(name, *args, &block)
-      s = ""
-      within(Element.new) { s = helpers.send(name, *args, &block) }
-      s.is_a?(Element) ? s.to_s : s
-    end
   end
 end

data/lib/arbre/element_collection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
 
   # Stores a collection of Element objects

data/lib/arbre/html/attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module HTML
 

data/lib/arbre/html/class_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 
 module Arbre

data/lib/arbre/html/document.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module HTML
 

data/lib/arbre/html/html5_elements.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module HTML
 

data/lib/arbre/html/tag.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'erb'
 
 module Arbre
@@ -119,19 +120,19 @@ module Arbre
 
         if no_child? || child_is_text?
           if self_closing_tag?
-            html << spaces << open_tag.sub( />$/, '/>' )
+            html += spaces + open_tag.sub( />$/, '/>' )
           else
             # one line
-            html << spaces << open_tag << child_content << close_tag
+            html += spaces + open_tag + child_content + close_tag
           end
         else
           # multiple lines
-          html << spaces << open_tag << "\n"
-          html << child_content # the child takes care of its own spaces
-          html << spaces << close_tag
+          html += spaces + open_tag + "\n"
+          html += child_content # the child takes care of its own spaces
+          html += spaces + close_tag
         end
 
-        html << "\n"
+        html += "\n"
 
         html
       end

data/lib/arbre/html/text_node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'erb'
 
 module Arbre

data/lib/arbre/rails/forms.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module Rails
     module Forms
@@ -30,7 +31,7 @@ module Arbre
           text_node form_builder.send(method, *args, &block)
         end
 
-        def method_missing(method, *args, &block)
+        ruby2_keywords def method_missing(method, *args, &block)
           if form_builder && form_builder.respond_to?(method)
             proxy_call_to_form(method, *args, &block)
           else

data/lib/arbre/rails/rendering.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module Rails
     module Rendering

data/lib/arbre/rails/template_handler.rb

@@ -1,21 +1,4 @@
 # frozen_string_literal: true
-
-ActionView::Base.class_eval do
-  def capture(*args)
-    value = nil
-    buffer = with_output_buffer { value = yield(*args) }
-
-    # Override to handle Arbre elements inside helper blocks.
-    # See https://github.com/rails/rails/issues/17661
-    # and https://github.com/rails/rails/pull/18024#commitcomment-8975180
-    value = value.to_s if value.is_a?(Arbre::Element)
-
-    if (string = buffer.presence || value) && string.is_a?(String)
-      ERB::Util.html_escape string
-    end
-  end
-end
-
 module Arbre
   module Rails
     class TemplateHandler

data/lib/arbre/rails.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'arbre/rails/template_handler'
 require 'arbre/rails/forms'
 require 'arbre/rails/rendering'

data/lib/arbre/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
-  VERSION = "1.2.0"
+  VERSION = "1.5.0"
 end

data/lib/arbre.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/inflector'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Greg Bell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2022-02-08 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: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,23 +27,41 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: An Object Oriented DOM Tree in Ruby
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.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"
-- ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
-- arbre.gemspec
 - docs/Gemfile
 - docs/_config.yml
 - docs/_includes/footer.html
@@ -69,44 +90,11 @@ 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/changelog_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_helpers.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
-- tasks/lint.rake
-- tasks/release.rake
-homepage: ''
+homepage: https://github.com/activeadmin/arbre
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,15 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.6
+signing_key:
 specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
 test_files: []

data/.gitignore

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

data/.rubocop.yml

@@ -1,15 +0,0 @@
----
-
-AllCops:
-  DisabledByDefault: true
-
-  DisplayCopNames: true
-  DisplayStyleGuide: true
-
-  TargetRubyVersion: 2.3
-
-Metrics:
-  Enabled: false
-
-Layout/IndentHeredoc:
-  Enabled: true

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-sudo: false
-before_install:
-  - gem update --system 3.0.3
-  - gem install bundler:2.0.1
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.5
-  - 2.6.2
-  - jruby-9.1.17.0
-  - jruby-9.2.6.0
-branches:
-  only:
-    - master
-cache: bundler

data/Gemfile

@@ -1,25 +0,0 @@
-source 'http://rubygems.org'
-
-gemspec
-
-gem 'rake'
-
-group :test do
-  gem 'rspec'
-  gem 'pry'
-end
-
-group :tools do
-  gem 'rubocop'
-end
-
-group :release do
-  gem 'chandler'
-end
-
-group :rails do
-  gem 'rails', '>= 5.0.0.1' # fixes CVE-2016-6316
-  gem 'rspec-rails'
-  gem 'combustion'
-  gem 'capybara'
-end