lab42_basic_constraints 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565e1a087c775182c1acd5da145eb753d5af7c3e9cd1dd15d14faa85f4d19c87
-  data.tar.gz: 839aae5929011f9e088db5fdaf869dc050bfcc85ec8286450e97ea6bcd75975f
+  metadata.gz: 672bcf05278d0a451a503939dd0ebf0f69b95914be02d466c0024717747fab76
+  data.tar.gz: d398d43d6dcbb335df544545e4b6c1ea4795c7a4b086725e9fcb4595f87b3c48
 SHA512:
-  metadata.gz: a9185a0999ba47fc278888cd04c02426a4cd02c897221d75a59abdca5166bbfa6ecfa7bf2439b95eb7af6cf0367b13713578f786fc5e40c65795306fa00d7392
-  data.tar.gz: 6097207f6d78749e7ef8f6a229f6a6a1ecdd1cf6608416bebbf3061acd193f4f06464e822f8e910692828da1cf364f463c5c91a725251d5a4a334de2ed25dce0
+  metadata.gz: 98c2067be96925b8724360ed748b91fcb606ecce255867f1da5e11958148cf55006e61a6d1f9397d47c66e552698d9b9131475389dbad69c2c128ab57dabca52
+  data.tar.gz: 7839dd0e966966d27cd560bb9b28d43b1181ca1547f116058a6923176aa04ae0a5bc81fa6a812fa75372fb2fc57951f7a4966e0c45461dbd6af0aee7e93d379d

data/README.md

@@ -17,28 +17,46 @@ Given That we alias `Lab42::BasicConstraints` to `BC`
   require "lab42/basic_constraints/alias"
 ```
 
+Given
+```ruby
+    let :all_basic_constraints do
+      %i[
+       all_digits_string alphanumeric_string
+       bool
+       date date_time day
+       hour
+       int
+       lowercase_string
+       minute month
+       non_negative_int non_negative_number number
+       positive_int positive_number
+       second string
+       uppercase_string
+       year
+      ]
+    end
+    let :all_parametrized_constraints do
+      %i[ int_range limited_string ]
+    end
+    
+```
 Then All Basic Constraints can be listed by means of `BC.all_constraints`
 
 ```ruby
-    all_basic_constraints = %i[
-     all_digits_string alphanumeric_string
-     bool
-     date date_time day
-     hour
-     int
-     lowercase_string
-     minute month
-     non_empty_string non_negative_float non_negative_int non_negative_number number
-     positive_float positive_int positive_number
-     second string
-     time
-     uppercase_string
-     year
-    ]
-
-    expect( BC.all_constraints ).to eq(all_basic_constraints)
+
+    expect( Set.new(BC.all_constraints) ).to eq(Set.new(all_basic_constraints + all_parametrized_constraints))
+```
+
+And they are implemented of course
+```ruby
+  all_basic_constraints.each do | constraint_name |
+    expect( BC.from_symbol(constraint_name) ).to be_a(BC::Constraint)
+  end
+  expect( BC.int_range(min: 0) ).to be_a(BC::Constraint)
+  expect( BC.limited_string(max: 10) ).to be_a(BC::Constraint)
 ```
 
+
 ## So we got the ball, now use it!
 
 The ball, BTW, is a `Lab42::Result` see [lab42_result gem](https://rubygems.org/gems/lab42_result/) for more info
@@ -80,16 +98,6 @@ Example: Avoiding the Exception, à la `Hash#fetch`
     expect( BC.from_symbol(:positive_number).default{42} ).to eq(42)
 ```
 
-A detailed description of all constraints can be found
-[here](speculations/constraints.md)
-
-## Context We are still in Beta and therefor
-
-Example: Some constraints are not yet implemented
-
-```ruby
-    expect{ BC.all_digits_string }.to raise_error(NotImplementedError)
-```
 
 ## Context Time's a Sticky Wicket
 
@@ -118,7 +126,7 @@ Example: Illegal Dates
 ```ruby
     d.("2020-00-01") in [raised, message ]
     expect( raised ).to eq(error)
