prickle 0.0.4 → 0.0.5

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@prickle"
+environment_id="ruby-1.9.3-p0@prickle"
 
 #
 # Uncomment following line if you want options to be set only for given project.

data/README.md

@@ -12,7 +12,7 @@ To install prickle execute
 gem install prickle
 ```
 
-and to configure update your *features/support/env.rb* to include the following:
+Configure by updating the *features/support/env.rb* to include the following:
 
 ```ruby
 require 'prickle/capybara'    # require
@@ -65,6 +65,7 @@ element(:input, :name => "blue")
 element(:name => "flower").exists?
 element(:name => "flower").click
 element(:name => "flower").contains_text? "Roses"
+element(:name => "flower").has_text? "Anemone"  # exact match
 ```
 
 ## Alternative syntax
@@ -101,6 +102,12 @@ popup_message_contains? "<text>"
 
 ## Capturing screenshots
 
+Configure the directory where you want the screenshots to be saved
+
+```ruby
+Prickle::Capybara.image_dir = File.dirname(__FILE__) + "/screenshots/"
+```
+
 ```ruby
 capture_screen
 capture_screen "<file>"

data/lib/prickle/capybara/actions.rb

@@ -8,6 +8,13 @@ module Prickle
 
       def contains_text? text
         @text = text
+        @identifier[:"text()".like] = text
+        find_element
+      end
+
+      def has_text? text
+        @text = text
+        @identifier[:"text()"] = text
         find_element
       end
 

data/lib/prickle/capybara/element.rb

@@ -1,4 +1,5 @@
 require 'capybara/dsl'
+require_relative 'xpath'
 require_relative 'actions'
 
 module Prickle
@@ -21,20 +22,10 @@ module Prickle
       end
 
       def identifier
-        @identifier.each_pair.inject([]) do |xpath_str, (key, value)|
-          xpath_str << convert_to_xpath(key, value)
-        end.join " and "
+        @identifier
       end
 
-      def convert_to_xpath key, value
-        if key.to_s.include? "<value>"
-          key.sub "<value>", value
-        else
-          "@#{key}='#{value}'"
-        end
-      end
-
-      def type
+      def type_as_tag
         CONVERTED_TYPES[@type.to_sym] || @type
       end
 
@@ -42,18 +33,16 @@ module Prickle
         handle_exception { find_element_by_xpath }
       end
 
-      def xpath
-        xpath = "//#{type}[#{identifier}"
-        xpath << " and contains(text(), '#{@text}')" if @text
-        xpath << "]"
-      end
-
       def find_element_by_xpath
-        wait_until(Prickle::Capybara.wait_time) do
+        wait_until(Capybara.wait_time) do
           find(:xpath, xpath).visible?
-        end unless Prickle::Capybara.wait_time.nil?
+        end unless Capybara.wait_time.nil?
+
+        find :xpath, xpath
+      end
 
-        find(:xpath, xpath)
+      def xpath
+        XPath::for_element_with type_as_tag, identifier
       end
 
       def handle_exception &block

data/lib/prickle/capybara/xpath/expression.rb

@@ -0,0 +1,61 @@
+module Prickle
+  module Capybara
+    module XPath
+
+      class Expression
+        CONTAINS = ".like"
+        TEXT_IDENTIFIER = "text()"
+        SEPARATOR = " and "
+
+        def initialize identifier, value
+          @identifier = identifier
+          @value = value
+        end
+
+        def to_s
+          find_exact_match? ? MatchesValue.new(@identifier, @value).to_s : ContainsValue.new(@identifier, @value).to_s
+        end
+
+        private
+
+        def find_exact_match?
+          !identifier.include? CONTAINS
+        end
+
+        def identifier
+          @identifier.to_s
+        end
+
+        def attribute
+          return identifier if identifier.eql? TEXT_IDENTIFIER
+          "@#{identifier}"
+        end
+      end
+
+
+      class ContainsValue < XPath::Expression
+
+        def to_s
+          "contains(#{attribute}, '#{@value}')"
+        end
+
+        private
+
+        def identifier
+          @identifier.chomp CONTAINS
+        end
+      end
+
+
+      class MatchesValue < XPath::Expression
+
+        def to_s
+          "#{attribute}='#{@value}'"
+        end
+      end
+
+    end
+
+  end
+end
+

data/lib/prickle/capybara/xpath.rb

@@ -0,0 +1,33 @@
+require_relative 'xpath/expression'
+module Prickle
+  module Capybara
+    module XPath
+
+      def self.for_element_with type, identifier
+        XPath::Element.new(type,identifier).to_s
+      end
+
+      private
+
+      class Element
+
+        def initialize type, identifier
+          @type = type
+          @identifier = identifier
+        end
+
+        def to_s
+          "//#{@type}[#{identifier}]"
+        end
+
+        def identifier
+          return @identifier.each_pair.inject([]) do | xpath, (identifier, value) |
+            xpath << XPath::Expression.new(identifier, value).to_s
+          end.join Expression::SEPARATOR
+        end
+      end
+
+    end
+  end
+end
+

data/lib/prickle/capybara.rb

@@ -10,10 +10,6 @@ module Prickle
 
     end
 
-    def capture_screen name=screenshot_name
-      page.driver.browser.save_screenshot Capybara.image_dir + name + ".jpg"
-    end
-
     def click_by_name name
       find_by_name(name).click
     end
