watir-or 0.0.3 → 0.0.4

data/lib/watir-or/converters/element_converter.rb

@@ -1,36 +1,26 @@
 module ObjectRepository
-  module ElementConverter
-    module Watir
-      def self.convert(browser, repository, rep_element)
-        eval("browser.#{build_element(rep_element, repository)}")
-      end
+  module WatirObjectBuilder
+    def self.build_watir_obj(repository, rep_element)
+      eval("repository.browser.#{build_element(rep_element, repository)}")
+    end
 
-      def self.build_element(rep_element, repository)
-        parent = ""
-        unless rep_element.locator[:parent].nil?
-          parent = build_element(repository.find(rep_element.locator[:parent]), repository) + "."
-        end
-        locator = rep_element.locator.dup
-        locator.delete(:parent)
-        parent << "%s(%s)" % [rep_element.type, build_locator(locator)]
-      end
-      
-      #Method need for separate frame(:name => "foo") and frame(:name, "foo").
-      #Because frame with multiply conditions doesn't work
-      def self.build_locator(locator)
-        if locator.length > 1
-          locator.inspect.gsub(/(^\{|\}$)/, "")
-        else
-          ":%s,%s" % [locator.keys.first, locator[locator.keys.first].inspect]
-        end
+    def self.build_element(rep_element, repository)
+      parent = ""
+      unless rep_element.locator[:parent].nil?
+        parent = build_element(repository.find { |el| el.rep_id == rep_element.locator[:parent] }, repository) + "."
       end
+      locator = rep_element.locator.dup
+      locator.delete(:parent)
+      parent << "%s(%s)" % [rep_element.type, build_locator(locator)]
     end
-
-    def to_form_object(browser, repository)
-      if self.type[0, 1] =~ /[A-Z]/
-        eval(self.type).new(repository, browser, self.locator)
+      
+    #Method need for separate frame(:name => "foo") and frame(:name, "foo").
+    #Because frame with multiply conditions doesn't work
+    def self.build_locator(locator)
+      if locator.length > 1
+        locator.inspect.gsub(/(^\{|\}$)/, "")
       else
-        Watir.convert(browser, repository, self)
+        ":%s,%s" % [locator.keys.first, locator[locator.keys.first].inspect]
       end
     end
   end

data/lib/watir-or/element.rb

@@ -1,40 +1,71 @@
 module ObjectRepository
   class RepositoryElement
-    include ElementConverter
-    attr_reader :id, :type, :locator, :description
+    attr_reader :rep_id, :type, :description
 
-    def initialize(id, type, hows, whats, description)
-      @id = id
-      @description = description
-      @type = type
-      normalize_whats!(whats)
-      @locator = Hash[*hows.zip(whats).flatten]
+    def initialize(rep_id, type, hows, whats, description, repository)
+      @rep_id = rep_id.dup
+      @description = description #.dup
+      @type = type.dup
+      @hows, @whats = hows.dup, whats.dup
+      @repository = repository
     end
 
     def inspect
-      "Element #{@id.inspect}:\n\tlocator: #{@locator.inspect}\n\tdescription: #{@description.inspect}\n"
+      "Element #{@rep_id.inspect}:\n\thows: #{@hows.inspect}\n\twhats: #{@whats.inspect}\n\tdescription: #{@description.inspect}\n"
     end
 
     def ==(other)
-      @id == other.id && @type == other.type && @description == other.description && @locator == other.locator
+      @rep_id == other.rep_id && @type == other.type && @description == other.description
+    end
+  end
+
+  class WatirElement < RepositoryElement
+    include WatirObjectBuilder
+    attr_reader :watir_obj, :locator
+
+    def initialize(id, type, hows, whats, description, repository)
+      super(id, type, hows, whats, description, repository)
+      transform_whats!
+      @locator = Hash[*@hows.zip(@whats).flatten]
+    end
+
+    def method_missing(meth_name, *args, &block)
+      @watir_obj ||= WatirObjectBuilder.build_watir_obj(@repository, self)
+      if @watir_obj.respond_to?(meth_name) || meth_name.to_s.include?("_no_wait")
+        @watir_obj.send(meth_name, *args, &block)
+      else
+        super
+      end
+    end
+
+    def present?
+      method_missing(:present?)
     end
 
     private
 
