striuct 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f62606bca03dc43d444db3e23bf44339abf1694ae46833cddf4f9d9aca758d6
-  data.tar.gz: 298c98ad540cc714624ba524ba41279298f17f785596cea9ae6e7babf21cfc37
+  metadata.gz: 1a5238390f14805baa497d1cd3acec45fc10faa233ce94af4782aa5570606b56
+  data.tar.gz: e703ea310209502b772938d9eee312e26fcfdec30189c41e071107b125574ebb
 SHA512:
-  metadata.gz: 47897a1c2237af0c378b4e1e69fb274c4a6acb5d802693d443bf49ef66ce8e774e09c5173302e0825073ca17b8aa15d215d41f516315526c9c7938afd5063412
-  data.tar.gz: 51d20eb1974f80d68d6e99e076babf34076d193ef6185f7d7cc565078928ad837c1af7949c116e5bdfbaece4a7de9c201fff12ca5e601e8e3f3be5d93f0f2452
+  metadata.gz: 4650584be9988e6f8ed9b1a58cfa5912d099aed4377e035750ee158216fa8bc06c46c53386bc5b1188dd302847112c337d750ac1a103810bd83ab25ae5f920c4
+  data.tar.gz: 3edc0199746228322c017bf8eefc619352a53882cf908d9e525392faaa43a5314ec37529ce97cfc7b40917d2dbca5da393cb5580b3d8c1ae673cdeea22efdf42

data/README.md

