locator 0.0.7 → 0.0.8

data/lib/core_ext/string/underscore.rb

@@ -1,5 +1,6 @@
 class String
   def underscore
-    self[0, 1].downcase + self[1..-1].gsub(/[A-Z]/) { |c| "_#{c.downcase}" }
+    str = to_s
+    str[0, 1].downcase + str[1..-1].gsub(/[A-Z]/) { |c| "_#{c.downcase}" }
   end
 end unless ''.respond_to?(:underscore)

data/lib/locator.rb

@@ -1,13 +1,14 @@
 require 'core_ext/string/underscore'
 
 module Locator
-  autoload :Boolean,  'locator/boolean'
-  autoload :Dom,      'locator/dom'
-  autoload :Decoding, 'locator/decoding'
-  autoload :Element,  'locator/element'
-  autoload :Matcher,  'locator/matcher'
-  autoload :Result,   'locator/result'
-  autoload :Xpath,    'locator/xpath'
+  autoload :Assertions, 'locator/assertions'
+  autoload :Boolean,    'locator/boolean'
+  autoload :Dom,        'locator/dom'
+  autoload :Decoding,   'locator/decoding'
+  autoload :Element,    'locator/element'
+  autoload :Matcher,    'locator/matcher'
+  autoload :Result,     'locator/result'
+  autoload :Xpath,      'locator/xpath'
 
   extend Decoding
 
@@ -31,7 +32,7 @@ module Locator
 
       def locators
         @locators ||= Hash[*Element.constants.map do |name|
-          [name.to_s.underscore.to_sym, Element.const_get(name)]
+          [name.to_s.dup.underscore.to_sym, Element.const_get(name)]
         end.flatten]
       end
   end

data/lib/locator/assertions.rb

@@ -0,0 +1,74 @@
+require 'test/unit' # TODO make this optional, e.g. when Rspec or minitest are present
+
+module Locator
+  module Assertions
+    include Test::Unit::Assertions, Matcher
+    
+    # Asserts that the response body contains the given string or regexp
+    def assert_contains(*args)
+      matcher = contain(*args)
+      assert matcher.matches?(send(__response_accessor).body), matcher.failure_message
+    end
+
+    # Asserts that the response body does not contain the given string or regexp
+    def assert_does_not_contain(*args)
+      matcher = contain(*args)
+      assert !matcher.matches?(send(__response_accessor).body), matcher.negative_failure_message
+    end
+
+    def assert_has_tag(html, *args, &block)
+      matcher = have_tag(*args, &block)
+      assert matcher.matches?(send(__response_accessor).body), matcher.failure_message
+    end
+
+    def assert_no_tag(html, *args, &block)
+      matcher = have_tag(*args, &block)
+      assert !matcher.matches?(send(__response_accessor).body), matcher.negative_failure_message
+    end
+    alias :assert_does_not_have_tag :assert_no_tag
+
+    # Asserts that the response body matches the given XPath
+    def assert_has_xpath(html, *args, &block)
+      matcher = have_xpath(*args, &block)
+      assert matcher.matches?(send(__response_accessor).body), matcher.failure_message
+    end
+
+    # Asserts that the response body does not match the given XPath
+    def assert_no_xpath(html, *args, &block)
+      matcher = have_xpath(*args, &block)
+      assert !matcher.matches?(send(__response_accessor).body), matcher.negative_failure_message
+    end
+    alias :assert_does_not_have_xpath :assert_no_tag
+
+    # Asserts that the response body matches the given CSS selector
+    def assert_has_css(html, *args, &block)
+      matcher = have_css(*args, &block)
+      assert matcher.matches?(send(__response_accessor).body), matcher.failure_message
+    end
+
+    # Asserts that the response body does not match the given CSS selector
+    def assert_no_css(html, *args, &block)
+      matcher = have_css(*args, &block)
+      assert !matcher.matches?(send(__response_accessor).body), matcher.negative_failure_message
+    end
+    alias :assert_does_not_have_css :assert_no_tag
+
+    def assert_css_class(css_classes, css_class)
+      matcher = HaveCssClass.new(css_class)
+      assert matcher.matches?(css_classes.body), matcher.failure_message
+    end
+
+    def assert_no_css_class(css_classes, css_class)
+      matcher = HaveCssClass.new(css_class)
+      assert matcher.matches?(css_classes.body), matcher.negative_failure_message
+    end
+    alias :assert_does_not_include_css_class :assert_no_tag
+    
+    protected
+    
+      def __response_accessor
+        # TODO should probably be a module accessor
+        @__response_accessor ||= respond_to?(:last_response) ? :last_response : :response
+      end
+  end
+end