-    def normalize_whats!(whats)
-      whats.map! do |what|
-        what =~ /^\/(.*)\/$/ ? what = Regexp.new($1) : what
+    def transform_whats!
+      @hows.each_with_index do |how, index|
+        if how == :index
+          @whats[index] = @whats[index].to_i
+        elsif @whats[index] =~ /^\/(.*)\/$/ && how != :xpath
+          @whats[index] = Regexp.new($1)
+        end
       end
     end
   end
 
-  class CustomElement
-    def initialize(repository, browser, attributes)
-      @repository, @browser, @attributes = repository, browser, attributes
+  class CustomElement < RepositoryElement
+    def initialize(*args)
+      super(*args)
+      @attributes = {}
+      @hows.each_with_index do |how, index|
+        @attributes[how] = @repository.get_by_rep_id(@whats[index])
+      end
     end
 
     def field(name)
-      @repository.get(@attributes[name])
+      @attributes[name]
     end
   end
 end

data/lib/watir-or/readers/xls.rb

@@ -33,11 +33,7 @@ module ObjectRepository
             description = row[4]
           end
           hows << row[2]
-          whats << if row[2] == "index"
-            row[3].to_i
-          else
-            row[3]
-          end
+          whats << row[3]
           if (!worksheet.row(row.idx + 1)[0].nil? || row.idx + 1 >= rows_count )
             yield rep_id, type, hows.map { |el| el.to_sym }, whats, description
           end

data/lib/watir-or/readers/xml.rb

