watir_model 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a8ae5db6acadd7242a30cb2e94465d89836ef2
-  data.tar.gz: a73eb288f801a25317cb7990989df7a962cb41d0
+  metadata.gz: 1d6966079e205c1a6bd488096daf9bb9197afc7c
+  data.tar.gz: 38203bdccf10d9dc5d5879aaac9622524db5bf35
 SHA512:
-  metadata.gz: 973516b9347349f12845c957a131274c1245b06d65d2b6cc84b16c1d23807aa44bf0566f6fce24e0441f6b90776679a6e9dbbaf428e5d08d63bf59e9e0b2914a
-  data.tar.gz: 1f970b12adc1ed24e006a23207f555335b728cdccdcea796f4813c4398eab1c9b725ba7e0df48fbf4a8198b43b014f095cca1a504ad6a5ea7e7fdb920396debc
+  metadata.gz: 44fff36c841c6db3c5eceb51fc7e7102f56007535e25525fb27bbf146d830cb9ec9795604cec9afcc53a452773079046138415f306efb8a1d6e4dd6cd5dee845
+  data.tar.gz: abe074605473e24846a4cf94002bbc02eac53d61605804c0ae4f956803e87476b391e5230f35486d08d557b121eec25e0b53b6644f70279d95fd140ff51ff477

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 0.5.5 (2018-01-20)
+
+* allow overriding or specifying custom conversions 
+
 ### 0.5.4 (2018-01-06)
 
 * fix bug in create method for namespaced classes 

data/lib/data_conversions.rb

@@ -0,0 +1,48 @@
+module DataConversions
+
+  def convert_string(value)
+    value.to_s
+  end
+
+  def convert_time(value)
+    Object.const_get(__callee__.to_s.gsub('convert_', '').camelcase).parse value
+  end
+
+  alias_method :convert_date, :convert_time
+  alias_method :convert_date_time, :convert_time
+
+  def convert_integer(value)
+    value.to_i
+  end
+
+  def convert_float(value)
+    value.to_f
+  end
+
+  def convert_boolean(value)
+    return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
+    value = eval(value)
+    value.is_a?(TrueClass) || value.is_a?(FalseClass) ? value : nil
+  end
+
+  def convert_symbol(value)
+    value.to_sym
+  end
+
+  def convert_hash(value)
+    value = parse_json(value)
+    value.to_h if value.respond_to? :to_h
+  end
+
+  def convert_array(value)
+    value = parse_json(value)
+    value.is_a?(Array) ? value : Array(value)
+  end
+
+  def parse_json(value)
+    value = JSON.parse value
+  rescue JSON::ParserError
+    value
+  end
+
+end

data/lib/watir_model.rb

@@ -6,10 +6,12 @@ require 'date'
 require 'time'
 require 'faker'
 require 'yml_reader'
+require 'data_conversions'
 
 class WatirModel
   class << self
     include YmlReader
+    include DataConversions
 
     attr_writer :keys, :data_types, :defaults, :apis
 
@@ -52,32 +54,15 @@ class WatirModel
       data_type = data_types[key]
       return value if data_type.nil?
       return value if data_type.is_a?(Class) && value.is_a?(data_type)
-      value = case
-              when data_type == String
-                value.to_s
-              when [Time, Date, DateTime].include?(data_type)
-                data_type.parse value
-              when data_type == Integer
-                value.to_i
-              when data_type == Float
-                value.to_f
-              when data_type == :boolean
-                return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-                value = eval(value)
-                return value if value.is_a?(TrueClass) || value.is_a?(FalseClass)
-                raise StandardError, "Unable to convert #{value} to TrueClass or FalseClass"
-              when data_type == Symbol
-                value.to_sym
-              when data_type == Hash
-                JSON.parse value
-              when data_type == Array
-                JSON.parse value
+      method = "convert_#{data_type.to_s.underscore}"
+      value = if respond_to? method
+                send(method, value)
               else
                 file = factory_file(data_type)
                 data = data_from_yaml(file, value) || value
                 data_type.new(data)
               end
-      return value if value.is_a?(data_type)
+      return value unless value.nil?
       raise StandardError, "Unable to convert #{value} to #{data_type}"
     end
 

data/watir_model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "watir_model"
-  spec.version       = "0.5.4"
+  spec.version       = "0.5.5"
   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.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,6 +112,7 @@ files:
 - config/data/address.yml
 - config/data/default_model.yml
 - lib/config_model.rb
+- lib/data_conversions.rb
 - lib/watir_model.rb
 - watir_model.gemspec
 homepage: https://github.com/titusfortner/watir_model