rfunk 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec532b32fd38be6e04ec01ae02286f819584280
-  data.tar.gz: f212f9e4a604954c7ab0c28a1b910e346ff51098
+  metadata.gz: d0eb1a32853f93bfe2ebaa1548e4629afde49442
+  data.tar.gz: 3eb3bf01eadc2ad1821d09dc50583e7d9ada2b75
 SHA512:
-  metadata.gz: ffd6c18290923c1389d662673b5c20ba6ca38103eed9380bf83a5544df25a68a652e090d7a3ec40d6938c6953305d9dd42ff784539fd3b6b9227b460ca81e584
-  data.tar.gz: 64e02d009bb438c45dd3887d1c945d727e4fd067f3117bfdbeb239f4cab3d9a5cca073852a09d25eeb242ee6fb88936bc8c70de54f903e83ad03d78991e71fe4
+  metadata.gz: 75ebb4f28b6332111a18fede512cdf3e584874ec668b025a5789b859caee509dc2f496e9d0d247ccabac42bb15a177497c2fdff84a374eb20b26c684924e1574
+  data.tar.gz: 99873499286bf55002c93c4b0a314050cfc0d62f3f135ba3ce5ff951ff5ad4de6f2279555fc65d483e9b0ca00c2934c8f992ded2ab8a6a2ca50beac0ac688623

data/lib/rfunk/attribute/attribute_definition.rb

@@ -19,7 +19,7 @@ module RFunk
                                       variable_name: variable_name(name),
                                       value: value)
         else
-          RFunk::Option(instance_variable_get(variable_name(name)))
+          RFunk.option(instance_variable_get(variable_name(name)))
         end
       end
     end

data/lib/rfunk/attribute/attribute_function.rb

@@ -15,9 +15,9 @@ module RFunk
       case definition
       when Hash
         return_type = RFunk::TypeAnnotation.new(definition.values.first.to_s)
-        RFunk::Tuple(definition.keys.first, return_type)
+        RFunk.tuple(definition.keys.first, return_type)
       else
-        RFunk::Tuple(definition)
+        RFunk.tuple(definition)
       end
     end
   end

data/lib/rfunk/attribute/function.rb

@@ -18,7 +18,7 @@ module RFunk
           self.variables = variables.merge(options)
         end
       else
-        RFunk::Some(RFunk::Some(variables)[options])
+        RFunk.some(RFunk.some(variables)[options])
       end
     end
 
@@ -47,7 +47,7 @@ module RFunk
         execute_body_block
       else
         validate_return_type(return_value)
-        RFunk::Option(return_value)
+        RFunk.option(return_value)
       end
     end
 
@@ -67,7 +67,7 @@ module RFunk
     def execute_body_block
       execute_block pre_block, RFunk::PreConditionError
 
-      RFunk::Option(instance_eval(&body_block)).tap do |body|
+      RFunk.option(instance_eval(&body_block)).tap do |body|
         execute_block post_block, RFunk::PostConditionError
         validate_return_type(body)
       end
@@ -79,7 +79,7 @@ module RFunk
     end
 
     def error_checking
-      RFunk::Lazy(-> { RFunk::ErrorChecking.new }).value
+      RFunk.lazy(-> { RFunk::ErrorChecking.new }).value
     end
 
     def validate_return_type(return_value)
@@ -91,7 +91,7 @@ module RFunk
     def validate_parameter_types(*args)
       values = args.zip(type_annotation.parameters)
       values.each_with_index do |v, i|
-        tuple = RFunk::Tuple(*v)
+        tuple = RFunk.tuple(*v)
         error_checking.raise_expected_parameter_type(i + 1, tuple.value(0), tuple.value(1))
       end
     end

data/lib/rfunk/either/either.rb

@@ -9,7 +9,7 @@ module RFunk
       when RFunk::Some, RFunk::None
         value
       else
-        RFunk::Option(value)
+        RFunk.option(value)
       end
     end
 
@@ -22,31 +22,33 @@ module RFunk
     attr_reader :value
   end
 
-  def Either(value)
-    if lambda?(value)
-      either_with_lambda(value)
-    else
-      either_with_value(value)
+  class << self
+    def either(value)
+      if lambda?(value)
+        either_with_lambda(value)
+      else
+        either_with_value(value)
+      end
     end
-  end
 
-  private
+    private
 
-  def lambda?(value)
-    value.respond_to?(:lambda?) && value.lambda?
-  end
+    def lambda?(value)
+      value.respond_to?(:lambda?) && value.lambda?
+    end
 
-  def either_with_lambda(lambda)
-    RFunk::Success(lambda.call)
-  rescue => e
-    RFunk::Failure(e)
-  end
+    def either_with_lambda(lambda)
+      RFunk.success(lambda.call)
+    rescue => e
+      RFunk.failure(e)
+    end
 
