watir-search 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5b1ddc4a4b489045b034be1aa14fa363c4dfdba
-  data.tar.gz: f10a63401ea003a6136995e5b62523b931b0d490
+  metadata.gz: 68cc2bf299a0338c567ef92de700f6d905704422
+  data.tar.gz: 2b1578d1b2c35503548797fa1ee90d668fae3d2f
 SHA512:
-  metadata.gz: 75096a82fa6ee99c2bca3eddfe154f9d56a21a4bf63dfef8f43e3dc7edf41c3921a15e9b7a23de9bfec20f6c960581c43e6cb14524343015bcd88c030df5233f
-  data.tar.gz: b934a9d539d68cde3bad9a21892babe61c4686a76d7381c30ee28a764991b8c7c394c3d57e124089daae7128779975671953819465d18434bbd565f014d8e4c4
+  metadata.gz: 7d30297d88cfe4d03dee10614b11e727b9ffd8ef04f87823ffd72361a935948e8067dc926337d366021fd7043ca68873a0e98a7e26c05fedffa5a4b363a408ec
+  data.tar.gz: a2720450d4108fcff72040fc64dc97a1bc51e149cabeeb5382f6f276b4f1815adc81e915d5afcdbd2965bfc8917771a2ef8ddb1613ff658991ba753875a457bb

data/lib/watir-search/load_view.rb

@@ -57,9 +57,12 @@ module Watir
       array
     end
 
+    def original_hash(file)
+      YAML.load_file(File.join(File.dirname(__FILE__), file))
+    end
+
     def load_view(file:nil, hash:nil, parent:nil)
-      hash ||= decode_hash(
-        YAML.load_file(File.join(File.dirname(__FILE__), file)))
+      hash ||= decode_hash(original_hash(file))
       view_array(hash).each { |h| view_accessor(parent, h) }
     end
   end

data/lib/watir-search/search_engine.yml

@@ -5,3 +5,11 @@ general:
   enter:
     node: input
     type: submit
+
+google:
+  search:
+    node: text_field
+    name: q
+  enter:
+    node: button
+    type: submit

data/lib/watir-search.rb

@@ -4,26 +4,34 @@ require 'watir-webdriver'
 module Watir
   class Search
     include LoadView
-    attr_reader :sys
+    attr_reader :sys, :url
 
-    def sys
-      return @sys if @sys
+    def initialize(url)
       @sys = Watir::Browser.new(:firefox)
-    end
+      @url = url
+      @view_file = 'search_engine.yml'
 
-    def initialize(url)
       sys.goto url
       sys
-      load_view(file: 'search_engine.yml', parent: sys)
+      load_view(file: @view_file, parent: sys)
     end
 
     def quit
       sys.close if sys
     end
 
+    def view_prefix
+      if original_hash(@view_file).keys
+         .select { |k| url.include?(k.to_s) }.empty?
+        'general'
+      else
+        url.split('.')[1]
+      end
+    end
+
     def execute(text, timeout:nil)
-      general_search.when_present.set(text)
-      general_enter.click
+      send("#{view_prefix}_search").when_present.set(text)
+      send("#{view_prefix}_enter").when_present.click
       sleep timeout if timeout
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-search
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chao Li