bogo 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eacb7f10b81571c766b7759aa06a996ab4ec27e3
-  data.tar.gz: 09e823bcc4bba8a285e77dab4b447b206d22ca30
+  metadata.gz: a0ca167fdd60981d76b2fc29178e9f5ebdb31dd5
+  data.tar.gz: 44b90c260e3099cdc593db60aac12fd146c48d65
 SHA512:
-  metadata.gz: ce3eb6340472885af82320813bb344df09fbf3ce7d5c343df5544c4413b971f89f53d374d9a040c9c47fb2f4daebf654afc138ac4b691b5f01fe1ac98cda1222
-  data.tar.gz: 309fed02b6250c5dafe73388aa2851bd0a7370f13779ae28be0b94b045bd5b79fa70f9f32e5632806ae5a9d9293676fe7510b50962c0ebf7297d932d1d3eed30
+  metadata.gz: 19c043fd999d61d5ee2abe1dfb1b20db13f07a0aa22b206a91d08175c8847d903c6294bd919e4d5c73816c871c8872f9459c3314fdbf6732b241c28b79115e81
+  data.tar.gz: 487018eaaf832cd79e7b318454f6c56cb624b2a9334f258c9fe47a3c27c7805340873cb91bbecc86ff0c70b5a098504f17a4f082f8fc6f9f7fed7bf1bec91312

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.1.24
+* [Lazy] Allow multiple results from coercion output
+
 ## v0.1.22
 * Fix CONNECT requests for HTTPS endpoints to properly include port
 

data/lib/bogo/lazy.rb

@@ -149,20 +149,33 @@ module Bogo
             end
             if(coerce && !valid_type)
               item = coerce.arity == 2 ? coerce.call(item, self) : coerce.call(item)
+              if(item.is_a?(Hash) && item[:bogo_multiple])
+                item = item[:bogo_multiple]
+              else
+                item = [item]
+              end
+            else
+              item = [item]
             end
-            valid_type = valid_types.detect do |klass|
-              item.is_a?(klass)
+            invalid_type = item.detect do |_item|
+              valid_types.none? do |klass|
+                _item.is_a?(klass)
+              end
             end
-            unless(valid_type)
-              raise TypeError.new("Invalid type for `#{name}` (#{item} <#{item.class}>). Valid - #{valid_types.map(&:to_s).join(',')}")
+            if(invalid_type)
+              raise TypeError.new("Invalid type for `#{name}` (#{invalid_type} <#{invalid_type.class}>). Valid - #{valid_types.map(&:to_s).join(',')}")
             end
             if(allowed_values)
-              unless(allowed_values.include?(item))
-                raise ArgumentError.new("Invalid value provided for `#{name}` (#{item.inspect}). Allowed - #{allowed_values.map(&:inspect).join(', ')}")
+              unallowed = item.detect do |_item|
+                !allowed_values.include?(_item)
+              end
+              if(unallowed)
+                raise ArgumentError.new("Invalid value provided for `#{name}` (#{unallowed.inspect}). Allowed - #{allowed_values.map(&:inspect).join(', ')}")
               end
             end
             item
           end
+          values.flatten!(1)
           if(!multiple_values && !val.is_a?(Array))
             dirty[name] = values.first
           else

data/lib/bogo/version.rb

@@ -1,4 +1,4 @@
 module Bogo
   # Current library version
-  VERSION = Gem::Version.new('0.1.22')
+  VERSION = Gem::Version.new('0.1.24')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -113,4 +113,3 @@ signing_key:
 specification_version: 4
 summary: Helper libraries
 test_files: []
-has_rdoc: