rfunk 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc26308719f1b6cf6ed53cd81ece766ed60ed018
-  data.tar.gz: 0afa0c48191b3a39c823e1017929d8003f7a185f
+  metadata.gz: 4b5447322ac1833162ac06dac237b8b44cb4c5a9
+  data.tar.gz: 1692b4f6f46cf8429a8b9a4b9b8e9abfe1d9a955
 SHA512:
-  metadata.gz: 30138d9602df5a5b7baf9b317c13976936ff3813d052512b2f8f2ec984f6ce31528af1e0dd107a2eec35cd803ffcf3acbad775f3dbc2581eba5d83b19e21b99c
-  data.tar.gz: 13d30eb52a1504b0cf3d0975ed1af430d99be6164c637f475ec8655b2a25b9fa59e8dc618cafb657307f6318c92a508a27a769f63925931bbfe030a7c06ef4d7
+  metadata.gz: 3a8c0f8505a6de0526f0bf303bf573fe2da1adc988bf61e02aa40d3bb7602e560c7fdd227f94cdece90950c8251f0eaf3efdffb6849fa9c0fb95e26f37d38782
+  data.tar.gz: 142da352a33aa1ffe2cb23f26c3db2c178053ab219b7431f6b0872dcbc20c64a8c4e68d5374f592260fa7a5bb27f8167c477716ba45579fd59335a897ad5c35c

data/lib/rfunk/attribute/error_checking.rb

@@ -4,16 +4,16 @@ module RFunk
       raise type, 'The condition was not met!' unless value
     end
 
-    def raise_expected_return_type(name, value, type)
-      raise_return_type_with_message name, value, type, 'return'
+    def raise_expected_return_type(name, value, types)
+      raise_return_type_with_message name, value, types, 'return'
     end
 
-    def raise_expected_attribute_type(name, value, type)
-      raise_return_type_with_message name, value, type, 'attribute'
+    def raise_expected_attribute_type(name, value, types)
+      raise_return_type_with_message name, value, types, 'attribute'
     end
 
-    def raise_expected_parameter_type(name, value, type)
-      raise_return_type_with_message name, value, type, 'parameter'
+    def raise_expected_parameter_type(name, value, types)
+      raise_return_type_with_message name, value, types, 'parameter'
     end
 
     def raise_not_found(key, attributes)
@@ -30,13 +30,15 @@ module RFunk
 
     private
 
-    def raise_return_type_with_message(name, value, type, message)
-      case value
-      when RFunk::Some
-        expected_type?(name, value.value, type, message)
-      when RFunk::None
-      else
-        expected_type?(name, value, type, message)
+    def raise_return_type_with_message(name, value, types, message)
+      Array(types).each do |type|
+        case value
+        when RFunk::Some
+          expected_type?(name, value.value, type, message)
+        when RFunk::None
+        else
+          expected_type?(name, value, type, message)
+        end
       end
     end
 

data/lib/rfunk/attribute/type_annotation.rb

@@ -3,24 +3,15 @@ module RFunk
     attr_reader :parameters, :return
 
     def initialize(annotation)
-      option = RFunk::Option(annotation)
-      split = option.split('->')
-      parameters = split.select { |v| v.count == 2 }
-
-      @parameters = create_parameters(parameters)
-      @return = create_return(split)
+      split = (annotation || '').split('->').map(&:strip)
+      @parameters = create_types(split.length > 1 ? Array(split.first) : [])
+      @return = create_types(Array(split.last))
     end
 
     private
 
-    def create_parameters(parameters)
-      parameters.flat_map { |v| v[0].split(',').map { |p| Object.const_get(p.strip) } }
-    end
-
-    def create_return(split)
-      RFunk::Option(split.map do |v|
-                      v.count == 2 ? Object.const_get(v[1].strip) : Object.const_get(v[0].strip)
-                    end.first).value
+    def create_types(parameters)
+      parameters.flat_map { |v| v.split(',') }.map(&:strip).map { |p| Object.const_get(p) }
     end
   end
 end

data/lib/rfunk/maybe/none.rb

@@ -18,10 +18,6 @@ module RFunk
       self
     end
 
-    def respond_to_missing?(method_name, include_private = false)
-      super
-    end
-
     def coerce(other)
       [other, 0]
     end

data/lib/rfunk/maybe/option.rb

@@ -22,6 +22,10 @@ module RFunk
   private
 
   def nothing?(value)
-    value.nil? || (value.respond_to?(:empty?) && value.empty?) || value == RFunk::None.instance
+    value.nil? || empty?(value) || value == RFunk::None.instance
+  end
+
+  def empty?(value)
+    value.respond_to?(:empty?) && value.empty?
   end
 end

data/lib/rfunk/maybe/some.rb

@@ -23,14 +23,9 @@ module RFunk
       RFunk::Option(value.send(method, *arguments, &block))
     end
 
-    def respond_to_missing?(method_name, include_private = false)
-      value.respond_to_missing?(method_name, include_private)
-    end
-
     def ==(other)
       return false unless self.class == other.class
-
-      value == other.value
+      value == Option(other).value
     end
 
     def <=>(other)
@@ -48,7 +43,13 @@ module RFunk
     protected
 
     def enum
-      [value]
+      enumerable? ? value : [value]
+    end
+
+    private
+
+    def enumerable?
+      value.is_a?(Enumerable)
     end
   end
 

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine