lab42_basic_constraints 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1670a94a94e7a862d42f660df6b15c38efd8aada76025516353d73c8f146a48
-  data.tar.gz: e7620b5d6b2ae1813d17cff3cce12fa6a935728f24d612d2a36451bc526dfcf2
+  metadata.gz: 9805a493dac3acaa452c4a1a22888e78c3f8b63e1b1624e2ce5fa8604db92706
+  data.tar.gz: f76c354a6dce71e35e76a9ba4e5edcd3a11e77206f8a2c199be1f0ea8e0d8667
 SHA512:
-  metadata.gz: 5416abb445fd45109ad28acc167c842d801467119469fcf4d1ffc81de578daab6cdfc5c361e018079bc23bfaa762860289cb09516b267c8621bee1262c398657
-  data.tar.gz: '0148614a24de35f98bc4f997dae7388492f386e1ab980f90e4835ea94ae3c7da00c8741f3063e6028575e430b34deccb9dba89a6debec79feeff87c3bc77b9a0'
+  metadata.gz: 4e07c41ee4c38e521e6312dac59873b2a27127292a3c59bb554df3c3e2724c1209b96fcd9c4153fbe6dc11e752c1965acb45a6c8db2d0b17b50cd89af6a9be9e
+  data.tar.gz: 889fa0aba02c77788aa583275c1daf83802d9277abcf7d47955cf73020266702f2da9e8e807e83f29cb3182dce3982b72a69d3edf06d911a0b4c33262846fbd2

data/README.md

@@ -17,27 +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 symbol
+       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
-     lowercase_string
-     minute month
-     non_empty_string non_negative_float non_negative_int non_negative_number
-     positive_float positive_int positive_number
-     second
-     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
@@ -74,17 +93,12 @@ Example: Constraints with and without defaults
 
 ```
 
-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
-
+Example: Avoiding the Exception, à la `Hash#fetch` 
 ```ruby
-    expect{ BC.all_digits_string }.to raise_error(NotImplementedError)
+    expect( BC.from_symbol(:positive_number).default{42} ).to eq(42)
 ```
 
+
 ## Context Time's a Sticky Wicket
 
 ... but as defaults are defined for runtime that shall really help us with that
@@ -112,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
@@ -139,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,37 +2,38 @@ 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,
 
-       lowercase_string: :not_yet_implemented,
+       int: Integer,
+       int_range: :int_range,
 
-       minute: :not_yet_implemented,
-       month: :not_yet_implemented,
+       limited_string: :limited_string,
+       lowercase_string: :lowercase_string,
+
+       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: :non_negative_number,
+       number: Numeric,
 
-       non_negative_number: :not_yet_implemented,
-
-       positive_float: :not_yet_implemented,
-       positive_int: :not_yet_implemented,
+       positive_int: :positive_int,
        positive_number: :positive_number,
 
-       second: :not_yet_implemented,
-
-       time: :not_yet_implemented,
+       second: :second,
+       string: String,
+       symbol: Symbol,
 
-       uppercase_string: :not_yet_implemented,
+       uppercase_string: :uppercase_string,
 
        year: :year
     }
@@ -49,6 +50,8 @@ module Lab42
         Constraint.new(name, &cons)
       when Symbol
         Implementation.send(cons, *args, **kwds)
+      when Class
+        Constraint.new(name){ cons === _1 }
       end
     end
 

data/lib/lab42/basic_constraints/constraint.rb

@@ -12,12 +12,17 @@ module Lab42
         Result.error("#{_show value} is not a legal #{@name}", error: Lab42::BasicConstraints::ConstraintError)
       end
 
-      def default
-        case @default
-        when Proc
-          @default.()
+      def default &blk
+        if @has_default
+          case @default
+          when Proc
+            @default.()
+          else
+            @default
+          end
         else
-          @default
+          return blk.() if blk
+          raise Lab42::BasicConstraints::MissingDefaultError, "Constraint #{name} has no predefined default"
         end
       end
 
@@ -28,6 +33,7 @@ module Lab42
           else
             blk
           end
+        @has_default = true
         self
       end
 
@@ -36,6 +42,8 @@ module Lab42
         case value
         when NilClass
           "nil"
+        when String
+          value.inspect
         else
           value
         end
@@ -43,9 +51,11 @@ module Lab42
 
       def initialize name, &blk
         @constraint = blk
-        @default = -> {raise Lab42::BasicConstraints::MissingDefaultError, "Constraint #{name} has no predefined default"}
+        @has_default = false
+        @default = -> {}
         @name = name
       end
     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,22 +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 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
@@ -40,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.2"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_basic_constraints
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Dober
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-27 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
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Basic, useful and recurring constraints