watir_model 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fdf8505d77d7adfa4b9ede2a6c7c6cc65b83bfe
-  data.tar.gz: a9417429d02f0cfa2685cce6c1f7e7caaf4b158f
+  metadata.gz: d4a63d0d44bca88f86db3a5f5a379eacb7e7c1d1
+  data.tar.gz: dfa9f23bfaadb59ed9e24191c6ae4d17fb3b854b
 SHA512:
-  metadata.gz: e7905f553d635cbeae6ac9b3c917dbbc057d180554700086ece5ea6cc5de8dad5ec019b0c06eb2f9a11ae197a702ed8997f601568b0eef21a4d17c3d61b6ee1e
-  data.tar.gz: 86da4a818ee420d29891844f679a78c639d117ad7c8007fbffbd7f1d099c33755b9274ed425a2227af00b71563c0e413fec8fd8a814a38337bd019116891daa1
+  metadata.gz: 7981185908b815a682f83c7cd33745732aa512fa3681f6561da8ad9aea7d244a9b3d23ecb05a4e6776a3534a2619bc293d9cb4da91a11dc1d9135a0bb4f9f097
+  data.tar.gz: dec2feaa6de866aaa79cc1add9b0e1740e0041a831f1184ac51c092fc58fbb06eea1a6d678bc8a45afc11c84873dbad6c4da9c87c309f675337d5d3233e3a928

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.5.0 (2017-12-29)
+
+* prevent `#convert` when default values won't be used
+
 ### 0.4.6 (2017-12-29)
 
 * support for `#to_json`

data/lib/watir_model.rb

@@ -30,6 +30,10 @@ class WatirModel
       @defaults ||= {}
     end
 
+    def valid_keys
+      keys + aliases.keys + apis.keys
+    end
+
     def inherited(subclass)
       subclass.keys = keys.dup
       subclass.aliases = aliases.dup
@@ -82,7 +86,10 @@ class WatirModel
 
     def convert(hash, *args)
       hash.deep_symbolize_keys!
-      filtered = hash.select { |k| (keys + aliases.keys + apis.keys).include?(k) }
+      filtered = hash.select { |k| valid_keys.include?(k) }
+      unless (defaults.keys - default_value_keys(filtered)).empty?
+        raise StandardError, "Can not convert Hash to Model when keys with default values are missing"
+      end
       model = new(filtered)
       args.each do |key|
         model.instance_eval do
@@ -96,6 +103,12 @@ class WatirModel
       'config/data'
     end
 
+    def default_value_keys(hash)
+      hash.keys.map do |key|
+        keys.include?(key) ? key : (aliases[key] || apis[key])
+      end
+    end
+
     def method_missing(method, *args, &block)
       file = factory_file(self)
       return super unless file
@@ -114,7 +127,7 @@ class WatirModel
     end
   end
 
-  def initialize(hash={})
+  def initialize(hash = {})
     hash.deep_symbolize_keys!
     update(hash)
 
@@ -158,6 +171,10 @@ class WatirModel
     self.class.apis
   end
 
+  def valid_keys
+    self.class.apis
+  end
+
   def [] key
     send key
   end

data/watir_model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "watir_model"
-  spec.version       = "0.4.6"
+  spec.version       = "0.5.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_model
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2017-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport