appmodel 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41efe743b89aa154adcefdb0c23bd0363d488f2a
-  data.tar.gz: f01726521d2eb27b3a959369f9c87245f86ddc50
+  metadata.gz: aa7ee34657ccc67a49f7415aa68700a257d358aa
+  data.tar.gz: ef392725c13e38d95d10a2a8609093863b83a522
 SHA512:
-  metadata.gz: 85a79431825b09e89f4ab2479d6773254982fd15a8edf97db08f19657f6ecf98089927ec96e8e6df513bebf66bc620c220414b523011a51630ec40ef4cc2b52c
-  data.tar.gz: d0e7e8a9385838606cee347a62ffcf3d64c4853a4ef1e264b31ec6376f9ba4951bed5ceb91a8983438d1ca88e0381d817de366ee8b2913371aeb653e17469fd7
+  metadata.gz: a1f60949e18631835afa029be710d12881cef9091b94292c69e52c1a89cc28038cee3fb0139002af7db43fdd8fdd6b5afe96b57850d24e4d6bad85a49ea23209
+  data.tar.gz: 89dcb0081c6bdcad1b025b865501d81e9f27397e305604f6c5ef513e16317ad38126cb15005368902fcddd836eb40f6eadb3b0bb6da7535e582240e89a29aec9

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in appmodel.gemspec
 gemspec
+
+
+gem 'logging'

data/appmodel.gemspec

@@ -14,14 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/h20dragon."
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  #if spec.respond_to?(:metadata)
- #   spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-#  else
-#    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-#  end
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -30,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "logging"
+  spec.add_development_dependency "logging", "~> 2.2"
 end

data/lib/appmodel/model/model.rb

@@ -56,14 +56,24 @@ module Appmodel
 
         if rc
           hit = { 'frame' => rc[1], 'locator' => rc[3] }
+
+        elsif _locator.match(/^\s*\//)
+          hit = { 'locator' => _locator.match(/^\s*(.*)\s*$/)[1] }
+
+        elsif _locator.match(/^\s*(css|CSS)\s*=\s*(.*)\s*$/)
+         # hit = { 'locator' => _locator.match(/^\s*(css|CSS)\s*=\s*(.*)\s*$/)[2] }
+          hit = { 'locator' => _locator }
+
         elsif _locator.match(/^\s*[lL]ocator\((.*)\)\s*$/)
           hit = { 'locator' => _locator.match(/^\s*[lL]ocator\((.*)\)\s*$/)[1] }
-        else
+        elsif _locator.match(/^\s*([([fF]rame\([^\(]*?\)\.)]*)\.([lL]ocator\((.*)\))\s*$/)
           rc=_locator.match(/^\s*([([fF]rame\([^\(]*?\)\.)]*)\.([lL]ocator\((.*)\))\s*$/)
 
           if rc
             hit = { 'frame' => rc[1], 'locator' => rc[2]}
           end
+        else
+          hit = { 'locator' => _locator }
         end
 
       elsif _locator.is_a?(Hash) && _locator.has_key?('locator')

data/lib/appmodel/version.rb

@@ -1,3 +1,3 @@
 module Appmodel
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmodel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - H20Dragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 description: Simple, scalable pageObject design and modeling.
 email:
 - h20dragon@outlook.com