data/lib/locator/matcher.rb

@@ -23,62 +23,5 @@ module Locator
     def have_css_class(css_class)
       HaveCssClass.new(css_class)
     end
-
-    # Asserts that the response body contains the given string or regexp
-    def assert_contains(*args)
-      matcher = contain(*args)
-      assert matcher.matches?(response.body), matcher.failure_message
-    end
-
-    # Asserts that the response body does not contain the given string or regexp
-    def assert_does_not_contain(*args)
-      matcher = contain(*args)
-      assert !matcher.matches?(response.body), matcher.negative_failure_message
-    end
-
-    def assert_has_tag(html, *args, &block)
-      matcher = have_tag(*args, &block)
-      assert matcher.matches?(response.body), matcher.failure_message
-    end
-
-    def assert_no_tag(html, *args, &block)
-      matcher = have_tag(*args, &block)
-      assert !matcher.matches?(response.body), matcher.negative_failure_message
-    end
-
-    # Asserts that the response body matches the given XPath
-    def assert_has_xpath(html, *args, &block)
-      matcher = have_xpath(*args, &block)
-      assert matcher.matches?(response.body), matcher.failure_message
-    end
-
-    # Asserts that the response body does not match the given XPath
-    def assert_no_xpath(html, *args, &block)
-      matcher = have_xpath(*args, &block)
-      assert !matcher.matches?(response.body), matcher.negative_failure_message
-    end
-
-    # Asserts that the response body matches the given CSS selector
-    def assert_has_css(html, *args, &block)
-      matcher = have_css(*args, &block)
-      assert matcher.matches?(response.body), matcher.failure_message
-    end
-
-    # Asserts that the response body does not match the given CSS selector
-    def assert_no_css(html, *args, &block)
-      matcher = have_css(*args, &block)
-      assert !matcher.matches?(response.body), matcher.negative_failure_message
-    end
-
-    def assert_css_class(css_classes, css_class)
-      matcher = HaveCssClass.new(css_class)
-      assert matcher.matches?(css_classes.body), matcher.failure_message
-    end
-
-    def assert_no_css_class(css_classes, css_class)
-      matcher = HaveCssClass.new(css_class)
-      assert matcher.matches?(css_classes.body), matcher.negative_failure_message
-    end
-
   end
 end

data/lib/locator/version.rb

@@ -1,3 +1,3 @@
 module Locator
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: locator
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +02:00
+date: 2010-12-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: htmlentities
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 4
         - 2
@@ -31,6 +34,22 @@ dependencies:
         version: 4.2.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
+  type: :runtime
+  version_requirements: *id002
 description: Generic html element locators for integration testing.
 email: svenfuchs@artweb-design.de
 executables: []
@@ -43,6 +62,7 @@ files:
 - lib/core_ext/hash/except.rb
 - lib/core_ext/hash/slice.rb
 - lib/core_ext/string/underscore.rb
+- lib/locator/assertions.rb
 - lib/locator/boolean.rb
 - lib/locator/decoding.rb
 - lib/locator/dom/htmlunit/element.rb
@@ -91,16 +111,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -109,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Generic html element locators for integration testing