kwattr 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff8a0f557944d7eb7a901f75edc60091b01094e
-  data.tar.gz: 6eae305b4eadccfcb92cda575eeaf09c8a71d2b2
+  metadata.gz: ef3443445900c18ce80cf33cd00e1b96f9d5dc22
+  data.tar.gz: b3296c9d24f5f0b3660cbd98881d4a06bb2db240
 SHA512:
-  metadata.gz: 17e68381d077e09fe0d7fd72828b2a1cd8dbab34c8010f43f679df76dac63e43a363f9aea9ee8e339295f8108b6266fff8bd958b782b299590867fd2f135a5fe
-  data.tar.gz: b82fcba69e07b3b247b9411fd400f5fa28ad9ed8e901b0d61623ec96750214cb5478e76d965af4f50eb4a4f039abc53ff74ea98907e9000f2e12b99f2f7e4941
+  metadata.gz: 44bdf502e0a2036bc34563f5ea8d8cd97dbc4843ed563140551002bfa2c8261b3142d9ec16cb289c29334c7eccf9897e0e7ebf24e5ba4e59f42e12c2f019f1df
+  data.tar.gz: 088ef1c83c21c54d021b5caa98a234745677600bf6a2d46d7f454f38d329f301359db2cc8cdb6a80c7414b944b9343f0defcc88297d2b6303b7b04cfd75f02ae

data/.travis.yml

@@ -2,4 +2,7 @@ language: ruby
 before_install:
   - gem install bundler
 rvm:
-  - 2.2.1
+  - 2.1.7
+  - 2.2.3
+  - rbx-2
+  - jruby-9.0.1.0

data/README.md

@@ -54,6 +54,41 @@ FooProtected.new # => #<FooProtected @foo=42>
 FooProtected.protected_instance_methods # => [:foo]
 ```
 
+### useful exception messages
+
+When it can, kwattr tries to extract the required keyword arguments from the
+super method to show more useful exception messages.
+
+```ruby
+class FooBar2
+  kwattr :foo
+
+  def initialize(bar:)
+  end
+end
+FooBar2.new
+# Ruby 2.2 and later:    ArgumentError: missing keywords: bar, foo
+# Ruby 2.1 and Rubinius: ArgumentError: missing keyword: foo
+```
+
+## compatibility
+
+* **Ruby 2.2** and **JRuby 9000** are fully supported.
+
+* **Ruby 2.1** is supported, but exceptions don't include keywords from `super`.
+
+* **Ruby 2.0**: kwattr brings fake required keyword arguments to Ruby 2.0: it
+  gives you the feel of required keyword arguments without needing the syntax
+  that came in 2.1.
+
+* **Rubinius** is supported, starting at least version 2.5.8, possibly before.
+  A similar but not exactly the same limitation as 2.1 applies to exceptions.
+
+## free features
+
+*kwattr has no specific code to support those, but they work and are supported
+use cases.*
+
 ### subclass
 
 ```ruby

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/kwattr.gemspec

@@ -1,5 +1,7 @@
 # coding: utf-8
-require_relative 'lib/kwattr'
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'kwattr'
 
 Gem::Specification.new do |spec|
   spec.name          = "kwattr"

data/lib/kwattr.rb

@@ -1,5 +1,5 @@
 class KWAttr < Module
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 
   def initialize
     @required = []
@@ -10,6 +10,7 @@ class KWAttr < Module
     required_attrs = @required
     defaults = @defaults
     required_attrs.concat(attrs).uniq!
+    super_method = Method.instance_methods.include? :super_method
     defaults.merge!(opts)
     iv_cache = Hash.new { |h, k| h[k] = :"@#{k}" }
 
@@ -24,22 +25,30 @@ class KWAttr < Module
       end
 
       unless required.empty?
-        method(:initialize).super_method.parameters.each do |type, name|
-          required << name if type == :keyreq && !kwargs.key?(name)
-        end
+        super_required = []
+        initialize = method(:initialize)
+        initialize.super_method.parameters.each do |type, name|
+          super_required << name if type == :keyreq && !kwargs.key?(name)
+        end if super_method
+        required.unshift(*super_required)
         raise ArgumentError,
           "missing keyword#{'s' if required.size > 1}: #{required.join(', ')}"
       end
-      unless kwargs.empty?
-        arity = method(:initialize).super_method.arity
-        if arity != -1 && arity == args.size
+
+      args << kwargs unless kwargs.empty?
+
+      begin
+
+        super(*args)
+
+      rescue ArgumentError
+        arity = super_method ? method(:initialize).super_method.arity : -1
+        if !kwargs.empty? && arity != -1 && arity == args.size - 1
           raise ArgumentError,
             "unknown keyword#{'s' if kwargs.size > 1}: #{kwargs.keys.join(', ')}"
         end
-        args << kwargs
+        raise
       end
-
-      super(*args)
     end
     $VERBOSE = verbose
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kwattr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - "Étienne Barrié"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,8 @@ files:
 - Rakefile
 - benchmark.rb
 - bin/console
+- bin/rake
+- bin/rspec
 - bin/setup
 - kwattr.gemspec
 - lib/kwattr.rb
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: attr_reader + initialize with keyword arguments