arbre 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3372e73956d615bd5690efe4c862f4e9bb312aaa8e12117caada56cbc0a1f69
-  data.tar.gz: f6649676ae291d3d745ad53b4eb7fd932b921560af92d4a1065c1178ad8ff1c6
+  metadata.gz: a6bd316883dba940a6d63639b1fb6d5b76c416f43303d886f5293192cbe77e35
+  data.tar.gz: 7eb8b78f40571d050271cc2d703be3bd0439d1b991008117bff5e710be44dc11
 SHA512:
-  metadata.gz: 5a510c2925f63a88a75f20c0de6d9adac67da0f8c615cbe25c1debd8b5c7f48830de8a89d947780c76f1f762a91e37c63bf118f2db1a52c218f9a2a174f91021
-  data.tar.gz: 01347d69439526f887b81f35bf1c241d873790fe9220cd55839954df551134abfb065afea2b4c952b89447930b175e23e426329dde7ad2fc010ecec9c77c8257
+  metadata.gz: 41159412bec401e716eabe1213badd287f032d146feca7e4a1278b1ebe9c808c491d72a26f3451f08100c3ff3ef65c2d0341085ed5a1aca5b6e68d818a19048a
+  data.tar.gz: fc64a514c27f0a6fb010803e2316f1d3e279cd5ada6d20c7860533ef64ce1a36d39f5b9b9929c02ec3ff97a5c0a1206da69bc1e2cf44cfb4f44d442aba223a5f

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Master (unreleased)
 
