tubby 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23fa67b928c22ddfe8a88d2a31d9aec059babbb7
-  data.tar.gz: c04266360faf36cc54e517b264f978c61a47867b
+SHA256:
+  metadata.gz: bd594f1dcbabe992d83539b79b73d98c4fe21277458b20552c1e22529f1cf6d4
+  data.tar.gz: 1b7361729edb772bb64f67f12c8418e10f183abc198a7e6e7728866c44006a66
 SHA512:
-  metadata.gz: a747e3bb0a99977634b781d7892c129194e931a3b3de8d133088d74a9e542be7f5fc4308c7151e90d8ab7774d709eae34e129783540fc97366debcbad3547b5f
-  data.tar.gz: 61e61741fee0eb09789521f77098c64ef4f4e12172da9a5aa48088fa09e120346e4849dba23778c9fd54eb157455d2168be4fbf89ea07a194f1cca546ed3d39c
+  metadata.gz: a365e374496d4a097eeebe187757604f576e1886493c23b226c2cbba42228d0113c99d0c84af961b841e226b4e37dda008636f4d345994b8a38fe476911f5a8c
+  data.tar.gz: 7060f9c5bbbe77f6e6bfea7ec7e9c4ac56ae5bc078fcb4e7d1938f18a133d0d8235ad0a143e1d01ef1730e32654a425c6188257876ec5c23f987afdf5aaa48be

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Tubby CHANGELOG
 
-## Changes since previous release
+## v1.1
+
+- Fix warnings on Ruby 2.7 (#1, stoivo)
+- Add support for data-attributes (#2, zverok)
+
+## v1.0
 
 - Initial implementation
 

data/LICENSE.md

@@ -1,12 +1,55 @@
-Copyright (C) 2018 Magnus Holm <judofyr@gmail.com>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+# Blue Oak Model License
+
+Version 1.0.0
+
+## Purpose
+
+This license gives everyone as much permission to work with
+this software as possible, while protecting contributors
+from liability.
+
+## Acceptance
+
+In order to receive this license, you must agree to its
+rules.  The rules of this license are both obligations
+under that agreement and conditions to your license.
+You must not do anything with this software that triggers
+a rule that you cannot or will not follow.
+
+## Copyright
+
+Each contributor licenses you to do everything with this
+software that would otherwise infringe that contributor's
+copyright in it.
+
+## Notices
+
+You must ensure that everyone who gets a copy of
+any part of this software from you, with or without
+changes, also gets the text of this license or a link to
+<https://blueoakcouncil.org/license/1.0.0>.
+
+## Excuse
+
+If anyone notifies you in writing that you have not
+complied with [Notices](#notices), you can keep your
+license by taking all practical steps to comply within 30
+days after the notice.  If you do not do so, your license
+ends immediately.
+
+## Patent
+
+Each contributor licenses you to do everything with this
+software that would otherwise infringe any patent claims
+they can license or become able to license.
+
+## Reliability
+
+No contributor can revoke this license.
+
+## No Liability
+
+***As far as the law allows, this software comes as is,
+without any warranty or condition, and no contributor
+will be liable to anyone for any damages related to this
+software or this license, under any kind of legal claim.***

data/README.md

@@ -1,5 +1,7 @@
 # Tubby: Tags in Ruby
 
+[![](https://img.shields.io/gem/v/tubby.svg)](https://rubygems.org/gems/tubby) [![](https://img.shields.io/travis/com/judofyr/tubby.svg)](https://travis-ci.com/judofyr/tubby) 
+
 Tubby is a lightweight library for writing HTML components in plain Ruby.
 
 ```ruby
@@ -377,17 +379,5 @@ compatible with earlier releases with the same MAJOR version.
 
 ## License
 
-Tubby is is available under the 0BSD license:
-
-> Copyright (C) 2018 Magnus Holm <judofyr@gmail.com>
->
-> Permission to use, copy, modify, and/or distribute this software for any
-> purpose with or without fee is hereby granted.
->
-> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-> AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-> LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-> OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-> PERFORMANCE OF THIS SOFTWARE.
+Tubby is is available under the Blue Oak Model License (see LICENSE.md).
+This is a permissive license similar to BSD/MIT.

data/lib/tubby.rb

@@ -55,6 +55,18 @@ module Tubby
     end
 
     def __attrs!(attrs)
+      if attrs.key?(:data) && attrs[:data].is_a?(Hash)
+        # Flatten present `data: {k1: v1, k2: v2}` attribute, inserting `data-k1: v1, data-k2: v2`
+        # into exact place where the attribute was
+        attrs = Hash[attrs.flat_map do |key, value|
+          if key == :data && value.is_a?(Hash)
+            value.map { |k, v| [:"data-#{k}", v] }
+          else
+            [[key, value]]
+          end
+        end]
+      end
+
       attrs.each do |key, value|
         if value.is_a?(Array)
           value = value.compact.join(" ")
@@ -107,7 +119,7 @@ module Tubby
     TAGS.each do |name|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{name}(content = nil, **attrs, &blk)
-          tag!(#{name.inspect}, content, attrs, &blk)
+          tag!(#{name.inspect}, content, **attrs, &blk)
         end
       RUBY
     end
@@ -115,7 +127,7 @@ module Tubby
     SELF_CLOSING_TAGS.each do |name|
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{name}(**attrs)
-          self_closing_tag!(#{name.inspect}, attrs)
+          self_closing_tag!(#{name.inspect}, **attrs)
         end
       RUBY
     end
@@ -134,4 +146,3 @@ module Tubby
     end
   end
 end
-

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tubby
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Magnus Holm
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - judofyr@gmail.com
 executables: []
@@ -23,9 +23,9 @@ files:
 - lib/tubby.rb
 homepage: https://github.com/judofyr/tubby
 licenses:
-- 0BSD
+- BlueOak-1.0.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -40,9 +40,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: HTML templates as Ruby
 test_files: []