rasti-form 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c52204d2ee5fd0dec69e737cb54dcaadc0e1aefa
-  data.tar.gz: '08a1332b2f45c622de662393a551cda4797f1ce8'
+  metadata.gz: 9dd0424409c0c7232782c40cde8dbf7fa84752d3
+  data.tar.gz: a7c8be9e98dcc9e6d52482469486ba643a0ffa33
 SHA512:
-  metadata.gz: d83646128669902f9d7bbfd367ac7b92f9a683258687675b15725f8fab3b0c6778f6fb1553f8c5b7149f419d9b2768f6a3004471ecb28b4b1463086bd6371af8
-  data.tar.gz: 3600ad2b86770649044ce09d55025d6d1b51dda7e772f016c7bd7f134a634100b6e0d7bce45a3028071b51cf3762685109bfe6820cfc91e9aeb19a48c0f47fcc
+  metadata.gz: a2fb881aec7bca876dd58a3c2bf3e6dcca8ac3f13777437992f4e359d07856c9a7075e4b4c51882f41cb30ffacb8ebf85616632898efbfa02ccd7abea6a7e81c
+  data.tar.gz: c77fed8829801cae565a567f3303b8c4271e5a9b3b79c7ac2f04475e48a9bc6d884e80e2253903a0374a4848d635cf0576a1b191044c850f6cf9aea70a373416

data/README.md

@@ -94,6 +94,7 @@ form.to   # => 2016-10-28 00:00:00 -0300
 - Form
 - Hash
 - Integer
+- IO
 - Regexp
 - String
 - Symbol

data/lib/rasti/form/types/regexp.rb

@@ -2,26 +2,21 @@ module Rasti
   class Form
     module Types
       class Regexp
+        class << self
 
-        include Formatable
+          include Castable
 
-        def self.[](format)
-          new format
-        end
+          private
 
-        def to_s
-          "#{self.class}[#{format.inspect}]"
-        end
-        alias_method :inspect, :to_s
+          def valid?(value)
+            value.is_a?(::Regexp) || value.is_a?(::String)
+          end
 
-        private
-        
-        attr_reader :format
+          def transform(value)
+            value.is_a?(::Regexp) ? value.source : ::Regexp.compile(value).source
+          end
 
-        def initialize(format)
-          @format = format.is_a?(String) ? ::Regexp.new(format) : format
         end
-
       end
     end
   end

data/lib/rasti/form/types/string.rb

@@ -2,10 +2,17 @@ module Rasti
   class Form
     module Types
       class String
+
+        include Formatable
+
         class << self
 
           include Castable
-        
+
+          def [](format)
+            new format
+          end
+
           private
 
           def valid?(value)
@@ -17,6 +24,20 @@ module Rasti
           end
 
         end
+
+        def to_s
+          "#{self.class}[#{format.inspect}]"
+        end
+        alias_method :inspect, :to_s
+
+        private
+        
+        attr_reader :format
+
+        def initialize(format)
+          @format = format.is_a?(String) ? ::Regexp.new(format) : format
+        end
+
       end
     end
   end

data/lib/rasti/form/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   class Form
-    VERSION = '2.2.0'
+    VERSION = '3.0.0'
   end
 end

data/spec/types/regexp_spec.rb

@@ -2,18 +2,16 @@ require 'minitest_helper'
 
 describe Rasti::Form::Types::Regexp do
 
-  email_regexp = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i
-
-  ['user@mail.com'.to_sym, 'user.name-123@mail-test.com.ar'].each do |value|
-    it "#{value.inspect} -> #{value.to_s}" do
-      Rasti::Form::Types::Regexp[email_regexp].cast(value).must_equal value
+  ['[a-z]', /[a-z]/].each do |value|
+    it "#{value.inspect} -> #{Regexp.new(value).inspect}" do
+      Rasti::Form::Types::Regexp.cast(value).must_equal Regexp.new(value)
     end
   end
 
-  [nil, 'text', :symbol, '999'.to_sym, [1,2], {a: 1, b: 2}, Object.new, 5].each do |value|
+  [nil, '[a-z', :symbol, [1,2], {a: 1, b: 2}, Object.new, 5].each do |value|
     it "#{value.inspect} -> CastError" do
-      error = proc { Rasti::Form::Types::Regexp[email_regexp].cast(value) }.must_raise Rasti::Form::CastError
-      error.message.must_equal "Invalid cast: #{as_string(value)} -> Rasti::Form::Types::Regexp[#{as_string(email_regexp)}]"
+      error = proc { Rasti::Form::Types::Regexp.cast(value) }.must_raise Rasti::Form::CastError
+      error.message.must_equal "Invalid cast: #{as_string(value)} -> Rasti::Form::Types::Regexp"
     end
   end
 

data/spec/types/string_formatted_spec.rb

@@ -0,0 +1,20 @@
+require 'minitest_helper'
+
+describe Rasti::Form::Types::String, 'Formatted' do
+
+  email_regexp = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i
+
+  ['user@mail.com'.to_sym, 'user.name-123@mail-test.com.ar'].each do |value|
+    it "#{value.inspect} -> #{value.to_s}" do
+      Rasti::Form::Types::String[email_regexp].cast(value).must_equal value
+    end
+  end
+
+  [nil, 'text', :symbol, '999'.to_sym, [1,2], {a: 1, b: 2}, Object.new, 5].each do |value|
+    it "#{value.inspect} -> CastError" do
+      error = proc { Rasti::Form::Types::String[email_regexp].cast(value) }.must_raise Rasti::Form::CastError
+      error.message.must_equal "Invalid cast: #{as_string(value)} -> Rasti::Form::Types::String[#{as_string(email_regexp)}]"
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-form
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2019-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_require
@@ -191,6 +191,7 @@ files:
 - spec/types/integer_spec.rb
 - spec/types/io_spec.rb
 - spec/types/regexp_spec.rb
+- spec/types/string_formatted_spec.rb
 - spec/types/string_spec.rb
 - spec/types/symbol_spec.rb
 - spec/types/time_spec.rb
@@ -232,6 +233,7 @@ test_files:
 - spec/types/integer_spec.rb
 - spec/types/io_spec.rb
 - spec/types/regexp_spec.rb
+- spec/types/string_formatted_spec.rb
 - spec/types/string_spec.rb
 - spec/types/symbol_spec.rb
 - spec/types/time_spec.rb