reflekt 1.0.9 → 1.0.10

data/lib/rules/array_rule.rb

@@ -1,90 +1,94 @@
 require_relative '../rule'
 
 module Reflekt
-class ArrayRule < Rule
-
-  def initialize()
-
-    @type = :array
-    @min = nil
-    @max = nil
-    @min_length = nil
-    @max_length = nil
-
-  end
-
-  ##
-  # @param meta [ArrayMeta]
-  ##
-  def train(meta)
-
-    # Min value.
-    if @min.nil?
-      @min = meta[:min]
-    else
-      @min = meta[:min] if meta[:min] < @min
+  class ArrayRule < Rule
+
+    def initialize()
+      @type = :array
+      @min = nil
+      @max = nil
+      @min_length = nil
+      @max_length = nil
     end
 
-    # Max value.
-    if @max.nil?
-      @max = meta[:max]
-    else
-      @max = meta[:max] if meta[:max] > @max
+    ##
+    # @param meta [ArrayMeta]
+    ##
+    def train(meta)
+      if Meta.numeric? meta[:min]
+        # Min value.
+        meta_min = meta[:min].to_i
+        if @min.nil?
+          @min = meta_min
+        else
+          @min = meta_min if meta_min < @min
+        end
+
+        # Max value.
+        meta_max = meta[:max].to_i
+        if @max.nil?
+          @max = meta_max
+        else
+          @max = meta_max if meta_max > @max
+        end
+      end
+
+      # Min length.
+      if @min_length.nil?
+        @min_length = meta[:length]
+      else
+        @min_length = meta[:length] if meta[:length] < @min_length
+      end
+
+      # Max length.
+      if @max_length.nil?
+        @max_length = meta[:length]
+      else
+        @max_length = meta[:length] if meta[:length] > @max_length
+      end
     end
 
-    # Min length.
-    if @min_length.nil?
-      @min_length = meta[:length]
-    else
-      @min_length = meta[:length] if meta[:length] < @min_length
+    ##
+    # @param value [Array]
+    ##
+    def test(value)
+      # Handle empty value.
+      return true if value.empty? && @min_length == 0 && @max_length == 0
+
+      unless value.empty?
+        # Numbers only; if the value is a string then there will be no min/max.
+        unless @min.nil? || @max.nil?
+          return false if value.min() < @min
+          return false if value.max() > @max
+        end
+
+        # Min/max length.
+        return false if value.length < @min_length
+        return false if value.length > @max_length
+      end
+
+      true
     end
 
-    # Max length.
-    if @max_length.nil?
-      @max_length = meta[:length]
-    else
-      @max_length = meta[:length] if meta[:length] > @max_length
+    def result()
+      {
+        :type => @type,
+        :min => @min,
+        :max => @max,
+        :min_length => @min_length,
+        :max_length => @max_length
+      }
     end
 
-  end
-
-  ##
-  # @param value [Array]
-  ##
-  def test(value)
-
-    # Min/max value.
-    return false if value.min() < @min
-    return false if value.max() > @max
+    def random()
+      array = Array.new(rand(@min_length..@max_length))
 
-    # Min/max length.
-    return false if value.length < @min_length
-    return false if value.length > @max_length
+      array.each_with_index do |item, index|
+        array[index] = rand(@min..@max)
+      end
 
-    true
-  end
-
-  def result()
-    {
-      :type => @type,
-      :min => @min,
-      :max => @max,
-      :min_length => @min_length,
-      :max_length => @max_length
-    }
-  end
-
-  def random()
-
-    array = Array.new(rand(@min_length..@max_length))
-
-    array.each_with_index do |item, index|
-      array[index] = rand(@min..@max)
+      return array
     end
 
-    return array
-
   end
-
-end
 end

data/lib/rules/boolean_rule.rb

@@ -2,48 +2,42 @@ require 'set'
 require_relative '../rule'
 
 module Reflekt
-class BooleanRule < Rule
+  class BooleanRule < Rule
 
-  def initialize()
-
-    @type = :bool
-    @booleans = Set.new()
-
-  end
-
-  ##
-  # @param meta [BooleanMeta]
-  ##
-  def train(meta)
-
-    value = meta[:value]
-
-    unless value.nil?
-      @booleans << value
+    def initialize()
+      @type = :bool
+      @booleans = Set.new()
     end
 
-  end
+    ##
+    # @param meta [BooleanMeta]
+    ##
+    def train(meta)
+      value = meta[:value]
 