-    expect( message ).to eq("2020-00-01 is not a legal date")
+    expect( message ).to eq(%{"2020-00-01" is not a legal date})
 ```
 
 ## Context Equality More Of A Tricky Sticker
@@ -145,6 +153,12 @@ Then we can compare as follows
     expect( def42.default ).to eq(42)
 ```
 
+## Detailed Description of all Constraints
+
+[date_and_time_constraints](date_and_time_constraints.md )
+[div_constraints](div_constraints.md )
+[string_constraints](string_constraints.md )
+
 # LICENSE
 
 Copyright 2020 Robert Dober robert.dober@gmail.com

data/lib/lab42/basic_constraints.rb

@@ -2,40 +2,37 @@ require_relative "basic_constraints/implementation.rb"
 module Lab42
   module BasicConstraints extend self
     Constraints = {
-       all_digits_string: :not_yet_implemented,
-       alphanumeric_string: :not_yet_implemented,
+       all_digits_string: :all_digits_string,
+       alphanumeric_string: :alphanumeric_string,
 
        bool: ->(x){[false, true].include? x},
 
        date: :date,
-       date_time: :not_yet_implemented,
-       day: :not_yet_implemented,
+       date_time: :date_time,
+       day: :day,
 
-       hour: :not_yet_implemented,
+       hour: :hour,
 
        int: Integer,
+       int_range: :int_range,
 
-       lowercase_string: :not_yet_implemented,
+       limited_string: :limited_string,
+       lowercase_string: :lowercase_string,
 
-       minute: :not_yet_implemented,
-       month: :not_yet_implemented,
+       minute: :minute,
+       month: :month,
     
-       non_empty_string: :not_yet_implemented,
-       non_negative_float: :not_yet_implemented,
        non_negative_int: :non_negative_int,
-       non_negative_number: :not_yet_implemented,
-       number: :not_yet_implemented,
+       non_negative_number: :non_negative_number,
+       number: Numeric,
 
-       positive_float: :not_yet_implemented,
        positive_int: :positive_int,
        positive_number: :positive_number,
 
-       second: :not_yet_implemented,
+       second: :second,
        string: String,
 
-       time: :not_yet_implemented,
-
-       uppercase_string: :not_yet_implemented,
+       uppercase_string: :uppercase_string,
 
        year: :year
     }

data/lib/lab42/basic_constraints/constraint.rb

@@ -42,6 +42,8 @@ module Lab42
         case value
         when NilClass
           "nil"
+        when String
+          value.inspect
         else
           value
         end
@@ -56,3 +58,4 @@ module Lab42
     end
   end
 end
+require_relative "constraints/int"

data/lib/lab42/basic_constraints/constraints/int.rb

@@ -0,0 +1,19 @@
+require_relative "../helpers/range_helper.rb"
+module Lab42
+  module BasicConstraints
+    class Constraint
+      class IntConstraint < Constraint
+
+        private
+        def initialize name, range: nil, min: nil, max: nil
+          super(name)
+          range = Helpers::RangeHelper.make_range!(range: range, min: min, max: max)
+          @constraint = -> (value) {
+            Integer === value && range === value
+          }
+        end
+      end
+    end
+  end
+end
+

data/lib/lab42/basic_constraints/helpers/range_helper.rb

@@ -0,0 +1,29 @@
+module Lab42
+  module BasicConstraints
+    module Helpers
+      module RangeHelper extend self
+
+        def make_range(range: nil, min: nil, max: nil)
+          return unless range || min || max
+          raise ArgumentError, "cannot provide min or max with range" if
+          range && (min || max)
+          range || _make_min_max_range(min, max) 
+        end
+
+        def make_range!(range: nil, min: nil, max: nil)
+          make_range(range: range, min: min, max: max)
+            .tap do |range|
+              raise ArgumentError, "Must provide either range or min or max" unless range
+            end
+        end
+
+        private
+        def _make_min_max_range(min, max)
+          min ||= 0
+          max ||= Float::INFINITY
+          min..max
+        end
+      end
+    end
+  end
+end

data/lib/lab42/basic_constraints/implementation.rb

@@ -1,9 +1,38 @@
 require_relative "constraint" 