@@ -7,7 +7,7 @@ module ObjectRepository
         doc = Nokogiri::XML(File.read(file), nil, 'UTF-8', Nokogiri::XML::ParseOptions::NOBLANKS)
         doc.root.xpath("//object").each { |node|
           hows = node.search("./how").children
-          whats = hows.map { |h| h.name == "index" ? h.content.to_i : h.content }
+          whats = hows.map { |h| h.content }
           #Add parent
           hows = hows.map { |h| h.name.to_sym  }
           if node.parent != doc.root

data/lib/watir-or/repository.rb

@@ -1,5 +1,6 @@
 module ObjectRepository
   class Repository
+    include Enumerable
     attr_reader :file, :browser, :elements
 
     def initialize(file, browser, options = nil)
@@ -10,26 +11,21 @@ module ObjectRepository
       fill_elements(options)
     end
 
-    def find(what, how = nil)
-      if how.nil?
-        element = @elements.find { |el| el.id == what || el.description == what }
-      else
-        element = @elements.find { |el| el.instance_variable_get("@#{how}") == what }
-      end
-      raise "Couldn't find repository element with #{what.inspect} by #{how.inspect}" if element.nil?
-      return element
+    def each(&block)
+      @elements.each { |el| yield el }
     end
 
     def method_missing(meth_name, what, &block)
-      case meth_name.to_s
+      element = case meth_name.to_s
       when /^get_by_(.*)/
-        element = find(what, $1.to_sym)
+        find { |el| el.instance_variable_get("@#{$1.to_sym}") == what }
       when "get"
-        element = find(what)
+        find { |el| el.rep_id == what || el.description == what }
       else
         super
       end
-      return element.to_form_object(@browser, self)
+      raise "Couldn't find repository element with #{what.inspect}" if element.nil?
+      return element
     end
     
     def inspect
@@ -39,14 +35,18 @@ module ObjectRepository
     private
 
     def fill_elements(options)
-      eval("ObjectRepository::Reader::" + @type.upcase).read(@file, options) { |rep_id, type, hows, whats, description|
-        unless @elements.find { |el| el.id == rep_id }
-          @elements << RepositoryElement.new(rep_id, type, hows, whats, description)
+      eval("ObjectRepository::Reader::" + @type.upcase).read(@file, options) do |rep_id, type, hows, whats, description|
+        unless @elements.find { |el| el.rep_id == rep_id }
+          @elements << if type[0..0] =~ /[A-Z]/
+            eval("#{type}").new(rep_id, type, hows, whats, description, self)
+          else
+            WatirElement.new(rep_id, type, hows, whats, description, self)
+          end
         else
           raise "Duplicating of id: #{rep_id.inspect}"
         end
-      }
-    rescue NameError => e
+      end
+    rescue NameError      
       raise "Unknown type #{@type.inspect} of repository"
     end
   end

data/spec/browser_stub.rb

@@ -1,5 +1,12 @@
 class BrowserStub
   def method_missing(meth_name, *args, &block)
-    return "%s(%s)" % [meth_name, args.first.inspect.gsub(/(^\{|\}$)/, "")]
+    Control.new
+#    return "%s(%s)" % [meth_name, args.first.inspect.gsub(/(^\{|\}$)/, "")]
+  end
+end
+
+class Control
+  def method_missing(meth_name, *args, &block)
+    Control.new
   end
 end

data/spec/custom_elements_spec.rb

@@ -1,10 +1,8 @@
 require 'lib/watir-or'
 require 'spec/browser_stub'
+require 'spec/spec_helper'
 TEST_FILE = "spec/test.xls"
 
-class MyCustomElement < ObjectRepository::CustomElement
-end
-
 describe "CustomElement" do
   before(:all) do
     @browser_stub = BrowserStub.new
@@ -14,4 +12,10 @@ describe "CustomElement" do
   it "should return MyCustomElement object" do
     @repository.get("custom element").should be_a(MyCustomElement)
   end
+
+  it "should return field of MyCustomElement object" do
+    attr1 = ObjectRepository::RepositoryElement.new("one attribute", "text_field", [:name],
+        ["test"], "Element with one attribute", @repository)
+    @repository.get("custom element").field(:attr1).should == attr1
+  end
 end

data/spec/find_elements_spec.rb

@@ -1,29 +1,32 @@
 require 'lib/watir-or.rb'
 require 'spec/browser_stub'
+require 'spec/spec_helper'
 
 describe "Search of elements" do
   before(:all) do
     @browser_stub = BrowserStub.new
     @repository = ObjectRepository::Repository.new("spec/test.xls", @browser_stub)
+    @element = ObjectRepository::RepositoryElement.new("many attributes", "select_list", [:text, :index],
+        ["test text", 1], "Element with many attributes", @repository)
   end
 
   context "find element by id or description if argument is" do
     it "id" do
-      @repository.get("many attributes").should == "select_list(:index=>1, :text=>\"test text\")"
+      @repository.get("many attributes").should == @element
     end
 
     it "description" do
-      @repository.get("Element with many attributes").should == "select_list(:index=>1, :text=>\"test text\")"
+      @repository.get("Element with many attributes").should == @element
     end
   end
 
   context "find by" do
     it "id" do
-      @repository.get_by_id("many attributes").should == "select_list(:index=>1, :text=>\"test text\")"
+      @repository.get_by_rep_id("many attributes").should == @element
     end
 
     it "description" do
-      @repository.get_by_description("Element with many attributes").should == "select_list(:index=>1, :text=>\"test text\")"
+      @repository.get_by_description("Element with many attributes").should == @element
     end
   end
 

data/spec/read_xls_spec.rb

@@ -1,54 +1,59 @@
 require 'lib/watir-or.rb'
+require 'spec/spec_helper'
 
 describe "Read xls-repository" do
   context "Read first worksheet" do
     before(:all) do
-      @repository = ObjectRepository::Repository.new("spec/test.xls", nil)
+      @repository = ObjectRepository::Repository.new("spec/test.xls", BrowserStub.new)
     end
 
     it "element with one attribute was readed" do
       one = ObjectRepository::RepositoryElement.new("one attribute", "text_field", [:name],
-        ["test"], "Element with one attribute")
-      @repository.find("one attribute").should == one
+        ["test"], "Element with one attribute", @repository)
+      @repository.get("one attribute").should == one
     end
 
     it "element with many attribute was readed" do
       many = ObjectRepository::RepositoryElement.new("many attributes", "select_list", [:text, :index],
-        ["test text", 1], "Element with many attributes")
-      @repository.find("many attributes").should == many
+        ["test text", 1], "Element with many attributes", @repository)
+      @repository.get("many attributes").should == many
     end
 
     it "last element with many attribute was readed" do
       last_many = ObjectRepository::RepositoryElement.new("last element with many attributes", "image",
-        [:name, :src], ["xxx", "path"], "Last element with many attributes")
-      @repository.find("last element with many attributes").should == last_many
+        [:name, :src], ["xxx", "path"], "Last element with many attributes", @repository)
+      @repository.get("last element with many attributes").should == last_many
     end
   end
 
   context "Read special worksheet" do
     before(:all) do
