wildcard_finders 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bde38ec3c83bf76883f655f17c284530da79c1f
-  data.tar.gz: 52e3266429b605a07b270f6361c1ad6a80185fac
+  metadata.gz: a86602a53c25883d36e6a431727278cd9130aa96
+  data.tar.gz: 21bd97dd507e77bf35037e7bb6c5bf8abb746a45
 SHA512:
-  metadata.gz: 2a76774c03d117502799055fc240800da20ec7e0842e074e669959cc993611ad273e2eacd2f7e233c49ac7b652a9f682b9599387dfdc7adc38094b238ba7b7f2
-  data.tar.gz: 8e0950902e8f96a6f1f7a9bb32284ba1ac1d9098283174f0e75d0b32f1b681c4ac98f2bac98fa7a01d9fc169e422d6dfa614061d1eaabc2a671a3fbd9d9fcac2
+  metadata.gz: 90eeb41f97178af3d68cfbbd3d2ff7e9e6e0eb8c6a74586bd5e698d1d10032537f7b90947ef930917909f2b4a9e8920f78d799640b96e0ba70b5f8eae4b7cafb
+  data.tar.gz: 0206955180e98f11289be3632ccc22edcc4d4ab1c53e8a9196c8bdb22888e8d408a1f80dcf77a3c8c4838de94162b8e51e28e9c3d1d0238a5aa16fe7d101d4cb

data/.travis.yml

@@ -3,3 +3,11 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+gemfile:
+  - Gemfile
+  - Gemfile_for_capybara_1.x
+  - Gemfile_for_capybara_2.0.x
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      gemfile: Gemfile

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.3
+* ADD
+ * use xpath when matcher can be converted
+
 # 0.0.2
 * CHANGE
  * find_tag_like can also accept proc as matcher or block

data/Gemfile_for_capybara_1.x

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem "capybara", "~> 1.1"
+gem "rspec-parameterized", github: "tomykaira/rspec-parameterized"

data/Gemfile_for_capybara_2.0.x

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem "capybara", "~> 2.0.0"
+gem "rspec-parameterized", github: "tomykaira/rspec-parameterized"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/wildcard_finders/finders.rb

@@ -1,4 +1,5 @@
 require "capybara/node/finders"
+require "xpath"
 
 module WildcardFinders
   module Finders
@@ -6,20 +7,37 @@ module WildcardFinders
 
     # not to add METHODS
     def find_tag_like(tag, matcher = nil, opts = {}, &block)
-      tags = all(tag).select do |e|
-        if matcher.is_a?(Hash)
-          hash = matcher.keys.each_with_object({}) {|key, h| h[key] = e[key] }
-          WildcardMatchers.wildcard_match?(hash, matcher)
-        elsif block_given? or matcher.is_a?(Proc)
-          WildcardMatchers.wildcard_match?(e, block || matcher)
-        elsif matcher # I don't know this behavior
-          WildcardMatchers.wildcard_match?(e, matcher)
-        else
-          raise "no matcher or block is not given"
+      if matcher.is_a?(Hash) && matcher.values.all? {|v| v.is_a?(String) }
+        find_exactly(tag, matcher)
+      else
+        all(tag).select do |e|
+          if matcher.is_a?(Hash)
+            hash = matcher.keys.each_with_object({}) {|key, h| h[key] = e[key] }
+            WildcardMatchers.wildcard_match?(hash, matcher)
+          else
+            WildcardMatchers.wildcard_match?(e, block || matcher)
+          end
+        end.first # not compatible with capybara 2.x
+      end
+    end
+
+    def find_exactly(tag, matcher)
+      xpath = XPath.generate do |x|
+        attr_matcher = matcher.map do |key, value|
+          case key
+          when :text
+            x.text.equals(value)
+          when :class
+            x.attr(:class).contains(value)
+          else
+            x.attr(key).equals(value)
+          end
         end
+
+        x.descendant(tag.to_sym)[attr_matcher.inject(&:&)]
       end
 
-      tags.first # not compatible with capybara 2.x
+      find(:xpath, xpath)
     end
 
     def self.method_added(name)

data/lib/wildcard_finders.rb

@@ -17,7 +17,8 @@ module Capybara
     [ ::WildcardFinders::Finders::METHODS, ::WildcardFinders::Matchers::METHODS ].flatten.each do |method|
       define_method(method) do |*args, &block|
         @touched = true
-        current_node.__send__(method, *args, &block)
+        scope = self.respond_to?(:current_scope) ? current_scope : current_node # difference between 2.0 and 2.1
+        scope.__send__(method, *args, &block)
       end
     end
   end

data/spec/test_app.rb

@@ -11,6 +11,22 @@ a id="onclick_hoge" onclick="hoge"
 _SLIM_
 end
 
+get "/@class" do
+  slim <<_SLIM_
+a id="hoge_fuga" class="hoge fuga"
+a id="fuga_ugu"  class="fuga ugu"
+_SLIM_
+end
+
+get "/text" do
+  slim <<_SLIM_
+a id="text_hoge_href_hoge" href="hoge"
+  | hoge
+a id="text_fuga_href_hoge" href="hoge"
+  | fuga
+_SLIM_
+end
+
 __END__
 
 @@ layout

data/spec/wildcard_finders/finders_spec.rb

@@ -8,6 +8,9 @@ describe WildcardFinders::Finders do
       [ [ :href,    /hoge/, "href_hoge" ],
         [ :href,    /fuga/, "href_fuga" ],
         [ :onclick, /hoge/, "onclick_hoge" ],
+        [ :href,    "hoge", "href_hoge" ],
+        [ :href,    "fuga", "href_fuga" ],
+        [ :onclick, "hoge", "onclick_hoge" ],
       ]
     end
 
@@ -27,5 +30,36 @@ describe WildcardFinders::Finders do
         page.find_anchor_like(->(e) { value === e[attr] })[:id].should == expected_id
       end
     end
+
+    context "specifying class" do
+      where(:klass, :expected_id) do
+        [ [ "hoge", "hoge_fuga" ],
+          [ "ugu",  "fuga_ugu"  ],
+        ]
+      end
+
+      with_them do
+        it "with specifying value finds out whether class has multi values" do
+          visit "/@class"
+          page.find_anchor_like(class: klass)[:id].should == expected_id
+        end
+      end
+    end
+
+    context "specifying text" do
+      where(:text, :href, :expected_id) do
+        [ [ "hoge", "hoge", "text_hoge_href_hoge" ],
+          [ "fuga", "hoge", "text_fuga_href_hoge" ],
+        ]
+      end
+
+      with_them do
+        it "with specifying value also use text()" do
+          visit "/text"
+          page.find_anchor_like(text: text, href: href)[:id].should == expected_id
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wildcard_finders
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -148,6 +148,8 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile_for_capybara_1.x
+- Gemfile_for_capybara_2.0.x
 - LICENSE.txt
 - README.md
 - Rakefile