arbre 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 167ce642a1b64eb122a2d02ce8a1d738a0c480303769ad7a896df8afbfa2f197
-  data.tar.gz: 0a4a5d4b7e788155b66eeca1dfdae4ed138403449cda43d915e76fd52bdbdb84
+  metadata.gz: 07b4de63d2e89a8ce69753438867bb05800ddc812b83bb630369dfbaec3df59d
+  data.tar.gz: 8299e5287279509ec6578db4686114852e92ed0d386ceeeed22cbd7d1170fc02
 SHA512:
-  metadata.gz: 31df82dc237aeb220e55fa3ae4bc1fb6d39cb7189cffe36ad2f4839a01ead4336cd1f556a7005ebfb608d258988407db479d9cef855c68016f0b646279e8a2a6
-  data.tar.gz: 53b572e7001fccc30d284865292613b3f33a35e73f7c4f95a56db7c6c4e96b42721c73d87130b7fc1c402b04acdd2562106efec0c8d7b60ef1ee8bd7bd5034c5
+  metadata.gz: 9c01bb198d89bf938f853b2e0a4a674625cae8dfbd0fc56ed5fcc8bee974f92b451af63fd10b927c4ea61fcb88e6e78c81be8d2d3d8fe732347ca4b076b223c9
+  data.tar.gz: 020135f9ed8db3a1d085e623250fb33e90d98591960d0ef68251f81e8ec9a93d82c42daff18b539a5884d1a431819a678a8cd046327fb0815b43504069d46d7f

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Master (unreleased)
 
+## 1.7.0 [☰](https://github.com/activeadmin/arbre/compare/v1.6.0...v1.7.0)
+
+* Remove upper bound dependency limits from gemspec. [#539][] by [@javierjulio][]
+* Allow ActiveSupport 7.1. [#537][] by [@tomascco][]
+
+## 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][]
@@ -36,7 +48,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)
 
@@ -105,10 +117,16 @@ 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
+[#537]: https://github.com/activeadmin/arbre/pull/537
+[#539]: https://github.com/activeadmin/arbre/pull/539
 
 [@aramvisser]: https://github.com/aramvisser
 [@LTe]: https://github.com/LTe
@@ -127,3 +145,8 @@ Initial release and extraction from Active Admin
 [@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
+[@tomascco]: https://github.com/tomascco
+[@javierjulio]: https://github.com/javierjulio

data/lib/arbre/context.rb

@@ -30,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.
@@ -100,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/html/attributes.rb

@@ -5,7 +5,7 @@ module Arbre
     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 ' '
@@ -17,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/html5_elements.rb

@@ -6,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/rails/forms.rb

@@ -92,5 +92,3 @@ module Arbre
     end
   end
 end
-
-

data/lib/arbre/rails/rendering.rb

@@ -12,7 +12,6 @@ module Arbre
           text_node rendered
         end
       end
-
     end
   end
 end

data/lib/arbre/rails/template_handler.rb

@@ -14,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,4 +1,4 @@
 # frozen_string_literal: true
 module Arbre
-  VERSION = "1.5.0"
+  VERSION = "1.7.0"
 end

data/lib/arbre.rb

@@ -17,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.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2023-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ 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
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ruby2_keywords
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !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
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !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
@@ -85,15 +73,16 @@ 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: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -102,14 +91,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: An Object Oriented DOM Tree in Ruby

data/lib/arbre/rails.rb

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