@@ -68,8 +68,7 @@ ken.id                   #=> 2
 ```ruby
 class Foo < Striuct
   member :foo
-  member :bar, Numeric,                       # First validation under Numeric
-               inference: true                # And use inference Validation
+  member :bar, Numeric
   member :with_adjuster, Integer,
                          &->v{Integer v}      # Use adjuster before a setter
 end
@@ -86,7 +85,6 @@ foo.assigned?(:foo)      #=> true
 foo.lock(:foo)
 foo.foo = nil            #=> error
 
-# Inference Validation
 foo.bar = 1.2            #=> pass             # memorize 1.2's class is Float
 foo.bar = 1              #=> error            # 1 is not Float
 

data/example/README.rb

@@ -24,8 +24,7 @@ p ken.id           #=> 2
 
 class Foo < Striuct
   member :foo
-  member :bar, Numeric,
-               inference: true
+  member :bar, Numeric
   member :with_adjuster, Integer,
                          &->v{Integer v}
 end

data/example/example1.rb

@@ -75,46 +75,6 @@ module Game
   debug db
 end
 
-# through "inference", and check under first passed object class
-class FlexibleContainer < Striuct.new
-  member :anything, BasicObject, inference: true
-  member :number,   Numeric, inference: true
-end
-
-fc1, fc2 = FlexibleContainer.new, FlexibleContainer.new
-fc1.anything = 'str'
-debug fc1
-begin
-  fc1.anything = :sym
-rescue
-  debug $!
-end
-
-begin
-  fc2.anything = :sym
-rescue
-  debug $!
-end
-
-fc2.anything = 'string too'
-
-debug fc2
-
-begin
-  fc1.number = 'str'
-rescue
-  debug $!
-end
-
-fc1.number = 1.0
-debug fc1
-
-begin
-  fc2.number = 1
-rescue
-  debug $!
-end
-
 # Standard Struct not check member name. 
 NoGuard = Struct.new :__send__, :'?  !'
 noguard = NoGuard.new false

data/lib/striuct/classmethods/attributes.rb

@@ -6,16 +6,18 @@ class Striuct; module ClassMethods
     VALUES   = [ :condition,
                  :adjuster  ].freeze
 
-    BOOLEANS = [ :inference,
-                 :must,
-                 :safety_setter,
-                 :safety_getter ].freeze
-    
+    BOOLEANS = [
+                :must,
+                :safety_setter,
+                :safety_getter
+               ].freeze
+
     def initialize
-      @hash =  { inference:     false,
-                 must:          false,
-                 safety_setter: false,
-                 safety_getter: false }
+      @hash = {
+                must:          false,
+                safety_setter: false,
+                safety_getter: false
+              }
     end
     
     VALUES.each do |role|

data/lib/striuct/classmethods/inner.rb

@@ -66,15 +66,6 @@ class Striuct; module ClassMethods
     nil
   end
 
-  def _found_family(autonym, other)
-    family = other.class
-
-    _attributes_for(autonym).condition = family
-    _attributes_for(autonym).inference = false
-
-    nil
-  end
-  
   # @endgroup
 
 end; end

data/lib/striuct/classmethods/macro.rb

@@ -9,7 +9,6 @@ class Striuct; module ClassMethods
     opt :default_value, aliases: [:default]
     opt :default_proc, aliases: [:lazy_default]
     conflict :default_value, :default_proc
-    opt :inference, default: false
     opt :must, default: false
     opt :setter_validation, aliases: [:writer_validation], default: true
     opt :getter_validation, aliases: [:reader_validation], default: false
@@ -22,7 +21,6 @@ class Striuct; module ClassMethods
   # @param [Hash] options
   # @option options [BasicObject] :default
   # @option options [Proc] :default_proc
-  # @option options [Boolean] :inference
   # @option options [Boolean] :must
   # @option options [Boolean] :reader_validation
   # @option options [Boolean] :getter_validation
@@ -43,10 +41,6 @@ class Striuct; module ClassMethods
     _attributes_for(autonym).safety_setter = !!options.setter_validation
     _attributes_for(autonym).safety_getter = !!options.getter_validation
 
-    if options.inference
-      _attributes_for(autonym).inference = true
-    end
-
     if options.must
       _attributes_for(autonym).must = true
     end

data/lib/striuct/classmethods/predicate.rb

@@ -83,15 +83,6 @@ class Striuct; module ClassMethods
 
   alias_method :restrict?, :with_condition?  
 
-  # @param [Symbol, String, #to_sym, Integer, #to_int] key - name / index
-  def with_inference?(key)
-    autonym = autonym_for_key key
-  rescue Exception
-    false
-  else
-    _attributes_for(autonym).with_inference?
-  end
-
   # @param [Symbol, String, #to_sym, Integer, #to_int] key - name / index
   def with_must?(key)
     autonym = autonym_for_key key

data/lib/striuct/instancemethods/delegate_class_methods.rb

@@ -3,7 +3,6 @@ class Striuct; module InstanceMethods
   # @group Delegate Class Methods
   
   def_delegators :'self.class',
-    :_autonyms,
     :autonym_for_alias,
     :autonym_for_member,
     :autonym_for_index,
@@ -21,14 +20,17 @@ class Striuct; module InstanceMethods
     :condition_for,
     :with_safety_getter?, :with_safety_reader?,
     :with_safety_setter?, :with_safety_writer?,
-    :with_inference?,
     :with_must?, :must?,
     :with_default?,
     :default_value_for, :default_type_for,
     :with_adjuster?,
     :adjuster_for
 
-  private :_autonyms
+  private
+
+  def _autonyms
+    self.class.__send__ :_autonyms
+  end
 
   # @endgroup
   

data/lib/striuct/instancemethods/setter.rb

@@ -39,10 +39,6 @@ class Striuct; module InstanceMethods
             "#{value.inspect} is deficient for #{autonym} in #{self.class}"
     end
 
-    if with_inference? autonym
-      self.class.__send__ :_found_family, autonym, value
-    end
-    
     @db[autonym] = value
   rescue ::Validation::InvalidError
     unless /in \[\]=/ =~ caller[1].slice(/([^:]+)\z/)

data/striuct.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/kachick/#{lib_name}"
   gem.license       = 'MIT'
   gem.name          = lib_name.dup
-  gem.version       = '0.6.0'
+  gem.version       = '0.6.1'
 
   gem.required_ruby_version = '>= 2.2'
 

data/test/test_subc-c-constructor.rb

@@ -4,7 +4,7 @@ class Test_Striuct_Subclass_Class_Constructor < Test::Unit::TestCase
 
   User = Striuct.define do
     member :name, AND(String, NOT(''))
-    member :age, Fixnum
+    member :age, Integer
   end.freeze
   
   [:for_values, :new].each do |callee|

data/test/test_subc-c-copy.rb

@@ -34,7 +34,7 @@ class Test_Striuct_Subclass_Class_Copy < Test::Unit::TestCase
 
   def test_dup_deep
     org_cls =  Striuct.define do
-      member :foo, Numeric, inference: true
+      member :foo, Numeric
     end
 
     foo = org_cls.new
@@ -42,7 +42,7 @@ class Test_Striuct_Subclass_Class_Copy < Test::Unit::TestCase
     foo2 = cls2.new
     foo2.foo = 0.1
     assert_raises Validation::InvalidWritingError do
-      foo2.foo = 1
+      foo2.foo = '1'
     end
 
     foo.foo = 1
@@ -52,7 +52,7 @@ class Test_Striuct_Subclass_Class_Copy < Test::Unit::TestCase
 
   def test_clone_deep
     org_cls =  Striuct.define do
-      member :foo, Numeric, inference: true
+      member :foo, Numeric
     end
 
     foo = org_cls.new
@@ -60,7 +60,7 @@ class Test_Striuct_Subclass_Class_Copy < Test::Unit::TestCase
     foo2 = cls2.new
     foo2.foo = 0.1
     assert_raises Validation::InvalidWritingError do
-      foo2.foo = 1
+      foo2.foo = '1'
     end
 
     foo.foo = 1

data/test/test_subc-c-inheritable.rb

@@ -4,7 +4,7 @@ class Test_Striuct_Subclass_Class_Inheritable < Test::Unit::TestCase
 
   Sth = Striuct.define do
     member :foo, String
-    member :bar, OR(nil, Fixnum)
+    member :bar, OR(nil, Integer)
   end
   
   class SubSth < Sth

data/test/test_subc-f-predicate.rb

@@ -318,70 +318,6 @@ class Test_Striuct_Subclass_Predicate_Condition < Test::Unit::TestCase
 
 end
 
-class Test_Striuct_Subclass_Predicate_InferenceValidation < Test::Unit::TestCase
-
-  class Subclass < Striuct
-    member :no_with
-    alias_member :als_no_with, :no_with
-    member :with, nil, inference: true
-    alias_member :als_with, :with
-    member :with_any, BasicObject, inference: true
-    alias_member :als_with_any, :with_any
-    member :adj_with, nil, inference: true do |_|; end
-    alias_member :als_adj_with, :adj_with
-
-    close_member
-  end.freeze
-
-  INSTANCE = Subclass.new.freeze
-  
-  TYPE_PAIRS = {
-    class: Subclass,
-    instance: INSTANCE
-  }.freeze
-
-  [:with_inference?].each do |predicate|
-    TYPE_PAIRS.each_pair do |type, reciever|
-      define_method :"test_#{type}_#{predicate}" do
-        assert_same false, reciever.public_send(predicate, :no_with)
-        assert_same false, reciever.public_send(predicate, :als_no_with)
-        assert_same false, reciever.public_send(predicate, 'no_with')
-        assert_same false, reciever.public_send(predicate, 'als_no_with')
-        assert_same false, reciever.public_send(predicate, 0)
-        assert_same false, reciever.public_send(predicate, 0.9)
-        
-        assert_same true, reciever.public_send(predicate, :with)
-        assert_same true, reciever.public_send(predicate, :als_with)
-        assert_same true, reciever.public_send(predicate, 'with')
-        assert_same true, reciever.public_send(predicate, 'als_with')
-        assert_same true, reciever.public_send(predicate, 1)
-        assert_same true, reciever.public_send(predicate, 1.9)
-
-        assert_same true, reciever.public_send(predicate, :with_any)
-        assert_same true, reciever.public_send(predicate, :als_with_any)
-        assert_same true, reciever.public_send(predicate, 'with_any')
-        assert_same true, reciever.public_send(predicate, 'als_with_any')
-        assert_same true, reciever.public_send(predicate, 2)
-        assert_same true, reciever.public_send(predicate, 2.9)
-
-        assert_same true, reciever.public_send(predicate, :adj_with)
-        assert_same true, reciever.public_send(predicate, :als_adj_with)
-        assert_same true, reciever.public_send(predicate, 'adj_with')
-        assert_same true, reciever.public_send(predicate, 'als_adj_with')
-        assert_same true, reciever.public_send(predicate, 3)
-        assert_same true, reciever.public_send(predicate, 3.9)
-        
-        assert_same false, reciever.public_send(predicate, :none)
-        assert_same false, reciever.public_send(predicate, 'none')
-        assert_same false, reciever.public_send(predicate, 4)
-        assert_same false, reciever.public_send(predicate, 4.9)
-        assert_same false, reciever.public_send(predicate, BasicObject.new)
-      end
-    end
-  end
-
-end
-
 class Test_Striuct_Subclass_Predicate_Must < Test::Unit::TestCase
 
   class Subclass < Striuct

data/test/test_subc-f_name.rb

@@ -27,7 +27,7 @@ class Test_Striuct_Subclass_Name < Test::Unit::TestCase
   [:_autonyms].each do |callee|
     TYPE_PAIRS.each_pair do |type, reciever|
       define_method :"test_#{type}_#{callee}" do
-        assert_same true, reciever.private_methods.include?(callee)
+        assert_equal true, reciever.private_methods.include?(callee)
         
         assert_raises NoMethodError do
           reciever.public_send(callee)

data/test/test_subc-i-default_value.rb

@@ -3,7 +3,7 @@ require_relative 'helper'
 class Test_Striuct_Subclass_Instance_Default_Value < Test::Unit::TestCase
 
   Sth = Striuct.new do
-    member :lank, OR(Bignum, Fixnum)
+    member :lank, OR(Integer, Rational)
     default :lank, 1
   end
   
@@ -75,7 +75,7 @@ end
 class Test_Striuct_Subclass_Instance_DefaultValue_Under_MemberMacro < Test::Unit::TestCase
 
   Sth = Striuct.new do
-    member :lank, OR(Bignum, Fixnum), default: 1
+    member :lank, OR(Integer, Rational), default: 1
   end
   
   def test_default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: striuct
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kenichi Kamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: validation
@@ -150,7 +150,6 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
-- History.old(~0.3.n).rdoc
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -230,7 +229,6 @@ files:
 - test/test_subc-i-lock.rb
 - test/test_subc-i-must.rb
 - test/test_subc-i-to_s_family.rb
-- test/test_subc-i-validation_inference.rb
 - test/test_subc-i-validation_specific_conditions.rb
 - test/test_subc-i-validation_with_getter.rb
 - test/test_version.rb
@@ -291,7 +289,6 @@ test_files:
 - test/test_subc-i-lock.rb
 - test/test_subc-i-must.rb
 - test/test_subc-i-to_s_family.rb
-- test/test_subc-i-validation_inference.rb
 - test/test_subc-i-validation_specific_conditions.rb
 - test/test_subc-i-validation_with_getter.rb
 - test/test_version.rb

data/History.old(~0.3.n).rdoc

@@ -1,289 +0,0 @@
-=== 0.3.5.1 2012-9-14
-
-* Too minor changed :)
-  Some doc & env
-
-=== 0.3.5 2012-9-9
-
-* fix:
-  * SubClass.dup, SubClass.clone
-  * SubClass#replace_values
-
-=== 0.3.4 2012-9-8
-
-* fix:
-  * SubClass.#to_struct
-  * SubClass#sufficient? (catch any error: error -> false)
-
-=== 0.3.3 2012-9-7
-
-* modify:
-  * SubClass#to_s
-  * SubClass#inspect
-
-* fix:
-  * SubClass.freeze
-
-* add:
-  * compatibility with keyvalidatable-API
-
-=== 0.3.2 2012-9-4
-
-* fix:
-  * #assign
-  * .for_pairs, .[]
-
-=== 0.3.1 2012-9-2
-
-* add:
-  * default value via member macro
-
-=== 0.3.0 2012-4-3
-
-* modify:
-  * use validation library (spin-off library)
-
-=== 0.2.3 2012-4-2
-
-* fix:
-  * Conditions.#NAND
-  * Conditions.#XOR
-  * Conditions.#XNOR
-
-=== 0.2.2 2012-3-30
-
-* add:
-  * aliases Conditions#[FUNC()] -> Conditions#[FUNC?()]
-
-* fix:
-  * GENERICS check when build condition
-  * arity checker when default with block parameter
-
-=== 0.2.1 2012-1-30
-
-* delete:
-  * Conditions#ANY, ALL
-
-* add:
-  * can choose timing of validation (member with option and safety_setter? and more)
-  * add Flavors (Useful flavor builders)
-  * .#to_struct_class, #to_struct
-  * #each_name_with_index (alias-> #each_member_with_index, #each_key_with_index)
-
-=== 0.2.0 2012-1-27
-
-* delete:
-  * constant StrictStruct
-  * Eigen.#sufficient? (alias -> valid?, accept?)
-
-* modify:
-  * conditions to a condition (use condition generator Conditions#OR)
-  * to expr a flavor, before check condition
-  * inference flag under option parameter
-  * long macro names (define_xxx -> add_xxx)
-
-* add:
-  * #each_pair_with_index
-
-=== 0.1.7 2012-1-26
-
-* add:
-  * default with Proc
-  * detail error message in Subclass.#[]=
-
-* fix:
-  * class duplicating
-
-=== 0.1.6 2012-1-25
-
-* delete:
-  * import.rb
-
-* modify:
-  * Subclass.#define
-  * naming risks (add bad name "_foo")
-  * Conditions.#GENERICS (enum prior all? to each_value.all?)
-  * timing of check default value
-
-* add:
-  * detail error message in Subclass.#define
-
-* fix:
-  * inherited behavior
-
-=== 0.1.5 2012-1-17
-
-* add:
-  * #lock, #lock?
-  * some Specific Conditions
-
-* note:
-  multiple conditions for 'or', dupulicated for direct throw member macro
-  please use .#OR method in this case
-
-=== 0.1.4 2012-1-16
-
-* modify:
-  * trace logs
-  * naming risks(add bad name "to_foo")
-  * Subclass#unassign
-
-* add:
-  * Specific Conditions
-    (for Syntax Sugar of useful Functional Conditions)
-  * Subclass.#each_index
-  * Subclass.#valid?
-  * Subclass#clear_at, reset_at
-
-=== 0.1.3 2012-1-10
-
-* add:
-  * Subclass.#alias_member
-  * Subclass.#valid?
-  * Subclass#valid?
-
-=== 0.1.2 2012-1-9
-
-* modify:
-  * Subclass.#hash
-
-* add:
-  * Subclass.#to_yaml
-
-=== 0.1.1 2011-12-26
-
-* modify:
-  * Subclass.#sufficient?
-
-* add:
-  * Subclass.#empty?
-  * Subclass.#has_value? (value?)
-  * Subclass.#flatten
-  * Subclass.#select! (keep_if)
-  * Subclass.#select
-  * Subclass.#reject! (delete_if)
-  * Subclass.#reject
-  * Subclass.#assoc
-  * Subclass.#rassoc
-
-* fix
-  * Subclass.#sufficient?
-
-=== 0.1.0 2011-12-25
-
-* modify:
-  * Subclass.#define
-
-* add:
-  * Subclass.#[] (alias load_pairs)
-  * Subclass.#to_h
-
-=== 0.0.11 2011-12-23
-
-* modify:
-  * Subclass.#cname?
-
-* add:
-  * inference checker
-
-=== 0.0.10 2011-12-23
-
-* delete:
-  * Subclass.#lock, Subclass.#unlock?
-
-* modify:
-  * Subclass.#freeze
-  * has_condition? -> has_conditions?
-  * Subclass.#lock, Subclass.#lock? -> .close, .closed?
-
-* add:
-  * Subclass.#protect_level   # class macro
-  * Subclass.#default?
-
-=== 0.0.9 2011-12-21
-
-* delete:
-  * Striuct.load_pairs
-  * Subclass.#conditions
-  * Subclass.#procedures
-  * Subclass.#defaults
-
-* add:
-  * Striuct.define
-  * Subclass.#lock
-  * Subclass.#default_for
-
-* fix:
-  * Subclass.#inspect
-  * Subclass.#to_s
-
-* note:
-  * innner name changed "procedure" to "flavor"
-
-=== 0.0.8 2011-12-18
-
-* modify:
-  * Subclass.#define
-  * Subclass.#accept?
-  * functional checker's action:
-    Proc: context to instance
-    Method: === to call
-
-* add:
-  * Subclass.#default
-
-* fix:
-  * Subclass.#values_at
-
-=== 0.0.7 2011-12-16
-
-* modify:
-  * called macro's block to procedure 
-  * public to private Subclass.#unlock
-
-* add:
-  * Subclass.#define
-  * Subclass.#accept?
-  * Subclass.#restrict?
-  * Subclass.#assign?
-  * Subclass.#assign
-
-* fix:
-  * use clone method ( initialize_copy )
-
-=== 0.0.6 2011-12-14
-
-* modify:
-  * error type in some methods
-
-* add:
-  * Subclass.#sufficent?
-  * Subclass.#define
-  * Subclass.#sufficent?
-  * Subclass.#secure?
-  * Subclass.#lock?
-  * Subclass.#lock
-  * Subclass.#unlock
-
-* fix:
-  * typo
-
-=== 0.0.5 2011-12-14
-
-* fix class constructor
-* modify #inspect
-* add arguments checks
-
-=== 0.0.4 2011-12-13
-
-* divide modules for Subclass.#methods
-* modify return values for void methods
-
-=== 0.0.3 2011-12-12
-
-=== 0.0.2 2011-12-11
-
-=== 0.0.1 2011-12-11
-
-* 1 major enhancement:
-  * Initial release

data/test/test_subc-i-validation_inference.rb

@@ -1,51 +0,0 @@
-require_relative 'helper'
-
-class Test_Striuct_Subclass_Instance_Inference < Test::Unit::TestCase
-
-  def test_inference
-    klass = Striuct.define do
-      member :n, Numeric, inference: true
-      member :m, BasicObject, inference: true
-    end
-    
-    sth, sth2 = klass.new, klass.new
-    
-    assert_raises Validation::InvalidWritingError do
-      sth.n = '1'
-    end
-    
-    sth.n = 1.1
-    
-    assert_equal 1.1, sth.n
-    
-    assert_raises Validation::InvalidWritingError do
-      sth.n = 1
-    end
-    
-    assert_raises Validation::InvalidWritingError do
-      sth2.n = 1
-    end
-    
-    sth.n = 2.1
-    
-    assert_equal 2.1, sth.n
-    
-    
-    sth2.m = 1
-    
-    assert_equal 1, sth2.m
-    
-    assert_raises Validation::InvalidWritingError do
-      sth.m = 1.0
-    end
-    
-    assert_raises Validation::InvalidWritingError do
-      sth2.m = 1.0
-    end
-    
-    sth.m = 2
-    
-    assert_equal 2, sth.m
-  end
-
-end