+require_relative "helpers/range_helper"
 module Lab42
   module BasicConstraints
 
     module Implementation extend self
 
+      IntConstraints = {
+        day: 1..31,
+        hour: 0..23,
+        minute: 0..59,
+        month: 1..12,
+        second: 0..59
+      }
+      IntConstraints.each do |constraint_name, constraint_range|
+        define_method constraint_name do 
+          Constraint::IntConstraint.new(constraint_name, range: constraint_range)
+        end
+      end
+
+      def int_range(range: nil, min: nil, max: nil)
+        Constraint::IntConstraint.new(:int_range, range: range, min: min, max: max)
+      end
+
+      StringConstraints = {
+        all_digits_string: %r{\A\d*\z},
+        alphanumeric_string: %r{\A[[:alnum:]]*\z}
+      }
+
+      StringConstraints.each do |constraint_name, constraint_rgx|
+        define_method constraint_name do |size: nil, min: nil, max: nil|
+          _regex_constraint(constraint_name, constraint_rgx, size: size, min: min, max: max)
+        end
+      end
+
       def date default: nil
         require "date"
         Constraint.new(:date) do |value|
@@ -14,29 +43,55 @@ module Lab42
         end
       end
 
-      def non_negative_int
-        Constraint.new :non_negative_int do |value|
-          Integer === value && value >= 0
+      def date_time default: nil
+        require "date"
+        Constraint.new(:date_time) do |value|
+          DateTime.parse(value) rescue false
+        end
+          .set_default default do
+          DateTime.now.iso8601
+        end
+      end
+
+      def limited_string size: nil, min: nil, max: nil
+        size_range = Helpers::RangeHelper.make_range!(range: size, min: min, max: max)
+        Constraint.new(:limited_string) do |value|
+          String === value && size_range === value.size
+        end
+      end
+
+      def lowercase_string
+        Constraint.new :lowercase_string do |value|
+          String === value && value.downcase == value
         end
+      end
+
+      def non_negative_int
+        Constraint::IntConstraint.new(:non_negative_int, min: 0)
           .set_default(0)
       end
 
-      def positive_int
-        Constraint.new :positive_int do 
-          Integer === _1 && _1 > 0 
+      def non_negative_number
+        Constraint.new :non_negative_number do |value|
+          Numeric === value && !(Complex === value) && value >= 0
         end
+      end
+
+      def positive_int
+        Constraint::IntConstraint.new(:positive_int, min: 1)
           .set_default(1)
       end
 
       def positive_number
         Constraint.new :positive_number do |value|
-          Integer === value && value > 0 ||
-            Float === value && value > 0.0
+          Numeric === value && value > 0
         end
       end
 
-      def not_yet_implemented
-        raise NotImplementedError
+      def uppercase_string
+        Constraint.new :uppercase_string do |value|
+          String === value && value.upcase == value
+        end
       end
 
       def year
@@ -47,6 +102,22 @@ module Lab42
             Time.now.utc.year
           end
       end
+
+
+      private
+
+      def _regex_constraint(name, rgx, size: nil, min: nil, max: nil)
+        range_size = Helpers::RangeHelper.make_range(range: size, min: min, max: max)
+        if range_size
+          Constraint.new(name) do |value|
+            String === value && range_size === value.size && rgx === value
+          end
+        else
+          Constraint.new(name) do |value|
+            String === value && rgx === value
+          end
+        end
+      end
     end
   end
 end

data/lib/lab42/basic_constraints/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   module BasicConstraints
-    VERSION = "0.1.5"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_basic_constraints
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2020-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lab42_result
@@ -91,6 +91,8 @@ files:
 - lib/lab42/basic_constraints.rb
 - lib/lab42/basic_constraints/alias.rb
 - lib/lab42/basic_constraints/constraint.rb
+- lib/lab42/basic_constraints/constraints/int.rb
+- lib/lab42/basic_constraints/helpers/range_helper.rb
 - lib/lab42/basic_constraints/implementation.rb
 - lib/lab42/basic_constraints/version.rb
 homepage: https://bitbucket.org/robertdober/lab42_basic_constraints