-  def either_with_value(value)
-    if value
-      RFunk::Success(value)
-    else
-      RFunk::Failure(value)
+    def either_with_value(value)
+      if value
+        RFunk.success(value)
+      else
+        RFunk.failure(value)
+      end
     end
   end
 end

data/lib/rfunk/either/failure.rb

@@ -9,11 +9,13 @@ module RFunk
     end
 
     def or(value)
-      RFunk::Failure(value)
+      RFunk.failure(value)
     end
   end
 
-  def Failure(value)
-    RFunk::Failure.new(value)
+  class << self
+    def failure(value)
+      RFunk::Failure.new(value)
+    end
   end
 end

data/lib/rfunk/either/success.rb

@@ -13,7 +13,9 @@ module RFunk
     end
   end
 
-  def Success(value)
-    RFunk::Success.new(value)
+  class << self
+    def success(value)
+      RFunk::Success.new(value)
+    end
   end
 end

data/lib/rfunk/lazy.rb

@@ -8,7 +8,7 @@ module RFunk
 
     def value
       atomic.update { @value ||= lambda.call.tap { self.created = true } }
-      RFunk::Option(atomic.value)
+      RFunk.option(atomic.value)
     end
 
     def created?
@@ -21,7 +21,9 @@ module RFunk
     attr_accessor :created
   end
 
-  def Lazy(lambda)
-    RFunk::Lazy.new(lambda)
+  class << self
+    def lazy(lambda)
+      RFunk::Lazy.new(lambda)
+    end
   end
 end

data/lib/rfunk/maybe/none.rb

@@ -3,11 +3,11 @@ module RFunk
     include Singleton
 
     def value(default = None())
-      RFunk::Option(default)
+      RFunk.option(default)
     end
 
     def or(other)
-      RFunk::Option(other)
+      RFunk.option(other)
     end
 
     def pipe(&_block)
@@ -41,7 +41,9 @@ module RFunk
     end
   end
 
-  def None(value = nil)
-    RFunk::Option(value)
+  class << self
+    def none(value = nil)
+      RFunk.option(value)
+    end
   end
 end

data/lib/rfunk/maybe/option.rb

@@ -9,23 +9,25 @@ module RFunk
     end
   end
 
-  def Option(value)
-    if [RFunk::Some, RFunk::None].map { |t| value.is_a?(t) }.any?
-      value
-    elsif nothing?(value)
-      RFunk::None.instance
-    else
-      RFunk::Some.new(value)
+  class << self
+    def option(value)
+      if [RFunk::Some, RFunk::None].map { |t| value.is_a?(t) }.any?
+        value
+      elsif nothing?(value)
+        RFunk::None.instance
+      else
+        RFunk::Some.new(value)
+      end
     end
-  end
 
-  private
+    private
 
-  def nothing?(value)
-    value.nil? || empty?(value) || value == RFunk::None.instance
-  end
+    def nothing?(value)
+      value.nil? || empty?(value) || value == RFunk::None.instance
+    end
 
-  def empty?(value)
-    value.respond_to?(:empty?) && value.empty?
+    def empty?(value)
+      value.respond_to?(:empty?) && value.empty?
+    end
   end
 end

data/lib/rfunk/maybe/some.rb

@@ -6,7 +6,7 @@ module RFunk
       @value = value
     end
 
-    def value(_ = RFunk::None())
+    def value(_ = RFunk.none)
       @value
     end
 
@@ -16,16 +16,16 @@ module RFunk
 
     def pipe(&block)
       return self if block.nil?
-      RFunk::Option(yield value)
+      RFunk.option(yield value)
     end
 
     def method_missing(method, *arguments, &block)
-      RFunk::Option(value.send(method, *arguments, &block))
+      RFunk.option(value.send(method, *arguments, &block))
     end
 
     def ==(other)
       return false unless self.class == other.class
-      value == Option(other).value
+      value == RFunk.option(other).value
     end
 
     def <=>(other)
@@ -53,7 +53,9 @@ module RFunk
     end
   end
 
-  def Some(value)
-    RFunk::Option(value)
+  class << self
+    def some(value)
+      RFunk.option(value)
+    end
   end
 end

data/lib/rfunk/tuple.rb

@@ -9,9 +9,9 @@ module RFunk
       index = args[0]
 
       if args.length == 1
-        RFunk::Option(values[index])
+        RFunk.option(values[index])
       else
-        self.class.new(values.dup.tap { |v| v[index] = RFunk::Option(args[1]) })
+        self.class.new(values.dup.tap { |v| v[index] = RFunk.option(args[1]) })
       end
     end
 
@@ -20,7 +20,9 @@ module RFunk
     attr_reader :values
   end
 
-  def Tuple(*values)
-    RFunk::Tuple.new(values)
+  class << self
+    def tuple(*values)
+      RFunk::Tuple.new(values)
+    end
   end
 end

data/lib/rfunk/version.rb

@@ -1,3 +1,3 @@
 module RFunk
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfunk
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Alex Falkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_nine