-      @repository = ObjectRepository::Repository.new("spec/test.xls", nil, :worksheet => "special worksheet")
+      @repository = ObjectRepository::Repository.new("spec/test.xls", BrowserStub.new, :worksheet => "special worksheet")
     end
 
     it "should read element on special workheet" do
       first = ObjectRepository::RepositoryElement.new("first element", "text_field",
-        [:name], ["awesome"], "First element on special worksheet")
-      @repository.find("first element").should == first
+        [:name], ["awesome"], "First element on special worksheet", @repository)
+      @repository.get("first element").should == first
     end
   end
 
   context "Read all worksheets" do
     before(:all) do
-      @repository = ObjectRepository::Repository.new("spec/test.xls", nil, :worksheet => :all)
+      @repository = ObjectRepository::Repository.new("spec/test.xls", BrowserStub.new, :worksheet => :all)
     end
 
     it "should read all elements on all workheets" do
       on_first_worksheet = ObjectRepository::RepositoryElement.new("one attribute", "text_field", [:name],
-        ["test"], "Element with one attribute")
+        ["test"], "Element with one attribute", @repository)
       on_special_worksheet = ObjectRepository::RepositoryElement.new("first element", "text_field",
-        [:name], ["awesome"], "First element on special worksheet")
-      @repository.find("one attribute").should == on_first_worksheet
-      @repository.find("first element").should == on_special_worksheet
+        [:name], ["awesome"], "First element on special worksheet", @repository)
+      @repository.get("one attribute").should == on_first_worksheet
+      @repository.get("first element").should == on_special_worksheet
     end
   end
+
+  it "duplicating of id" do
+      lambda { ObjectRepository::Repository.new("spec/test_duplicating_id.xls", BrowserStub.new) }.should raise_error
+  end
 end

data/spec/read_xml_spec.rb

@@ -1,25 +1,26 @@
 require 'lib/watir-or.rb'
+require 'spec_helper'
 
 describe "Read xml-repository" do
   before(:all) do
-    @repository = ObjectRepository::Repository.new("spec/test.xml", nil)
+    @repository = ObjectRepository::Repository.new("spec/test.xml", BrowserStub.new)
   end
 
   it "element with one attribute was readed" do
     one = ObjectRepository::RepositoryElement.new("one attribute", "text_field", [:name],
-      ["test"], "Element with one attribute")
-    @repository.find("one attribute").should == one
+      ["test"], "Element with one attribute", @repository)
+    @repository.get("one attribute").should == one
   end
 
   it "element with many attribute was readed" do
     many = ObjectRepository::RepositoryElement.new("many attributes", "select_list", [:text, :index],
-      ["test text", 1], "Element with many attributes")
-    @repository.find("many attributes").should == many
+      ["test text", 1], "Element with many attributes", @repository)
+    @repository.get("many attributes").should == many
   end
 
   it "child element was readed" do
     child = ObjectRepository::RepositoryElement.new("with parent", "div", [:index, :parent],
-      [3, "parent element"], "Element with parent")
-    @repository.find("with parent").should == child
+      [3, "parent element"], "Element with parent", @repository)
+    @repository.get("with parent").should == child
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'browser_stub'
+
+class MyCustomElement < ObjectRepository::CustomElement
+end

