mohawk 0.0.2 → 0.0.3

data/lib/mohawk/accessors/label.rb

@@ -1,13 +1,15 @@
-module Mohawk
-	module Accessors
-		class Label
-			def initialize(adapter, locator)
-				@label = adapter.window.label(locator)
-			end
-			
-			def value 
-				@label.value
-			end
-		end
-	end
-end
+module Mohawk
+  module Accessors
+    class Label
+      attr_reader :view
+
+      def initialize(adapter, locator)
+        @view = adapter.window.label(locator)
+      end
+
+      def value
+        @view.value
+      end
+    end
+  end
+end

data/lib/mohawk/accessors/link.rb

@@ -0,0 +1,9 @@
+module Mohawk
+  module Accessors
+    class Link < Label
+      def click
+        @view.click
+      end
+    end
+  end
+end

data/lib/mohawk/accessors/radio.rb

@@ -1,16 +1,18 @@
 module Mohawk
   module Accessors
     class Radio
+      attr_reader :view
+
       def initialize(adapter, locator)
-        @radio = adapter.window.radio(locator)
+        @view = adapter.window.radio(locator)
       end
 
       def set
-        @radio.set
+        @view.set
       end
 
       def set?
-        @radio.set?
+        @view.set?
       end
     end
   end

data/lib/mohawk/accessors/table.rb

@@ -1,49 +1,30 @@
 module Mohawk
   module Accessors
     class Table
-      class Row
-        attr_reader :row
+      attr_reader :view
 
-        def initialize(table, row)
-          @row = row
-          @table = table
-        end
-        
-        def selected?
-          @table.selected? row.row
-        end
-
-        def cells
-          row.cells.map &:text
-        end
-
-        def to_hash
-          {:text => row.text, :row => row.row }
-        end
-      end
-
-      attr_reader :table
+      include Enumerable
 
       def initialize(adapter, locator)
-        @table = adapter.window.table(locator)
+        @view = adapter.window.table(locator)
       end
 
       def select(which_item)
-        table.select which_item if which_item.is_a? Integer
+        view.select which_item
       end
 
-      def rows
-        table.rows.map do |row|
-          Row.new(table, row).to_hash
-        end
+      def headers
+        RAutomation::Adapter::MsUia::UiaDll.table_headers(view.search_information)
       end
 
-      def row(which_row)
-        Row.new table, table.row(:index => which_row)
+      def [](row)
+        TableRow.new(self, view.row(:index => row))
       end
 
-      def view
-        table
+      def each
+        view.rows.map do |row|
+          yield TableRow.new(self, row)
+        end
       end
     end
   end

data/lib/mohawk/accessors/table_row.rb

@@ -0,0 +1,43 @@
+module Mohawk
+  module Accessors
+    class TableRow
+      attr_reader :row
+
+      def initialize(table, row)
+        @row = row
+        @table = table
+      end
+      
+      def selected?
+        @table.view.selected? row.row
+      end
+
+      def select
+        @table.view.select row.row
+      end
+
+      def cells
+        row.cells.map &:text
+      end
+
+      def value_from_header(name)
+        which_column = header_methods.index(name)
+        raise ArgumentError, "#{name} column does not exist in #{header_methods}" if which_column.nil?
+        cells[which_column]
+      end
+      
+      def method_missing(name, *args)
+        value_from_header name
+      end
+
+      def to_hash
+        {:text => row.text, :row => row.row }
+      end
+
+      private
+      def header_methods
+        @headers ||= @table.headers.map(&:to_method)
+      end
+    end
+  end
+end

data/lib/mohawk/accessors/text.rb

@@ -1,25 +1,27 @@
 module Mohawk
   module Accessors
     class Text
+      attr_reader :view 
+
       def initialize(adapter, locator)
         @adapter = adapter
-        @text = adapter.window.text_field(locator)
+        @view = adapter.window.text_field(locator)
       end
 
       def value
-        @text.value
+        @view.value
       end
 
       def set(text)
-        @text.set text
+        @view.set text
       end
 
       def clear
-        @text.clear
+        @view.clear
       end
 
       def enter(text)