@@ -42,6 +38,10 @@ module Prickle
       raise Exceptions::MessageNotContainedInPopup.new(message) unless popup_message.eql? message
     end
 
+    def capture_screen name=screenshot_name
+      page.driver.browser.save_screenshot Capybara.image_dir + name + ".jpg"
+    end
+
     private
 
     TIME_FORMATTER = "%Y%m%d-%H.%M.%s"
@@ -61,7 +61,5 @@ module Prickle
     def screenshot_name
       Time.now.strftime(TIME_FORMATTER)
     end
-
   end
-
 end

data/lib/prickle/core_ext/symbol.rb

@@ -1,6 +1,6 @@
 class Symbol
 
   def like
-    "contains(@#{self.to_s}, '<value>')"
+    "#{self}.like"
   end
 end

data/lib/prickle/version.rb

@@ -1,3 +1,3 @@
 module Prickle
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/element_spec.rb

@@ -11,40 +11,59 @@ describe Prickle::Capybara::Element do
     prickly.element(:name => 'blue').class.to_s.should == "Prickle::Capybara::Element"
   end
 
-  it 'can find an element by a string contained in its identifier' do
-    prickly.element(:name.like => 'purpli').contains_text? "erm"
-  end
+  context "Matchers" do
 
-  it 'can find an element by a contained and an exact match in its identifier' do
-    prickly.element(:name.like => 'purpli', :id => 'one').contains_text? "erm"
-  end
+    it 'can match text in an element' do
+      prickly.element(:name => 'yellow').contains_text? "Hello!"
+    end
 
-  it 'can match text in an element' do
-    prickly.element(:name => 'yellow').contains_text? "Hello!"
-  end
+    it 'can match on link type elements' do
+      prickly.element(:link, :name => 'orangey').contains_text? "Me too!"
+    end
 
-  it 'can match text in specific elements' do
-    prickly.element(:li, :name => 'purple').contains_text? "Im not purple!"
-  end
+    it 'can find and click on element by type and identifier' do
+      prickly.element(:link, :href => 'http://google.com').exists?
+    end
+
+    it 'can find an element by multiple identifiers' do
+      prickly.element(:name => 'orangey', :class => 'pink').contains_text? "Blue hippos"
+    end
+
+    it 'can find an element by a string contained in its identifier' do
+      prickly.element(:name.like => 'purpli').contains_text? "erm"
+    end
+
+    it 'can find an element by a contained and an exact match in its identifier' do
+      prickly.element(:name.like => 'purpli', :id => 'one').contains_text? "erm"
+    end
 
-  it 'can match on link type elements' do
-    prickly.element(:link, :name => 'orangey').contains_text? "Me too!"
   end
 
-  it 'can click specific element types by name' do
-    prickly.element(:paragraph, :name => 'yellow').click
+  context "#click" do
+
+    it 'can click specific element types by name' do
+      prickly.element(:paragraph, :name => 'yellow').click
+    end
   end
 
-  it 'can find an element by type and identifier' do
-    prickly.element(:paragraph, :id => 'coffee').exists?
+  context "#contains_text" do
+
+    it 'can check if text is included in an element' do
+      prickly.element(:li, :name => 'purple').contains_text? "Im not purple!"
+    end
   end
 
-  it 'can find and click on element by type and identifier' do
-    prickly.element(:link, :href => 'http://google.com').click
+  context "#has_text?" do
+
+    it "can match the text in an element" do
+      prickly.element(:name => 'gum').has_text? "bubblegum"
+    end
   end
 
-  it 'can find an element by multiple identifiers' do
-    prickly.element(:name => 'orangey', :class => 'pink').contains_text? "Blue hippos"
+  context "#exists?" do
+
+    it 'can find an element by type and identifier' do
+      prickly.element(:paragraph, :id => 'coffee').exists?
+    end
   end
 end
-

data/spec/stub/index.html

@@ -23,7 +23,8 @@
     <button name="popups" onclick="alert('Hello');">erm</button>
 
     <button name="confirm_box" onclick="if(!confirm('Click yes to continue'))alert('Aborting.');">erm</button>
-    <button name="purplish" id="one"  >erm</button>
+    <button name="purplish" id="one">erms</button>
+    <p name="gum">bubblegum</p>
 
     <script>
       $(document).ready(function() {

metadata

@@ -1,93 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: prickle
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Despo Pentara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-12 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capybara
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70174028443700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70174028443700
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70174028443100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70174028443100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70174028442480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70174028442480
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70174028441920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70174028441920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70174028441480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: reek
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70174028441480
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: &70174028440740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70174028440740
 description: A simple DSL extending Capybara.
 email: despo@extractmethod.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -98,6 +93,8 @@ files:
 - lib/prickle/capybara.rb
 - lib/prickle/capybara/actions.rb
 - lib/prickle/capybara/element.rb
+- lib/prickle/capybara/xpath.rb
+- lib/prickle/capybara/xpath/expression.rb
 - lib/prickle/core_ext/symbol.rb
 - lib/prickle/exceptions.rb
 - lib/prickle/exceptions/messages.rb
@@ -112,33 +109,29 @@ files:
 - spec/stub/app.rb
 - spec/stub/index.html
 - spec/tmp/.keep_me
-has_rdoc: true
 homepage: https://github.com/ExtractMethod/prickle
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple DSL extending Capybara.
 test_files: []
-