domino 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef317e23fa5c56cda925292542b5c21a9427da0f
-  data.tar.gz: 8569c3441566aa337bbf547f21e51f6b426c9fd1
+  metadata.gz: 2c529cedb0bb1da66235d1f520837cb40163bec1
+  data.tar.gz: 5835da7437f706398b60e3c19824dfda2af9d79a
 SHA512:
-  metadata.gz: 221ce20550753d6e51b23785aa9bda36ff4ccb7cc6a6f800bdec24a021e0f820bcdc0cfeb4ab632722306c5fc75806d68e3cc115d0891b14ed0be56db9b9059c
-  data.tar.gz: 63ab29831e4b94ab7c8cf94356de7f4ff2ab58dde5e15fe2406a08eb853ef089c0cd7a2833609c8ae9fd1ca18dcf3b63310f4acfc761c15f21be1141daa2a6f0
+  metadata.gz: 0ab5d6e5b9f270303d5d509e9b24d0e206bb0f33014d99ac56c5e676a37e165b2970e296ea83653f7938403517833607ac1402911cfb727d8e63b59a2904220b
+  data.tar.gz: 7558998f351960813f27050609f354dcdb96913382a98e238973a1329994fcd03ac965508cf3f4ac4fe1ae1b3f274ecb7b42d3defe82900d32da7945b5d54df2

data/README.md

@@ -48,6 +48,9 @@ Now in your integration test you can use some of Domino's methods:
 assert_equal 4, Dom::Post.count
 refute_nil Dom::Post.find_by_title('First Post')
 
+# Find by attribute yields the node when using a block.
+assert_equal Dom::Post.find_by_title { |node| node.text == "First Post" && node.tag_name == 'p' }
+
 # Multiple attributes, returns first match if any
 refute_nil Dom::Post.find_by(title: 'First Post', author: 'Jane Doe')
 

data/domino.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name = "domino"
-  gem.version = "0.10.0"
+  gem.version = "0.11.0"
   gem.platform = Gem::Platform::RUBY
   gem.authors = ["Nick Gauthier"]
   gem.email = ["ngauthier@gmail.com"]

data/lib/domino.rb

@@ -146,8 +146,8 @@ class Domino
         end
       end
 
-      define_singleton_method :"find_by_#{attribute}" do |value|
-        find_by_attribute(attribute, value)
+      define_singleton_method :"find_by_#{attribute}" do |value = nil, &predicate|
+        find_by_attribute(attribute, value, &predicate)
       end
     end
 
@@ -160,9 +160,9 @@ class Domino
     end
 
     # Internal method for finding nodes by a selector
-    def find_by_attribute(attribute, value)
+    def find_by_attribute(attribute, value = nil, &predicate)
       detect do |domino|
-        attribute_definitions[attribute].match_value?(domino.node, value)
+        attribute_definitions[attribute].match_value?(domino.node, value, &predicate)
       end
     end
 

data/lib/domino/attribute.rb

@@ -9,11 +9,14 @@ class Domino::Attribute
 
   def value(node)
     val = value_before_typecast(node)
+    convert(val)
+  end
 
-    if val && callback.is_a?(Proc)
-      callback.call(val)
+  def convert(value)
+    if value && callback.is_a?(Proc)
+      callback.call(value)
     else
-      val
+      value
     end
   end
 
@@ -30,8 +33,14 @@ class Domino::Attribute
     nil
   end
 
-  def match_value?(node, value)
-    value === value(node)
+  def match_value?(node, value = nil, &predicate)
+    if predicate.is_a?(Proc)
+      predicate.call(element(node))
+    else
+      node_value = value(node)
+      test_value = convert(value) rescue value
+      test_value === node_value
+    end
   end
 
   def element(node)

data/test/domino_test.rb

@@ -205,4 +205,19 @@ class DominoTest < Minitest::Test
     person = Dom::Person.find_by!(uuid: 'e94bb2d3-71d2-4efb-abd4-ebc0cb58d19f')
     assert_equal 'h2', person.name(&:tag_name)
   end
+
+  def test_find_by_with_unconverted_value_for_callback_computed_attribute
+    person = Dom::Person.find_by!(uuid: '05bf319e-8d6a-43c2-be37-2dad8ddbe5af')
+    assert_equal person.node, Dom::Person.find_by_age('52').node
+  end
+
+  def test_find_by_with_converted_value_for_callback_computed_attribute
+    person = Dom::Person.find_by!(uuid: '05bf319e-8d6a-43c2-be37-2dad8ddbe5af')
+    assert_equal person.node, Dom::Person.find_by_age(52).node
+  end
+
+  def test_find_by_with_converted_value_for_callback_computed_attribute_with_regex
+    person = Dom::Person.find_by!(uuid: '05bf319e-8d6a-43c2-be37-2dad8ddbe5af')
+    assert_equal person.node, Dom::Person.find_by_age { |age_node| age_node.text =~ /5[29]/ && age_node.tag_name == 'p' }.node
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domino
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Nick Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara