xautobrowse 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a98ad02b9ca15c528bd77d851d96d1405a782f3
-  data.tar.gz: 40feedea4769332549a574708afb3198343f8130
+  metadata.gz: dd96b9501e28095dc7b9f4e2c7e24c9a9ebdbd2f
+  data.tar.gz: 63143f4863cd56c5076d4142fa434287001bcb15
 SHA512:
-  metadata.gz: 6d654981f154feeb36bbe40448f583024e6c9038033307be1a3bd71f9a191dbdd5b6c347ce7db9fc40375e054b4fdcdf9ab33322fe0ec15ea43be56c51e1664d
-  data.tar.gz: d6cb140ebacd73bb129d003e7672b3e981439745890fe37425a0b60bf1b7dae804e68042bfd5d49471f6b5258a23588cb2ba9915d96bc4732d62705fa0896bdf
+  metadata.gz: 15235e79acf072fad0b58a7c68b561ea1d66d5748278f150781f3e9e66d8ed6b6759a08ceb6d49ee9ed1637faae72a8db2f26a13e49b5cc31c48796148f92ef7
+  data.tar.gz: 9bc862a4b3ca340f7a1dedd2742400c348879460a7e1376087e7e934247f6eba2a67827d3f7eccf565e2cc6fb885669992d749c87c66dbc4e70618454977dec3

checksums.yaml.gz.sig

