haveapi 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5949089f07c15226d74339f06a2dc0c1f09fb8
-  data.tar.gz: 8b6f6e19b9c3b21ec1ea7ce9aaa47fb0bbeb6589
+  metadata.gz: f19eb81f8b3f54654715dfaa52c85e17675860a6
+  data.tar.gz: 5b5013c9f1b52af5a55935fd44d78a845d2fdd7d
 SHA512:
-  metadata.gz: a7e6f414ffd0950b1c5a0acad38dc8821054dcb9bd82a28cba1b2cd30712d21476a36467b36be0223ea17d3a0336469d8685332fecc4a36ceb87057b917b79e6
-  data.tar.gz: c088d335f5588f90a1c9cb3ea5ce7f7799f14981d4a4d8eb1a46adf707c6c51fbc07689ce36b7c88c567f5a5cd8fb441789bd01a01990c2e28e6a1f8538cf428
+  metadata.gz: 8b1df715121edd42ba79af47601e2d5daa87226a2a4cdf887d6d54b046e5a287e17451d8950a8c9ed722ccfb8eed4cd0e6343b1fd6aa574db4fa39515c41c048
+  data.tar.gz: a2c9fec65f9ab767b856f1144732109262f44c803c67d634fd7f9b62d81919bfc210d8ae660b43ef820762489eba54b35a7a1799a1f9ee91eb8fdfc3df16000c

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Sun Jan 24 2016 - version 0.4.2
+- Inclusion validator: handle hash correctly, don't overwrite given values
+
 * Sat Jan 23 2016 - version 0.4.1
 - Fix parameter label setting
 - Don't change hash arguments given to parameters

data/haveapi.gemspec

@@ -5,7 +5,7 @@ require 'haveapi/version'
 Gem::Specification.new do |s|
   s.name        = 'haveapi'
   s.version     = HaveAPI::VERSION
-  s.date        = '2016-01-20'
+  s.date        = '2016-01-24'
   s.summary     =
   s.description = 'Framework for creating self-describing APIs'
   s.authors     = 'Jakub Skokan'

data/lib/haveapi/validators/inclusion.rb

@@ -16,8 +16,17 @@ module HaveAPI
     takes :choices, :include
 
     def setup
-      @values = (simple? ? take : take(:values)).map! do |v|
-        v.is_a?(::Symbol) ? v.to_s : v
+      values = simple? ? take : take(:values)
+
+      if values.is_a?(::Hash)
+        @values = {}
+
+        values.each do |k, v|
+          @values[k.is_a?(::Symbol) ? k.to_s : k] = v
+        end
+
+      else
+        @values = values.map { |v| v.is_a?(::Symbol) ? v.to_s : v }
       end
 
       @message = take(:message, '%{value} cannot be used')

data/lib/haveapi/version.rb

@@ -1,4 +1,4 @@
 module HaveAPI
   PROTOCOL_VERSION = '1.0'
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all