data/spec/test.xml

@@ -27,8 +27,8 @@
     </object>
     <object type="MyCustomElement" id="custom element">
         <how>
-            <attr1>value of attr1</attr1>
-            <attr2>value of attr2</attr2>
+            <attr1>one attribute</attr1>
+            <attr2>many attributes</attr2>
         </how>
         <description>Custom Element</description>
     </object>

data/spec/watir_builder_spec.rb

@@ -1,34 +1,35 @@
 require 'lib/watir-or.rb'
 require 'spec/browser_stub'
+require 'spec/spec_helper'
 
-describe "WatirConverter" do
+describe "WatirObjectBuilder" do
   before(:all) do
     @browser_stub = BrowserStub.new
     @repository = ObjectRepository::Repository.new("spec/test.xls", @browser_stub)
   end
 
   it "build watir object properly" do
-    element = @repository.elements.find {|el| el.id == "many attributes"}
-    built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
+    element = @repository.get('many attributes')
+    built = ObjectRepository::WatirObjectBuilder.build_element(element, @repository)
     built.should == 'select_list(:index=>1, :text=>"test text")'
   end
 
   it "build element with regexp" do
-    element = @repository.elements.find {|el| el.id == "with regexp what"}
-    built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
+    element = @repository.get('with regexp what')
+    built = ObjectRepository::WatirObjectBuilder.build_element(element, @repository)
     built.should == 'text_field(:text,/regexp/)'
   end
 
   context "hierarchy" do
     it "watir object which has one parent" do
-      element = @repository.elements.find {|el| el.id == "with parent"}
-      built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
+      element = @repository.get('with parent')
+      built = ObjectRepository::WatirObjectBuilder.build_element(element, @repository)
       built.should == 'div(:index,1).div(:index,3)'
     end
 
     it "2 level" do
-      element = @repository.elements.find {|el| el.id == "2 level hierarchy"}
-      built = ObjectRepository::ElementConverter::Watir.build_element(element, @repository)
+      element = @repository.get('2 level hierarchy')
+      built = ObjectRepository::WatirObjectBuilder.build_element(element, @repository)
       built.should == 'div(:index,1).div(:index,3).div(:index,5)'
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ivan Kabluchkov
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +04:00
+date: 2011-06-16 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spreadsheet
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,21 +59,23 @@ extra_rdoc_files:
 files: 
 - README
 - Rakefile
-- lib/watir-or.rb
-- lib/watir-or/repository.rb
-- lib/watir-or/readers/xml.rb
-- lib/watir-or/readers/xls.rb
-- lib/watir-or/element.rb
 - lib/watir-or/converters/element_converter.rb
-- spec/watir_builder_spec.rb
+- lib/watir-or/element.rb
+- lib/watir-or/readers/xls.rb
+- lib/watir-or/readers/xml.rb
+- lib/watir-or/repository.rb
+- lib/watir-or.rb
 - spec/browser_stub.rb
-- spec/read_xls_spec.rb
-- spec/test.xml
-- spec/test.xls
 - spec/custom_elements_spec.rb
-- spec/spec.opts
 - spec/find_elements_spec.rb
+- spec/read_xls_spec.rb
 - spec/read_xml_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/test.xls
+- spec/test.xml
+- spec/test_duplicating_id.xls
+- spec/watir_builder_spec.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -82,6 +86,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -89,6 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -98,13 +104,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Object Repository for Watir
 test_files: 
-- spec/watir_builder_spec.rb
-- spec/read_xls_spec.rb
 - spec/custom_elements_spec.rb
 - spec/find_elements_spec.rb
+- spec/read_xls_spec.rb
 - spec/read_xml_spec.rb
+- spec/watir_builder_spec.rb