-  ##
-  # @param value [Boolean]
-  ##
-  def test(value)
+      unless value.nil?
+        @booleans << value
+      end
+    end
 
-    # Booleans are stored as strings.
-    @booleans.include? value.to_s
+    ##
+    # @param value [Boolean]
+    ##
+    def test(value)
+      # Booleans are stored as strings.
+      @booleans.include? value.to_s
+    end
 
-  end
+    def result()
+      {
+        :type => @type,
+        :booleans => @booleans
+      }
+    end
 
-  def result()
-    {
-      :type => @type,
-      :booleans => @booleans
-    }
-  end
+    def random()
+      @booleans.to_a.sample
+    end
 
-  def random()
-    @booleans.to_a.sample
   end
-
-end
 end

data/lib/rules/float_rule.rb

@@ -1,59 +1,55 @@
 require_relative '../rule'
 
 module Reflekt
-class FloatRule < Rule
+  class FloatRule < Rule
 
-  def initialize()
-
-    @type = :float
-    @min = nil
-    @max = nil
-
-  end
-
-  ##
-  # @param meta [FloatMeta]
-  ##
-  def train(meta)
-
-    value = meta[:value]
-
-    if @min.nil?
-      @min = value
-    else
-      @min = value if value < @min
+    def initialize()
+      @type = :float
+      @min = nil
+      @max = nil
     end
 
-    if @max.nil?
-      @max = value
-    else
-      @max = value if value > @max
+    ##
+    # @param meta [FloatMeta]
+    ##
+    def train(meta)
+      value = meta[:value]
+
+      if @min.nil?
+        @min = value
+      else
+        @min = value if value < @min
+      end
+
+      if @max.nil?
+        @max = value
+      else
+        @max = value if value > @max
+      end
     end
 
-  end
-
-  ##
-  # @param value [Float]
-  ##
-  def test(value)
-
-    return false if value < @min
-    return false if value > @max
+    ##
+    # @param value [Float]
+    ##
+    def test(value)
+      # Numbers only; if the value is a string then there will be no min/max.
+      unless @min.nil? || @max.nil?
+        return false if value < @min
+        return false if value > @max
+      end
+    end
 
-    true
-  end
+    def result()
+      {
+        :type => @type,
+        :min => @min,
+        :max => @max
+      }
+    end
 
-  def result()
-    {
-      :type => @type,
-      :min => @min,
-      :max => @max
-    }
-  end
+    def random()
+      rand(@min..@max)
+    end
 
-  def random()
-    rand(@min..@max)
   end
-
-end
 end

data/lib/rules/integer_rule.rb

@@ -1,59 +1,55 @@
 require_relative '../rule'
 
 module Reflekt
-class IntegerRule < Rule
+  class IntegerRule < Rule
 
-  def initialize()
-
-    @type = :int
-    @min = nil
-    @max = nil
-
-  end
-
-  ##
-  # @param meta [IntegerMeta]
-  ##
-  def train(meta)
-
-    value = meta[:value]
-
-    if @min.nil?
-      @min = value
-    else
-      @min = value if value < @min
+    def initialize()
+      @type = :int
+      @min = nil
+      @max = nil
     end
 
-    if @max.nil?
-      @max = value
-    else
-      @max = value if value > @max
+    ##
+    # @param meta [IntegerMeta]
+    ##
+    def train(meta)
+      value = meta[:value]
+
+      if @min.nil?
+        @min = value
+      else
+        @min = value if value < @min
+      end
+
+      if @max.nil?
+        @max = value
+      else
+        @max = value if value > @max
+      end
     end
 
-  end
-
-  ##
-  # @param value [Integer]
-  ##
-  def test(value)
-
-    return false if value < @min
-    return false if value > @max
+    ##
+    # @param value [Integer]
+    ##
+    def test(value)
+      # Numbers only; if the value is a string then there will be no min/max.
+      unless @min.nil? || @max.nil?
+        return false if value < @min
+        return false if value > @max
+      end
+    end
 
-    true
-  end
+    def result()
+      {
+        :type => @type,
+        :min => @min,
+        :max => @max
+      }
+    end
 
-  def result()
-    {
-      :type => @type,
-      :min => @min,
-      :max => @max
-    }
-  end
+    def random()
+      rand(@min..@max)
+    end
 
-  def random()
-    rand(@min..@max)
   end
-
-end
 end