-        text_window = @adapter.window.child(:hwnd => @text.hwnd)
+        text_window = @adapter.window.child(:hwnd => @view.hwnd)
         text_window.send_keys text.split(//)
       end
     end

data/lib/mohawk/accessors/tree_view.rb

@@ -1,29 +1,31 @@
 module Mohawk
   module Accessors
     class TreeView
+      attr_reader :view
+
       def initialize(adapter, locator)
-        @tree = adapter.window.select_list(locator)
+        @view = adapter.window.select_list(locator)
       end
 
       def value
-        @tree.value
+        @view.value
       end
 
       def items
-        @tree.options.map &:text
+        @view.options.map &:text
       end
 
       def expand(which_item)
-        @tree.expand which_item
+        @view.expand which_item
       end
 
       def collapse(which_item)
-        @tree.collapse which_item
+        @view.collapse which_item
       end
 
       def select(which_item)
-        @tree.select which_item if which_item.is_a? Integer
-        @tree.set which_item if which_item.is_a? String
+        @view.select which_item if which_item.is_a? Integer
+        @view.set which_item if which_item.is_a? String
       end
     end
   end

data/lib/mohawk/accessors.rb

@@ -40,6 +40,9 @@ module Mohawk
       define_method("enter_#{name}") do |text|
         adapter.text(locator).enter text
       end
+      define_method("#{name}_view") do
+        adapter.text(locator).view
+      end
     end
     
     #
@@ -60,6 +63,9 @@ module Mohawk
       define_method("#{name}_value") do
         adapter.button(locator).value
       end
+      define_method("#{name}_view") do
+        adapter.button(locator).view
+      end
     end
 
     #
@@ -88,6 +94,9 @@ module Mohawk
       define_method("#{name}_options") do
         adapter.combo(locator).options
       end
+      define_method("#{name}_view") do
+        adapter.combo(locator).view
+      end
     end
 
     #
@@ -111,6 +120,9 @@ module Mohawk
       define_method("#{name}_value") do
         adapter.checkbox(locator).value
       end
+      define_method("#{name}_view") do
+        adapter.checkbox(locator).view
+      end
     end
 
     #
@@ -131,6 +143,9 @@ module Mohawk
       define_method("#{name}?") do
         adapter.radio(locator).set?
       end
+      define_method("#{name}_view") do
+        adapter.radio(locator).view
+      end
     end
 
     #
@@ -147,6 +162,31 @@ module Mohawk
       define_method("#{name}") do
         adapter.label(locator).value
       end
+      define_method("#{name}_view") do
+        adapter.label(locator).view
+      end
+    end
+
+    #
+    # Generates methods to work with link controls
+    #
+    # @example
+    #   link(:send_info_link, :id => 'sendInfoId')
+    #   # will generate 'send_info_link_text' and 'click_send_info_link' methods
+    #
+    # @param  [String]  the name used for the generated methods
+    # @param  [Hash]  locator for how the label is found
+    #
+    def link(name, locator)
+      define_method("#{name}_text") do
+        adapter.link(locator).value
+      end
+      define_method("click_#{name}") do
+        adapter.link(locator).click
+      end
+      define_method("#{name}_view") do
+        adapter.link(locator).view
+      end
     end
 
     # Generates methods to work with menu items
@@ -168,8 +208,9 @@ module Mohawk
     #
     # @example
     #   table(:some_table, :id => "tableId")
-    #   # will generate 'some_table=', 'some_table_rows' and 'some_table_row(item)' methods to
-    #   # select a table item, return all of the rows as well as return an individual row
+    #   # will generate 'some_table', 'some_table=', 'some_table_headers'
+    #   # and 'some_table_view' methods to get an Enumerable of table rows,
+    #   # select a table item, return all of the headers and get the raw view
     #
     # @param  [String]  the name used for the generated methods
     # @param  [Hash]  locator for how the label is found
@@ -179,14 +220,14 @@ module Mohawk
     # * list_view
     #
     def table(name, locator)
+      define_method("#{name}") do
+        adapter.table(locator)
+      end
       define_method("#{name}=") do |which_item|
         adapter.table(locator).select which_item
       end
-      define_method("#{name}_rows") do
-        adapter.table(locator).rows
-      end
-      define_method("#{name}_row") do |which_row|
-        adapter.table(locator).row which_row
+      define_method("#{name}_headers") do
+        adapter.table(locator).headers
       end
       define_method("#{name}_view") do
         adapter.table(locator).view
@@ -224,6 +265,24 @@ module Mohawk
       define_method("collapse_#{name}_item") do |which_item|
         adapter.tree_view(locator).collapse which_item
       end
+      define_method("#{name}_view") do
+        adapter.tree_view(locator).view
+      end
+    end
+
+    def control(name, locator)
+      define_method("#{name}_value") do
+        adapter.value_control(locator).value
+      end
+      define_method("#{name}=") do |value|
+        adapter.value_control(locator).set value
+      end
+      define_method("click_#{name}") do
+        adapter.value_control(locator).click
+      end
+      define_method("#{name}_view") do
+        adapter.value_control(locator).view
+      end
     end
 
     # combo_box aliases

data/lib/mohawk/adapters/uia_adapter.rb

@@ -31,6 +31,10 @@ module Mohawk
         Mohawk::Accessors::Label.new(self, locator)
       end
 
+      def link(locator)
+        Mohawk::Accessors::Link.new(self, locator)
+      end
+
       def menu_item(locator)
         Mohawk::Accessors::MenuItem.new(self, locator)
       end
@@ -42,6 +46,10 @@ module Mohawk
       def tree_view(locator)
         Mohawk::Accessors::TreeView.new(self, locator)
       end
+
+      def value_control(locator)
+        Mohawk::Accessors::Control.new(self, locator)
+      end
     end
   end
 end

data/lib/mohawk/core_ext/string.rb

@@ -0,0 +1,5 @@
+class String
+  def to_method
+    self.gsub(/\W+/, "_").downcase.to_sym
+  end
+end

data/lib/mohawk/navigation.rb

@@ -1,7 +1,11 @@
+require 'page_navigation'
+
 module Mohawk
   module Navigation
-    def on(cls, &block)
-      screen = cls.new
+    include PageNavigation
+
+    def on(cls, extra={}, &block)
+      screen = cls.new extra
       screen.wait_until_present
       block.call screen if block
       screen

data/lib/mohawk/version.rb

@@ -1,3 +1,3 @@
-module Mohawk
-  VERSION = "0.0.2"
-end
+module Mohawk
+  VERSION = "0.0.3"
+end

data/lib/mohawk.rb

@@ -1,69 +1,76 @@
-require "rautomation"
-require "mohawk/version"
-require "mohawk/accessors"
-require "mohawk/accessors/button"
-require "mohawk/accessors/checkbox"
-require "mohawk/accessors/combo"
-require "mohawk/accessors/label"
-require "mohawk/accessors/menu_item"
-require "mohawk/accessors/radio"
-require "mohawk/accessors/table"
-require "mohawk/accessors/text"
-require "mohawk/accessors/tree_view"
-require "mohawk/navigation"
-require "mohawk/adapters/uia_adapter"
-
-module Mohawk
-
-  attr_reader :adapter
-
-  def self.included(cls)
-    cls.extend Mohawk::Accessors
-  end
-
-  def initialize
-    @adapter = Mohawk::Adapters::UiaAdapter.new(which_window)
-  end 
-
-  #
-  # Returns whether or not the window exists
-  #
-  def exist?
-    adapter.window.exist?
-  end
-
-  #
-  # Returns whether or not the window is active
-  #
-  def active?
-    adapter.window.active?
-  end
-
-  #
-  # Returns whether or not the window is present
-  #
-  def present?
-    adapter.window.present?
-  end
-
-  #
-  # Waits until the window is present
-  #
-  def wait_until_present
-    adapter.window.wait_until_present
-  end
-
-  #
-  # Waits until the block returns true
-  #
-  def wait_until(timeout=RAutomation::Window.wait_timeout, &block)
-    RAutomation::WaitHelper.wait_until timeout, &block
-  end
-
-  #
-  # Indicates if the window has text or not
-  #
-  def has_text?(text_to_find)
-    adapter.window.text.include? text_to_find
-  end
-end
+require "rautomation"
+require "mohawk/version"
+require "require_all"
+require "mohawk/accessors"
+require "mohawk/navigation"
+require "mohawk/adapters/uia_adapter"
+require "mohawk/core_ext/string"
+
+require_rel "mohawk/accessors"
+
+module Mohawk
+
+  attr_reader :adapter
+
+  def self.included(cls)
+    cls.extend Mohawk::Accessors
+  end
+
+  def initialize(extra={})
+    @adapter = Mohawk::Adapters::UiaAdapter.new(which_window.merge(extra))
+  end 
+
+  #
+  # Returns whether or not the window exists
+  #
+  def exist?
+    adapter.window.exist?
+  end
+
+  #
+  # Returns whether or not the window is active
+  #
+  def active?
+    adapter.window.active?
+  end
+
+  #
+  # Returns whether or not the window is present
+  #
+  def present?
+    adapter.window.present?
+  end
+
+  #
+  # Waits until the window is present
+  #
+  def wait_until_present
+    adapter.window.wait_until_present
+  end
+
+  #
+  # Waits until a control exists
+  #
+  def wait_for_control(locator)
+    control = adapter.window.control(locator)
+    begin
+      RAutomation::WaitHelper.wait_until { control.exist? }
+    rescue
+      raise "A control with #{locator} was not found"
+    end
+  end
+
+  #
+  # Waits until the block returns true
+  #
+  def wait_until(timeout=RAutomation::Window.wait_timeout, &block)
+    RAutomation::WaitHelper.wait_until timeout, &block
+  end
+
+  #
+  # Indicates if the window has text or not
+  #
+  def has_text?(text_to_find)
+    adapter.window.text.include? text_to_find
+  end
+end

data/mohawk.gemspec

@@ -1,26 +1,32 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mohawk/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "mohawk"
-  gem.version       = Mohawk::VERSION
-  gem.authors       = ["Levi Wilson"]
-  gem.email         = ["levi@leviwilson.com"]
-  gem.description   = %q{High level wrapper around windows applications}
-  gem.summary       = %q{High level wrapper around windows applications}
-  gem.homepage      = "http://github.com/leviwilson/mohawk"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-
-  gem.add_dependency 'rautomation', '>= 0.8.0'
-
-  gem.add_development_dependency 'cucumber'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'childprocess'
-end
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mohawk/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "mohawk"
+  gem.version       = Mohawk::VERSION
+  gem.authors       = ["Levi Wilson"]
+  gem.email         = ["levi@leviwilson.com"]
+  gem.description   = %q{High level wrapper around windows applications}
+  gem.summary       = %q{High level wrapper around windows applications}
+  gem.homepage      = "http://github.com/leviwilson/mohawk"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency 'rautomation', '>= 0.9.1'
+  gem.add_dependency 'require_all'
+  gem.add_dependency 'page_navigation', '>= 0.7'
+
+  gem.add_development_dependency 'cucumber'
+  gem.add_development_dependency 'rspec', '>= 2.12.0'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'childprocess'
+  gem.add_development_dependency 'rb-fsevent', '~> 0.9.1'
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'terminal-notifier-guard'
+end

data/spec/lib/mohawk/accessors/button_spec.rb

@@ -37,5 +37,9 @@ describe Mohawk::Accessors::Button do
       button_field.should_receive(:value).and_return "Button Value"
       screen.easy_value.should eq("Button Value")
     end
+
+    it "can dish out the view" do
+      screen.easy_view.should be(button_field)
+    end
   end
 end

data/spec/lib/mohawk/accessors/checkbox_spec.rb

@@ -38,6 +38,9 @@ describe Mohawk::Accessors::CheckBox do
       checkbox_field.should_receive(:clear)
       screen.check_yourself = false
     end
-     
+
+    it "can dish out the raw control" do
+      screen.check_yourself_view.should be(checkbox_field)
+    end
   end
 end

data/spec/lib/mohawk/accessors/combo_spec.rb

@@ -58,6 +58,9 @@ describe Mohawk::Accessors::Combo do
       screen.nacho_combos_options.should eq(["first", "second", "third"])
     end
 
+    it "can dish out the combo view" do
+      screen.nacho_combos_view.should be(combo_box_field)
+    end
   end
 
   context "aliases for combo_box" do