watir_model 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67b953f8b1f5350855d9d42d3400ce4aa6087d0
-  data.tar.gz: 27dca5010cdcb42b9fbdf767c2f794391ad97953
+  metadata.gz: 230ae59631b244a4ef743398ed5c3ee9df0a0c01
+  data.tar.gz: d639af104eae45b59bdbc304d4f5b84df9e1949c
 SHA512:
-  metadata.gz: 7159633e30b9533c9cc6815f3f5c43b987b796231e098b77596da67f2f14143b4005abc54925146f47a225c8a4efce088e5f19db84ad94c63d08150831710352
-  data.tar.gz: 17faf337effd568be3a9777ebbb5e12a6adbfe13b4c328a4126800cd9ce837850f3f36c114100f0ca6cec2b9391be0b48fd972148d3be2ac3a557fab734e1c4b
+  metadata.gz: 863596478876d2223aaf1047c070796e1d9e6905a6791fc4b7654d9e087b7794d1ca7f7ae35263a66fb736170e3d0aca274998583ec718da9d6aa6940a398ce7
+  data.tar.gz: aad2ad24e7c41e0cc5845180cc3dbde46c532f0b1242fb724ed78de52b4e143c78246eb3cabe6bc690930cfbde5e1ba3439d398538dd0e491f291f07cac788df

data/LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015 Bret Pettichord
+Copyright (c) 2016 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
@@ -18,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/lib/watir_model.rb

@@ -3,12 +3,16 @@ require 'pp'
 class WatirModel
   class << self
 
-    attr_writer :keys, :defaults
+    attr_writer :keys, :data_types, :defaults
 
     def keys
       @keys ||= []
     end
 
+    def data_types
+      @data_types ||= {}
+    end
+
     def defaults
       @defaults ||= {}
     end
@@ -16,12 +20,26 @@ 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
   end
@@ -32,16 +50,32 @@ class WatirModel
 
     (self.class.defaults.keys - hash.keys).each do |key|
       block = self.class.defaults[key]
-      instance_variable_set("@#{key}", instance_exec(&block))
+      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
+      instance_variable_set("@#{key}", value)
     end
   end
 
   def update(hash)
     unknown = hash.keys - keys
     if unknown.count > 0
-      raise ArgumentError, "unknown keyword#{'s' if unknown.count > 1}: #{unknown.join', '}"
+      raise ArgumentError, "unknown keyword#{'s' if unknown.count > 1}: #{unknown.join ', '}"
     end
-    hash.each {|key, v| instance_variable_set "@#{key}", v}
+    hash.each { |key, v| instance_variable_set "@#{key}", v }
   end
 
   def keys

data/watir_model.gemspec

@@ -1,17 +1,14 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'watir_model/version'
 
 Gem::Specification.new do |spec|
   spec.name = "watir_model"
-  spec.version       = WatirModel::VERSION
-  spec.authors       = ["Bret Pettichord"]
-  spec.email         = ["bret@pettichord.com"]
+  spec.version       = "0.2.2"
+  spec.authors       = ["Titus Fortner"]
+  spec.email         = ["titusfortner@gmail.com"]
 
   spec.summary = %q{This is a simple class for modelling test data.}
   spec.description = %q{This is a simple class for modelling test data. It is based on our experience with Watirmark::Model::Factory.}
-  spec.homepage = "https://github.com/bret/watir_model"
+  spec.homepage = "https://github.com/titusfortner/watir_model"
   spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watir_model
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
-- Bret Pettichord
+- Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,7 +69,7 @@ dependencies:
 description: This is a simple class for modelling test data. It is based on our experience
   with Watirmark::Model::Factory.
 email:
-- bret@pettichord.com
+- titusfortner@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,9 +80,8 @@ files:
 - README.md
 - Rakefile
 - lib/watir_model.rb
-- lib/watir_model/version.rb
 - watir_model.gemspec
-homepage: https://github.com/bret/watir_model
+homepage: https://github.com/titusfortner/watir_model
 licenses:
 - MIT
 metadata:

data/lib/watir_model/version.rb

@@ -1,3 +0,0 @@
-class WatirModel
-  VERSION = "0.2.1"
-end