elementor 0.0.3 → 0.0.4

data/lib/elementor/element_set.rb

@@ -1,11 +1,41 @@
 module Elementor
   class ElementSet < Array
-    def with_text(str)
-      select { |item| item.text.include?(str) }
+    attr_accessor :result, :selector
+    
+    def with_text(matcher)
+      replace(select { |item|
+        case matcher
+        when Regexp then item.text =~ matcher
+        when String then item.text.include?(matcher)
+        end
+      }) ; self
+    end
+    
+    def with_attrs(options={})
+      replace(select { |item|
+        options.all? { |key, value|
+          case value
+          when Regexp then item[key.to_s] =~ value
+          when String then item[key.to_s] == value
+          end
+        }
+      }) ; self
     end
     
     def inspect
       map(&:text).inspect
     end
+    
+    def method_missing(sym, *args, &block)
+      result.try(sym, doc, *args) || super
+    end
+    
+    def respond_to?(sym)
+      result.respond_to?(sym) || super
+    end
+    
+    def doc
+      result.doc.search(selector)
+    end
   end
 end

data/lib/elementor/result.rb

@@ -33,13 +33,20 @@ module Elementor
   
     def define_elements!
       element_names.each do |name, selector|
-        meta_def(name) do |*mutators|
-          set = ElementSet.new(doc.search(selector).to_ary)
-          mutators.empty? ? set : mutators.inject(set) { |result, fn| fn[result] }
+        meta_def(name) do |*filters|
+          set = ElementSet.new scope(filters).search(selector)
+          set.result = self
+          set.selector = selector
+          filters.empty? ? set : filters.inject(set) { |result, fn| fn[result] }
         end
       end
     end
     
+    def scope(filters)
+      scope = filters.first.is_a?(Proc) ? nil : filters.shift
+      scope || doc
+    end
+    
     def element_names
       @element_names ||= { }
     end

data/lib/elementor/spec.rb

@@ -2,10 +2,16 @@ module Spec
   module Matchers
     class Have
       def with_text(*args)
-        @args = []
+        @args ||= []
         @args << proc { |set| set.with_text(*args) }
         self
       end
+      
+      def with_attrs(options={})
+        @args ||= []
+        @args << proc { |set| set.with_attrs(options) }
+        self
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: elementor
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pat Nakajima