@@ -1,2 +1,4 @@
-��w\
-/�)ܧ%��e��FԹoV�Y/ �u�C�?}S8��_�%�F߯_Ż~��~��G�'+�i��7LBn'O���J`>agt�~HTDZ(m����#>FN�|`[6p�+�#�ҷ�GhZٻ�Ju�	�����AYh*}>���k��“���ދ�[��#�
�g�t�
+���`a<_|�@���8<��r��B_�+�oW�v]�H
+M�+���x2h2�U��"K�
+WZE�R���)+U��]�38��!ay�b�0p8wk���򒻋
+urјⲮ��6����6�Z+���[�4ʂ��O[����
�6t�!�����UXƆ��&���� נ�!+��j��[_�<8*]�9�b�!_l�+��9C�|�eCN��SsǴ.i��:����R!�;����d2���H�O��4�K:���,��

data.tar.gz.sig

@@ -1,2 +1,3 @@
-�	}(E�EweV7�����.z�l���c���e�JO{ྕ�u4p��H��u��E�ZJ[�;vٔ��YMWi���V&-����l�K��AW��>H�-y��~��Jy���Yul�)9j<��������3�J��RЂ����Ӑ����3��ZA�q82�!"��#�;(��et&�S�-p������nX�����VB�Ε�m-����{�J5~C��n1V�
-�"+��_�-5E|�\/�‚�9H[�t|W�Ѷz#}
+͂_Tl'���~���`5C��=�ܣ�Q<z^ἑ��Я���oBF(�1�k��%$H5���&�(�	{�mI��qRER��-W��
+/�hJv�)S��6��q)T���"�p�i�t]����
&ܾ$���@'5|��Sϴ��'�f��~�
+7��P*[��7!o���Ր�Q��C���O�I��K����_��#�&̡����v��yV�AN�9�Q֨d��yE���ر��^��8�

data/lib/xautobrowse.rb

@@ -11,6 +11,8 @@
 # 30 Jan 2018: feature: Now uses the gem universal_dom_remote to 
 #                       connect to the browser via websockets. 
 #                       A window can now be closed remotely.
+#                       SPS is now optional given there is no secure 
+#                       websockets support
 # 28 Jan 2018: feature: Chromium is now supported. 
 #                     A custom accesskey can now be used to jump to an element.
 
@@ -29,36 +31,78 @@ class XAutoBrowse
   
   at_exit() do
     
-    puts 'shutting down ...'
-    EventMachine.stop
-    SPSPub.notice('shutdown', host: '127.0.0.1', port: '55000'); sleep 0.5    
+    if @sps then
+      puts 'shutting down ...'
+      EventMachine.stop
+      SPSPub.notice('shutdown', host: '127.0.0.1', port: '55000'); sleep 0.5
+    end
     
   end
   
+  class Window
+    
+    def initialize(browser)
+            
+      @wm = WMCtrl.instance
+      spawn(browser.to_s); sleep 3
+      
+      id = XDo::XWindow.wait_for_window(browser)
+      xwin = XDo::XWindow.new(id)
+      title = xwin.title
+      puts 'title:  ' + title.inspect if @debug
 
-  def initialize(browser= :firefox, debug: false)
+      # WMCtrl is used because XDo is problematic at trying to activate a window
+      
+      a = @wm.list_windows true
+      puts 'a: '  + a.inspect if @debug
+      r = a.reverse.find {|x| x[:title] =~ /#{browser}$/i}
+      @id = r[:id]
 
-    @browser, @debug = browser, debug
+      @x, @y, @width, @height = *r[:geometry]      
+      sleep 4
+      
+    end
     
-    @wm = WMCtrl.instance
-    spawn(browser.to_s); sleep 3
+    def activate()
+      @wm.action_window(@id, :activate)
+    end
     
-    id = XDo::XWindow.wait_for_window(browser)
-    @xwin = XDo::XWindow.new(id)
-    title = @xwin.title
-    puts 'title:  ' + title.inspect if @debug
-
-    # WMCtrl is used because XDo is problematic at trying to activate a window
+    def height=(val)
+      @height = val
+      @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
+    end            
     
-    a = @wm.list_windows true
-    puts 'a: '  + a.inspect if @debug
-    r = a.reverse.find {|x| x[:title] =~ /#{browser}$/i}
-    @id = r[:id]
+    def move(x,y)
+      @x, @y = x, y
+      @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
+    end    
+    
+    def resize_to(width, height)
+      @width, @height = width, height
+      @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
+    end
+    
+    alias resize resize_to
+
+    def width=(val)
+      @width = val
+      @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
+    end        
+  end
+  
+  attr_reader :window
+  
+  
+  def initialize(browser= :firefox, debug: false, sps: false)
 
-    @x, @y, @width, @height = *r[:geometry]
+    @browser, @debug = browser, debug
+    
+    @window = Window.new browser
+    sleep 4
     Thread.new { open_web_console(); sleep 1; close_web_console() }
     
-    connect()
+    @sps = sps
+    connect() if sps
     
   end
   
@@ -68,18 +112,13 @@ class XAutoBrowse
   def accesskey(key) send_keys(key.to_sym)  end
   
   alias access_key accesskey
-
-  def activate()
-    @wm.action_window(@id, :activate)
-  end
-
   
   # Attaches the SPS client to the web browser. The SPS broker must be 
   # started before the code can be attached. see start_broker()
   #
   def attach_console(autohide: true)
     
-    activate()
+    @window.activate()
     open_web_console(); sleep 1
 
     clipboard = Clipboard.paste    
@@ -97,7 +136,7 @@ class XAutoBrowse
   end
   
   def close_web_console()
-    activate()
+    @window.activate()
     ctrl_shift_i()
   end
   
@@ -118,18 +157,38 @@ class XAutoBrowse
     
   end
   
+  def copy_screen()
+    select_all(); sleep 2; ctrl_c(); sleep 2
+    unselect_all()
+    Clipboard.paste    
+  end
+  
+  alias scrape_screen copy_screen
+  
   def copy_source()
     
     view_source(); sleep 3
-    ctrl_a() # select all
+    select all()
     sleep 1
     ctrl_c() # copy the source code to the clipboard
+    sleep 1
+    ctrl_w() # close the viewsource window
     
   end
   
   # select all
   #
   def ctrl_a() send_keys(:ctrl_a)  end
+    
+  # unselect all
+  #
+  def ctrl_shift_a()
+
+    XDo::Keyboard.key_down('shift')
+    send_keys(:ctrl_a)
+    XDo::Keyboard.key_up('shift')    
+
+  end    
   
   # copy
   #
@@ -154,19 +213,14 @@ class XAutoBrowse
   # developer tools
   #
   def ctrl_shift_i() send_keys(:ctrl_shift_i) end    
-    
-  def height=(val)
-    @height = val
-    @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
-  end        
-  
+      
   # submit a form by pressing return
   #
   def go()
     
     if block_given? then
       
-      activate(); sleep 2    
+      @window.activate(); sleep 2    
       yield(self)     
       carriage_return()
       
@@ -174,26 +228,17 @@ class XAutoBrowse
     
   end
   
-  def goto(url)
+  def goto(url, attachconsole: true)
     
-    activate(); sleep 0.5
-    ctrl_l();   sleep 0.5
-    enter(url); sleep 4
-    attach_console()
+    @window.activate(); sleep 2
+    ctrl_l();   sleep 1
+    enter(url); sleep 7
+    attach_console() if @sps and attachconsole
 
   end  
-
-  def move(x,y)
-    @x, @y = x, y
-    @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
-  end
-
-  def resize(width, height)
-    @width, @height = width, height
-    @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
-  end
   
   def carriage_return()
+    @window.activate(); sleep 1
     XDo::Keyboard.return
   end
   
@@ -204,13 +249,32 @@ class XAutoBrowse
     console  = @browser == :firefox ? :ctrl_shift_k : :ctrl_shift_i
     method(console).call # web console
     
-    sleep 2    
+    sleep 2
+    
+    if block_given? then
+      yield(self)
+      close_web_console()
+    end
     
   end
   
   def send(s)
     @udr.send s
   end
+    
+  def select_all()
+    ctrl_a()
+  end
+  
+  def unselect_all()
+    
+    if @browser == :firefox then
+      tab(); shift_tab()
+    else
+      ctrl_shift_a()
+    end
+    
+  end
   
   # Starts the simplepubsub broker
   
@@ -226,8 +290,17 @@ class XAutoBrowse
     SPSPub.notice 'shutdown', host: '127.0.0.1', port: '55000'
   end
   
+  def shift_tab(n=1)
+    
+    @window.activate()
+    XDo::Keyboard.key_down('shift')
+    XDo::Keyboard.simulate("{TAB}" * n)
+    XDo::Keyboard.key_up('shift')
+    
+  end
+  
   def tab(n=1)
-    activate()
+    @window.activate()
     XDo::Keyboard.simulate("{TAB}" * n)
   end
   
@@ -256,11 +329,11 @@ class XAutoBrowse
   
   # type some text
   #
-  def type(s)  activate(); XDo::Keyboard.type(s)  end
+  def type(s)  @window.activate(); XDo::Keyboard.type(s)  end
   
   def view_source()
     
-    activate(); sleep 0.5
+    @window.activate(); sleep 0.5
     ctrl_l() # jump to the location bar
     sleep 0.6
     tab(2); sleep 0.5
@@ -268,10 +341,6 @@ class XAutoBrowse
     
   end  
   
-  def width=(val)
-    @width = val
-    @wm.action_window(@id, :move_resize, 0, @x, @y, @width, @height)
-  end    
   
   # input some text
   #
@@ -315,7 +384,7 @@ ws.onmessage = function(event) {
   
   def send_keys(keys)
     
-    activate(); XDo::Keyboard.send keys.to_sym    
+    @window.activate(); XDo::Keyboard.send keys.to_sym    
     
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xautobrowse
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson