watir_model 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a63d0d44bca88f86db3a5f5a379eacb7e7c1d1
-  data.tar.gz: dfa9f23bfaadb59ed9e24191c6ae4d17fb3b854b
+  metadata.gz: b2e75024846f7980a3bcefaefbcc5f9f1a4661e9
+  data.tar.gz: 385e78e0816e7f276622c8cd2377f804e7bfef12
 SHA512:
-  metadata.gz: 7981185908b815a682f83c7cd33745732aa512fa3681f6561da8ad9aea7d244a9b3d23ecb05a4e6776a3534a2619bc293d9cb4da91a11dc1d9135a0bb4f9f097
-  data.tar.gz: dec2feaa6de866aaa79cc1add9b0e1740e0041a831f1184ac51c092fc58fbb06eea1a6d678bc8a45afc11c84873dbad6c4da9c87c309f675337d5d3233e3a928
+  metadata.gz: fafe4c3d76271bf146a7a3826f4d8059a87e2032b2d1bd9e416e1d3f3c66c8c3620e0b2185eabb50eaf6742160ceb186b95658d27a3ece01d763df3dcd0202d3
+  data.tar.gz: ad4cf6a0161fd9c0a8b81fe01ef1ac4a434ba50ccd76804c54db769641a7c347266b5be8901a359a4f8811443d1772e476ef990f26384fb78afae0e5c30a7e0a

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 0.5.1 (2018-01-05)
+
+* deprecate `#to_hash` in favor of more correct `#to_h`
+* remove support for key `:aliases` 
+
 ### 0.5.0 (2017-12-29)
 
 * prevent `#convert` when default values won't be used

data/lib/watir_model.rb

@@ -2,22 +2,19 @@ require 'active_support/hash_with_indifferent_access'
 require 'json'
 require 'date'
 require 'time'
+require 'faker'
 require 'yml_reader'
 
 class WatirModel
   class << self
     include YmlReader
 
-    attr_writer :keys, :aliases, :data_types, :defaults, :apis
+    attr_writer :keys, :data_types, :defaults, :apis
 
     def keys
       @keys ||= []
     end
 
-    def aliases
-      @aliases ||= {}
-    end
-
     def data_types
       @data_types ||= {}
     end
@@ -31,20 +28,18 @@ class WatirModel
     end
 
     def valid_keys
-      keys + aliases.keys + apis.keys
+      keys + apis.keys
     end
 
     def inherited(subclass)
       subclass.keys = keys.dup
-      subclass.aliases = aliases.dup
       subclass.apis = apis.dup
       subclass.defaults = defaults.dup
       subclass.data_types = data_types.dup
     end
 
-    def key(symbol, data_type: nil, aliases: [], api: nil, &block)
+    def key(symbol, data_type: nil, api: nil, &block)
       keys << symbol unless @keys.include? symbol
-      aliases.each { |alias_key| self.aliases[alias_key] = symbol }
       attr_accessor symbol
       apis[api] = symbol if api
       data_types[symbol] = data_type if data_type
@@ -105,7 +100,7 @@ class WatirModel
 
     def default_value_keys(hash)
       hash.keys.map do |key|
-        keys.include?(key) ? key : (aliases[key] || apis[key])
+        keys.include?(key) ? key : apis[key]
       end
     end
 
@@ -142,10 +137,6 @@ class WatirModel
   def update(hash)
     hash ||= {}
 
-    (hash.keys & aliases.keys).each do |alias_key|
-      hash[aliases[alias_key]] = hash.delete(alias_key)
-    end
-
     (hash.keys & apis.keys).each do |api_key|
       hash[apis[api_key]] = hash.delete(api_key)
     end
@@ -163,16 +154,12 @@ class WatirModel
     self.class.keys
   end
 
-  def aliases
-    self.class.aliases
-  end
-
   def apis
     self.class.apis
   end
 
   def valid_keys
-    self.class.apis
+    self.class.valid_keys
   end
 
   def [] key
@@ -185,21 +172,26 @@ class WatirModel
   alias_method :==, :eql?
 
   def to_hash(opt = nil)
+    warn "#to_hash is deprecated, use #to_h instead"
+    to_h opt
+  end
+
+  def to_h(opt = nil)
     opt ||= keys
     opt.each_with_object({}) do |key, hash|
       value = send(key)
       next if value.nil?
-      value = value.to_hash if value.is_a? WatirModel
+      value = value.to_h if value.is_a? WatirModel
       hash[key] = value
     end
   end
 
   def to_json(*)
-    to_hash.to_json
+    to_h.to_json
   end
 
   def to_api
-    hash = to_hash
+    hash = to_h
     apis.each do |key, value|
       hash[key] = hash.delete(value)
     end

data/watir_model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "watir_model"
-  spec.version       = "0.5.0"
+  spec.version       = "0.5.1"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'faker', "~> 1.5"
   spec.add_runtime_dependency 'yml_reader', '>= 0.6'
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
-  spec.add_development_dependency "faker", "~> 1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_model
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: yml_reader
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 description: This is a simple class for modelling test data. It is based on our experience
   with Watirmark::Model::Factory.
 email: