kwattr 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9ced9e0ee4d57097a23c8e2a32b6844e590031a
-  data.tar.gz: 3aba633d536806dfb842125e8a41b29c12d16844
+SHA256:
+  metadata.gz: d26310e1397eb6dba8a333f7bdae04ad77dcc76319abe4a696ebd11536849140
+  data.tar.gz: bdc0e19912891147bbd360453a56ad4f624fd0915b2f61d5dfeccc0e8625d814
 SHA512:
-  metadata.gz: 23bdd697aa7329a1b0dcad3352fc5ef0946634d204f0d4e35a131a9732ae15d6047a7efb37deb1f292478021ae35486e6cd0abcac854e6fff95dbbdf220c24e6
-  data.tar.gz: d1d49b97510a5751992cdf0441eaa1edc112d8f0fe108f1611d476f10d5098a846d81d877d1124e0d4027a2324634e22a72b5cd8c8bfb0698204c9ab48f4d3df
+  metadata.gz: ad874557f3f053462ff430d7c2a0bcbebe4c2d25eef2c5c2b5e2dd4832b57d78febb5bfcb989841b9b2eb4bf531d8c4ee10f0978651ca50c875cb372ecf238d4
+  data.tar.gz: 677d810457e0d8d202b1efc51906c0ab92ca817f12aa2f6b6aa7d80f2d325f275d124b509401425c6df0a092ee713999559a28cda4b57e9573178422d793e007

data/README.md

@@ -83,8 +83,8 @@ FooBar2.new
 
 ## compatibility
 
-* **Ruby 2.5**, **Ruby 2.4**,**Ruby 2.3**, **Ruby 2.2** and **JRuby 9000** are
-  fully supported.
+* **Ruby 2.6**, **Ruby 2.5**, **Ruby 2.4**,**Ruby 2.3**, **Ruby 2.2**,
+  **TruffleRuby** and **JRuby 9000** are fully supported.
 
 * **Rubinius** is supported, but exceptions don't include keywords from
   `super`.

data/lib/kwattr.rb

@@ -1,5 +1,5 @@
 class KWAttr < Module
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 
   def initialize
     @required = []
@@ -31,21 +31,22 @@ class KWAttr < Module
         end
         required.unshift(*super_required)
         raise ArgumentError,
-          "missing keyword#{'s' if required.size > 1}: #{required.join(', ')}"
+          "missing keyword#{'s' if required.size > 1}: #{KWAttr.keywords_for_error(required).join(', ')}"
       end
 
-      args << kwargs unless kwargs.empty?
 
       begin
 
 
-        super(*args, &block)
+        if kwargs.empty?
+          super(*args, &block) else super(*args, **kwargs, &block)
+        end
 
       rescue ArgumentError
         arity = method(:initialize).super_method.arity
-        if !kwargs.empty? && arity != -1 && arity == args.size - 1
+        if !kwargs.empty? && arity != -1 && arity == args.size
           raise ArgumentError,
-            "unknown keyword#{'s' if kwargs.size > 1}: #{kwargs.keys.join(', ')}"
+            "unknown keyword#{'s' if kwargs.size > 1}: #{KWAttr.keywords_for_error(kwargs.keys).join(', ')}"
         end
         raise
       end
@@ -58,6 +59,18 @@ class KWAttr < Module
   end
 end
 
+class << KWAttr
+  if RUBY_ENGINE = 'ruby' && RUBY_VERSION >= '2.7'
+    def keywords_for_error(keywords)
+      keywords.map(&:inspect)
+    end
+  else
+    def keywords_for_error(keywords)
+      keywords
+    end
+  end
+end
+
 class Module
   def kwattr(*attrs, **opts)
     names = [*attrs, *opts.keys]

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: kwattr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Étienne Barrié
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,7 +77,8 @@ files:
 - README.md
 - lib/kwattr.rb
 homepage: https://github.com/etiennebarrie/kwattr
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -94,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: attr_reader + initialize with keyword arguments