+## 1.6.0 [☰](https://github.com/activeadmin/arbre/compare/v1.5.0...v1.6.0)
+
+* Drop support for Ruby 2.6. [#345][] by [@alejandroperea][]
+* Add 'main' to HTML5 elements. [#270][] by [@mynnx][]
+* Support nested attribute hashes rendered as hyphenated attributes. [#451][] [@Ikariusrb][]
+* Lazy-load rails interactions. [#456][] [@ngan][]
+
+## 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][]
@@ -29,7 +43,7 @@ _No changes_.
 ## 1.1.1 [☰](https://github.com/activeadmin/arbre/compare/v1.1.0...v1.1.1)
 
 * Use mime-types 2.x for Ruby 1.9 by [@timoschilling][]
-* Verify Ruby 2.3 support. [#59][] by [@dlackty][] 
+* Verify Ruby 2.3 support. [#59][] by [@dlackty][]
 
 ## 1.1.0 [☰](https://github.com/activeadmin/arbre/compare/v1.0.3...v1.1.0)
 
@@ -98,10 +112,19 @@ Initial release and extraction from Active Admin
 [#202]: https://github.com/activeadmin/arbre/pull/202
 [#205]: https://github.com/activeadmin/arbre/pull/205
 [#242]: https://github.com/activeadmin/arbre/pull/242
+[#270]: https://github.com/activeadmin/arbre/pull/270
+[#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
+[#345]: https://github.com/activeadmin/arbre/pull/345
+[#451]: https://github.com/activeadmin/arbre/pull/451
+[#456]: https://github.com/activeadmin/arbre/pull/456
 
 [@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
@@ -113,3 +136,8 @@ 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
+[@mynnx]: https://github.com/mynnx
+[@Ikariusrb]: https://github.com/Ikariusrb
+[@ngan]: https://github.com/ngan

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,3 +1,4 @@
+# frozen_string_literal: true
 require 'arbre/element'
 require 'ruby2_keywords'
 
@@ -29,7 +30,7 @@ module Arbre
     # Initialize a new Arbre::Context
     #
     # @param [Hash] assigns A hash of objecs that you would like to be
-    #                       availble as local variables within the Context
+    #                       available as local variables within the Context
     #
     # @param [Object] helpers An object that has methods on it which will become
     #                         instance methods within the context.
@@ -99,7 +100,7 @@ module Arbre
 
 
     # Caches the rendered HTML so that we don't re-render just to
-    # get the content lenght or to delegate a method to the HTML
+    # get the content length or to delegate a method to the HTML
     def cached_html
       if defined?(@cached_html)
         @cached_html

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,3 +1,4 @@
+# frozen_string_literal: true
 require 'arbre/element/builder_methods'
 require 'arbre/element/proxy'
 require 'arbre/element_collection'

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,10 +1,11 @@
+# frozen_string_literal: true
 module Arbre
   module HTML
 
     class Attributes < Hash
 
       def to_s
-        map do |name, value|
+        flatten_hash.map do |name, value|
           next if value_empty?(value)
           "#{html_escape(name)}=\"#{html_escape(value)}\""
         end.compact.join ' '
@@ -16,6 +17,18 @@ module Arbre
 
       protected
 
+      def flatten_hash(hash = self, old_path = [], accumulator = {})
+        hash.each do |key, value|
+          path = old_path + [key]
+          if value.is_a? Hash
+            flatten_hash(value, path, accumulator)
+          else
+            accumulator[path.join('-')] = value
+          end
+        end
+        accumulator
+      end
+
       def value_empty?(value)
         value.respond_to?(:empty?) ? value.empty? : !value
       end

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
 
@@ -5,9 +6,9 @@ module Arbre
                        :bdo, :blockquote, :body, :br, :button, :canvas, :caption, :cite,
                        :code, :col, :colgroup, :command, :datalist, :dd, :del, :details,
                        :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, :menuitem, :meta, :meter, :nav, :noscript, 
+                       :footer, :form, :h1, :h2, :h3, :h4, :h5, :h6, :head, :header, :hgroup,
+                       :hr, :html, :i, :iframe, :img, :input, :ins, :keygen, :kbd, :label,
+                       :legend, :li, :link, :main, :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, :svg, :table, :tbody, :td,

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
@@ -91,5 +92,3 @@ module Arbre
     end
   end
 end
-
-

data/lib/arbre/rails/rendering.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module Rails
     module Rendering
@@ -11,7 +12,6 @@ module Arbre
           text_node rendered
         end
       end
-
     end
   end
 end

data/lib/arbre/rails/template_handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
   module Rails
     class TemplateHandler
@@ -13,5 +14,3 @@ module Arbre
     end
   end
 end
-
-ActionView::Template.register_template_handler :arb, Arbre::Rails::TemplateHandler.new

data/lib/arbre/railtie.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+require 'arbre/rails/template_handler'
+require 'arbre/rails/forms'
+require 'arbre/rails/rendering'
+require 'rails'
+
+Arbre::Element.include(Arbre::Rails::Rendering)
+
+module Arbre
+  class Railtie < ::Rails::Railtie
+    initializer "arbre" do
+      ActiveSupport.on_load(:action_view) do
+        ActionView::Template.register_template_handler :arb, Arbre::Rails::TemplateHandler.new
+      end
+    end
+  end
+end

data/lib/arbre/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Arbre
-  VERSION = "1.4.0"
+  VERSION = "1.6.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'
@@ -16,5 +17,5 @@ require 'arbre/html/html5_elements'
 require 'arbre/component'
 
 if defined?(Rails)
-  require 'arbre/rails'
+  require 'arbre/railtie'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbre
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Greg Bell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +85,17 @@ files:
 - lib/arbre/html/html5_elements.rb
 - lib/arbre/html/tag.rb
 - lib/arbre/html/text_node.rb
-- lib/arbre/rails.rb
 - lib/arbre/rails/forms.rb
 - lib/arbre/rails/rendering.rb
 - lib/arbre/rails/template_handler.rb
+- lib/arbre/railtie.rb
 - lib/arbre/version.rb
 homepage: https://github.com/activeadmin/arbre
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,15 +103,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby
 test_files: []

data/lib/arbre/rails.rb

@@ -1,5 +0,0 @@
-require 'arbre/rails/template_handler'
-require 'arbre/rails/forms'
-require 'arbre/rails/rendering'
-
-Arbre::Element.send :include, Arbre::Rails::Rendering