xpath 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae41f677ac864edf9c7689365012dc5f73731f61
-  data.tar.gz: 63f10b70109aa842ac464b8491071a286b583f4c
+SHA256:
+  metadata.gz: 12f29349abdcae71838e3a6c0f9f6d7eac41b378e2fbdc3bcd6996950b76da7e
+  data.tar.gz: 819e1a3641e979a632bf9358609da87155920ca1fc07e89b089b4a30e3681d39
 SHA512:
-  metadata.gz: 7683342805b10e97fcb6593148c0beedb6ad43b7087915697b4a87b4127d88d1669e9e3d6a630a019a500c2203eff4a8b6c702e8bedb313ee41ca1ad726be446
-  data.tar.gz: 4d9146f6cd818e364b94b95f219d40a70571c33a01faa58af9feccb7d3f40d7f0e1b0d9093ef1aec4aae2429859001fa15e341a032a4248575804886e0fd8344
+  metadata.gz: 5c6ee15be0134334b4cb7016b252da4985a8f356cba571b84078af03745c612b13640b1cc77617a5f80d90ab643b2401cfe08b5d96fe02affd010d627ede88a4
+  data.tar.gz: 223c56e87b09e1cf7d89e44d8fe4ac1639ce91280392bbbe25fc8b78d6cbf19a613f1d87a9d6f4ace14ad4973c80fdd7a20cbd292f188ffa571e3b72a2145197

data/lib/xpath/dsl.rb

@@ -41,7 +41,11 @@ module XPath
     end
 
     def where(expression)
-      Expression.new(:where, current, expression)
+      if expression
+        Expression.new(:where, current, expression)
+      else
+        current
+      end
     end
     alias_method :[], :where
 
@@ -134,6 +138,10 @@ module XPath
 
     alias_method :self_axis, :self
 
+    def ends_with(suffix)
+      function(:substring, current, function(:'string-length', current).minus(function(:'string-length', suffix)).plus(1)) == suffix
+    end
+
     def contains_word(word)
       function(:concat, " ", current.normalize_space, " ").contains(" #{word} ")
     end

data/lib/xpath/version.rb

@@ -1,3 +1,3 @@
 module XPath
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/spec/fixtures/simple.html

@@ -45,5 +45,9 @@
     <span id="substring">Hello there</span>
 
     <span id="string-length">Hello there</span>
+
+    <div id="oof" title="viDoof" data="id">
+      <p id="viDoof">Blah</p>
+    </div>
   </body>
 </html>

data/spec/xpath_spec.rb

@@ -192,6 +192,25 @@ describe XPath do
     end
   end
 
+  describe '#ends_with' do
+    it "should find nodes that end with the given string" do
+      @results = xpath do |x|
+        x.descendant(:*).where(x.attr(:id).ends_with('oof'))
+      end
+      @results.size.should eq 2
+      @results[0][:id].should eq "oof"
+      @results[1][:id].should eq "viDoof"
+    end
+
+    it "should find nodes that contain the given expression" do
+      @results = xpath do |x|
+        expression = x.anywhere(:div).where(x.attr(:title) == 'viDoof').attr(:id)
+        x.descendant(:div).where(x.attr(:title).ends_with(expression))
+      end
+      @results[0][:id].should eq "oof"
+    end
+  end
+
   describe '#text' do
     it "should select a node's text" do
       @results = xpath { |x| x.descendant(:p).where(x.text == 'Bax') }
@@ -247,6 +266,10 @@ describe XPath do
     it "should be aliased as []" do
       xpath { |x| x.descendant(:div)[:"@id = 'foo'"] }.first[:title].should eq "fooDiv"
     end
+
+    it "should be a no-op when nil condition is passed" do
+      XPath.descendant(:div).where(nil).to_s.should eq ".//div"
+    end
   end
 
   describe '#inverse' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xpath
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate XPath expressions from Ruby