rspec-html 0.2.10 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4bc7abc0e55d59ef4b3b1175dbca0022b5cdd0e2707f2d356ba46d5810feb2f
-  data.tar.gz: 8a6a33977d7218bdba104a768fb7c601c88ad9aa0f6aaf157c8534e239813ea5
+  metadata.gz: 5b32fbdddde32e9e09c268a609b9491a616442c4817c729e530a57085d908027
+  data.tar.gz: d38316dc4ba034dc06d15569ce0865fc8e342db728d4f3fbfc19fb27331a35db
 SHA512:
-  metadata.gz: fe9b21c6c38c786e815f89f02e943263f60c88d772f532de0f9e50e4b3e017ea21bd264b9ecd464102d272f7c53c52ea12e70c279e8b2fbf0f5f9095cabfbde2
-  data.tar.gz: 650e39fd4844ffacab77edadeb5a1229004b22a23bf38fe6e21f4d8c17e91c7f79dd22655184c209072e6ac5a7ed5ebe03e98d8854c83e8764b055ea2876dff1
+  metadata.gz: 2b5d891c6b6088337c89e9d5db30a2055124416d602804390d14e1d6a7774ea726b96ffe958977208f4204efaf1a4845801ee188c9be83d2bf275d487b72a483
+  data.tar.gz: 11ede37a337b267e453b4c105645f831f1996f590f5380f6d282fb705555c90a92e0c2af8ef43472bbcff3bd734df27e9548f6450616296f61e9e11f0827ecaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-html (0.2.9)
+    rspec-html (0.2.12)
       nokogiri (~> 1.10)
       rspec (~> 3.0)
 

data/README.md

@@ -7,7 +7,7 @@ _RSpec::HTML_ provides a simple object interface to HTML responses from [_RSpec
 Add the gem to your `Gemfile`:
 
 ```ruby
-gem 'rspec-html', '~> 0.2.10'
+gem 'rspec-html', '~> 0.2.13'
 ```
 
 And rebuild your bundle:

data/lib/rspec/html/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module HTML
-    VERSION = '0.2.10'
+    VERSION = '0.2.13'
   end
 end

data/lib/rspec_html/element.rb

@@ -8,13 +8,16 @@ module RSpecHTML
     extend Forwardable
 
     def_delegators :@search,
-                   :has_css?, :has_xpath?, :include?, :text, :truncated_text, :size, :length, :css, :xpath, :[]
+                   :has_css?, :has_xpath?, :include?,
+                   :siblings, :text, :truncated_text,
+                   :size, :length, :[],
+                   :css, :xpath
 
     def initialize(element, name, options: {}, siblings: [])
       @name = name
       @element = element
       @options = options
-      @siblings = siblings
+      @siblings = siblings || []
       @search = Search.new(@element, @siblings)
     end
 
@@ -26,7 +29,7 @@ module RSpecHTML
     alias exist? present?
 
     def inspect
-      "<#{self.class}::#{name.to_s.capitalize}>"
+      reconstituted
     end
 
     def to_s

data/lib/rspec_html/matchers/match_text.rb

@@ -10,10 +10,28 @@ module RSpecHTML
 
       def match(actual)
         @rspec_actual = actual&.text
-        return (actual&.text || '').include?(@expected.to_s) unless @expected.is_a?(Regexp)
+        return regexp_match?(actual) || regexp_siblings_match?(actual) if @expected.is_a?(Regexp)
 
+        string_match?(actual) || string_siblings_match?(actual)
+      end
+
+      private
+
+      def regexp_match?(actual)
         @expected.match(actual&.text || '')
       end
+
+      def regexp_siblings_match?(actual)
+        actual.siblings.any? { |sibling| @expected.match(sibling&.text || '') }
+      end
+
+      def string_match?(actual)
+        (actual&.text || '').include?(@expected.to_s)
+      end
+
+      def string_siblings_match?(actual)
+        actual.siblings.any? { |sibling| (sibling&.text || '').include?(@expected.to_s) }
+      end
     end
   end
 end

data/lib/rspec_html/reconstituted_element.rb

@@ -12,7 +12,7 @@ module RSpecHTML
       name = @tag.to_s.downcase
       return '#document' if name == 'document'
       return name if name == 'document'
-      return "<#{name}#{@options} />" if @options.is_a?(String)
+      return "<#{name}#{shorthand_options} />" if @options.is_a?(String)
       return "<#{name}#{formatted_attributes} />" unless @options&.key?(:text)
 
       "<#{name}#{formatted_attributes}>#{@options[:text]}</#{name}>"
@@ -33,5 +33,23 @@ module RSpecHTML
     def formatted_attributes
       mapped_attributes.empty? ? nil : " #{mapped_attributes.join(' ')}"
     end
+
+    def shorthand_options
+      case @options[0]
+      when '.'
+        " #{shorthand_classes}"
+      when '#'
+        options = %( id="#{@options.partition('#').last.partition('.').first}")
+        shorthand_classes.nil? ? options : "#{options} #{shorthand_classes}"
+      else
+        @options
+      end
+    end
+
+    def shorthand_classes
+      return nil unless @options.include?('.')
+
+      %(class="#{@options.partition('.').last.split('.').map(&:strip).reject(&:empty?).join(' ')}")
+    end
   end
 end

data/lib/rspec_html/search.rb

@@ -4,6 +4,8 @@ module RSpecHTML
   # Provides element/attribute/text searching for HTML entities
   # rubocop:disable Metrics/ClassLength
   class Search
+    attr_reader :siblings
+
     def initialize(element, siblings)
       @element = element
       @siblings = siblings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.13
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri