watir_model 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab1689db304049abb351bde85194b3f340a50f8f
-  data.tar.gz: d47df53a7990ecb91e7dff1fdb141dc20d5503a3
+  metadata.gz: 93dd97375c9cde4f1f0248a82f41112b20ac2c70
+  data.tar.gz: 95284dab556334ff3ef5bf1cf1cab1764801d4f6
 SHA512:
-  metadata.gz: dde4a20f417a3d605b284936f557a96174333982ed1254da68833a6963d17fd9a611011644ffbafaf6c3e6b597d67f324e34033f0e2779e6d537e7244f4fc2ef
-  data.tar.gz: e03628d2206d9e55a41a6bc0bb9e4c1e77ce2655d01700cc721db4aabed8b54f3da1dcab9e671fddf3127178ff2b75e8ceeb2fc85f9b19873b5bfbd9824a4626
+  metadata.gz: 55e94841ba3795a67b045325c235ff7e5295200f9ef4dbce1f983bc54c42fc80c888140b8f8e68e91dd4df953deb1fa161e7d3f1a6a2b55943dcc300270c4999
+  data.tar.gz: 02520b948b3879bd9702d4dad4fd5553c0e0fb47f3af896abc7bf1ce4dcfcc5ce65df7a49f7ce744195ce062aa8512603915044eff1626fd2fa0e14cb0e26fd1

data/CHANGES.md

@@ -0,0 +1,16 @@
+### 0.3.0 (2016-12-31)
+
+* move ENV variable override into ConfigModel subclass
+* remove support for specifying data types
+* implement #convert method
+
+### 0.2.3 (2016-12-22)
+
+* Support for #to_hash
+
+### 0.2.2 (2016-02-15)
+
+* fork from https://github.com/bret/model
+* rename model to watir_model
+* support for specifying data types
+* ENV variables override supplied defaults in Model

data/LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015 Bret Pettichord
-Copyright (c) 2016 Titus Fortner
+Copyright (c) 2016-2017 Titus Fortner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/config_model.rb

@@ -0,0 +1,7 @@
+require 'pp'
+
+class ConfigModel < WatirModel
+  def default_value(key, block)
+    ENV[key.to_s.upcase] || instance_exec(&block)
+  end
+end

data/lib/watir_model.rb

@@ -3,16 +3,12 @@ require 'pp'
 class WatirModel
   class << self
 
-    attr_writer :keys, :data_types, :defaults
+    attr_writer :keys, :defaults
 
     def keys
       @keys ||= []
     end
 
-    def data_types
-      @data_types ||= {}
-    end
-
     def defaults
       @defaults ||= {}
     end
@@ -20,57 +16,40 @@ class WatirModel
     def inherited(subclass)
       subclass.keys = keys.dup
       subclass.defaults = defaults.dup
-      subclass.data_types = data_types.dup
-    end
-
-    %w(string float integer symbol time).each do |type|
-      define_method(type) do |symbol, &block|
-        key(symbol, &block)
-        data_types[symbol] = Object.const_get(type.capitalize)
-      end
-    end
-
-    def boolean(symbol, &block)
-      key(symbol, &block)
-      data_types[symbol] = 'Boolean'
     end
 
     # define a key and an optional block that provides a default value for the key
     def key(symbol, &block)
       keys << symbol unless @keys.include? symbol
       attr_accessor symbol
-      data_types[symbol] = 'Key'
       defaults[symbol] = block if block
     end
+
+    def convert(hash, *args)
+      filtered = hash.reject { |k| !keys.include?(k) }
+      model = new(filtered)
+      args.each do |key|
+        model.instance_eval do
+          define_singleton_method(key) { hash[key] }
+        end
+      end
+      model
+    end
   end
 
-  def initialize(hash=nil)
-    hash ||= {}
+  def initialize(hash={})
     update(hash)
 
     (self.class.defaults.keys - hash.keys).each do |key|
       block = self.class.defaults[key]
-      object = self.class.data_types[key]
-      result = ENV[key.to_s.upcase] || instance_exec(&block)
-      value = case
-              when object == 'Key'
-                result
-              when object == String
-                result.to_s
-              when object == Integer
-                result.to_i
-              when object == Float
-                result.to_f
-              when object == 'Boolean'
-                eval result
-              else
-                object.new result
-              end
+      value = default_value(key, block)
       instance_variable_set("@#{key}", value)
     end
   end
 
   def update(hash)
+    hash ||= {}
+
     unknown = hash.keys - keys
     if unknown.count > 0
       raise ArgumentError, "unknown keyword#{'s' if unknown.count > 1}: #{unknown.join ', '}"
@@ -95,21 +74,14 @@ class WatirModel
     opt ||= keys
     opt.each_with_object({}) do |key, hash|
       value = send(key)
-      hash[key] = process_value(value)
+      next if value.nil?
+      hash[key] = value
     end
   end
 
-  def process_value(value)
-    case value
-      when WatirModel
-        value.to_hash
-      when Hash
-        value.map { |k,v| [k, process_value(v)] }.to_h
-      when Array
-        value.map { |v| process_value(v) }
-      else
-        value
-    end
+  private
+
+  def default_value(key, block)
+    instance_exec(&block)
   end
-  
 end

data/watir_model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "watir_model"
-  spec.version       = "0.2.3"
+  spec.version       = "0.3.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.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,10 +75,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- lib/config_model.rb
 - lib/watir_model.rb
 - watir_model.gemspec
 homepage: https://github.com/titusfortner/watir_model