yas 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d1f54023a01907f599f48cca90bb9242a62089
-  data.tar.gz: 07c833f91eea25fcd26c65d07e2aa841a112e8a0
+  metadata.gz: f3a9193b509349e971261e201331016667604f25
+  data.tar.gz: 4844084a1e9daf9827a35d09d7eedba99c94e783
 SHA512:
-  metadata.gz: 55eb0916f52e24c460bb6052694375ffb916f1428b3a700fca8d9c2ed98cf531818b2f2c8ad0638ddd81d41656b2ffe0bf6a46e209d45ee639747b66b1f255d0
-  data.tar.gz: 45f84dab4db77099310d49bf9236c4ee622bb6f98b113b53d7de1c2b17ad9b7d9f3b264cb25438f0026d6715d7d07f937bdf8c2667aead73f94b54d62a0f9e1d
+  metadata.gz: b9e32b743473ebee080449f11bcaaa6c167341254c8ad74913122650c22bed36b6526e1a21d121951e5dc3d4711bef69a69925e81ec23fe97c8c4649df010acb
+  data.tar.gz: 53ed8cb19ffa22459ffde074c47cdec1befb6369157464ae81bcb5cce1f601ee8886c9773ef19e427e8c42008799ad92b273127beecc0fc0c3617a316a6900ee

data/lib/yas/ext/attribute.rb

@@ -5,11 +5,12 @@ class YAS::AttributeExt
 
   module ClassMethods
 
-    def key attr, &block
-      new_attr = Attribute.new(attr)
-      new_attr.instance_eval &block if block
-      attributes[attr] = new_attr
-      new_attr
+    def key *attrs, &block
+      attrs.each do |attr|
+        new_attr = Attribute.new(attr)
+        new_attr.instance_eval(&block) if block
+        attributes[attr] = new_attr
+      end
     end
     alias_method :attribute, :key
 
@@ -45,15 +46,14 @@ class YAS::AttributeExt
 
     attr_reader :name
 
-    @required = false
-    @type = nil
-    @auto_convert = false
-    @default_block = nil
-    @alter_block = nil
-    @validate_value_block = nil
-
 
     def initialize name
+      @required = false
+      @type = nil
+      @auto_convert = false
+      @default_block = nil
+      @alter_block = nil
+      @validate_value_block = nil
       @name = name
     end
 

data/lib/yas/ext/symbolize.rb

@@ -5,7 +5,7 @@ class YAS::SymbolizeExt
 
   module ClassMethods
     def symbolize sym = nil
-      @symbolize = sym if !sym.nil? && (sym.class == TrueClass || sym.class == FalseClass)
+      (!sym.nil? && (sym.class == TrueClass || sym.class == FalseClass)) ?  @symbolize = sym : @symbolize = nil
       @symbolize
     end
   end

data/lib/yas/hash.rb

@@ -1,7 +1,7 @@
 class Hash
 
   def validate schema
-    copy = Marshal.load(Marshal.dump(self))
+    copy = Hash[self]
     schema.validate(copy) if schema.respond_to?(:validate)
   end
 

data/lib/yas/version.rb

@@ -1,5 +1,5 @@
 module YAS
   GEM_NAME = "yas"
   NAME = "YAS"
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/ext/test_attribute.rb

@@ -121,9 +121,11 @@ class TestAttribute < Minitest::Test
 
   def test_validate_maintain_value_if_type_not_specified
     attr = Attribute.new(:batman)
-    [true, false, :symbol, 1, 0, -1, 10.0, "string", 1293.1, 0x90, Time.now, nil].each do |v|
+    [true, false, :symbol, 1, 0, -1, 10.0, "string", 1293.1, 0x90, Time.now].each do |v|
       assert_equal v, attr.validate(v)
     end
+
+    assert_nil attr.validate(nil)
   end
 
 end
@@ -163,6 +165,16 @@ class NestedAttributeSchema < YAS::Schema
 end
 
 
+class MultipleAttributesSchema < YAS::Schema
+
+  key :personal_info, "other_info" do
+    required
+    type String
+  end
+
+end
+
+
 class TestAttributeExt < Minitest::Test
 
   def test_attribute_ext
@@ -211,4 +223,14 @@ class TestAttributeExt < Minitest::Test
     assert_equal "joe", hash[:personal_info][:name]
   end
 
+  def test_multiple_attributes_with_same_block
+    hash = {
+      personal_info: "when",
+      "other_info" => "who"
+    }
+    hash.validate! MultipleAttributesSchema
+    assert_equal "when", hash[:personal_info]
+    assert_equal "who", hash["other_info"]
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yas
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Albert Tedja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -101,9 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Yet Another Schema for Ruby.
 test_files: []
-has_rdoc: