ytools 0.1.1 → 0.1.2

data/lib/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/ytools/path/selectors.rb

@@ -85,23 +85,33 @@ module YTools::Path
       @match = match
     end
 
-    def select(yaml)
-      inner_select(yaml, [])
+    def select(element)
+      results = []
+      element_select(element, results)
+      if results.length == 1
+        results[0]
+      else
+        results
+      end
     end
 
     private
-    def inner_select(yaml, results)
+    def element_select(element, results)
+      if element.is_a?(YTools::YamlObject)
+        hash_select(element, results)
+      elsif element.is_a?(Array)
+        element.each do |e|
+          element_select(e, results)
+        end
+      end
+    end
+
+    def hash_select(yaml, results)
       yaml.yhash.each do |key, value|
         if key == match
           key_select(value, results)
         end
-        value_select(value, results)
-      end
-      
-      if results.length == 1
-        results[0]
-      else
-        results
+        element_select(value, results)
       end
     end
 
@@ -116,17 +126,5 @@ module YTools::Path
         results << value
       end
     end
-
-    def value_select(value, results)
-      if value.is_a?(YTools::YamlObject)
-        inner_select(value, results)
-      elsif value.is_a?(Array)
-        value.each do |v|
-          if v.is_a?(YTools::YamlObject)
-            inner_select(v, results)
-          end
-        end
-      end
-    end
   end
 end

data/spec/path/executor_spec.rb

@@ -41,5 +41,9 @@ module YTools::Path
     it "should be able to pull out the keys for a hash" do
       process('/a', '5.yml').should eql("b\nc\nd")
     end
+
+    it "should be able to pull out a descendant selector with inner hashes" do
+      process('/a//b', '6.yml').should eql("c\nd\ne")
+    end
   end
 end

data/spec/path/selectors_spec.rb

@@ -119,5 +119,16 @@ module YTools::Path
       found[0].should eql(2)
       found[1].should eql('b')
     end
+
+    it "should be able to pull out a list of subselectors" do
+      sel = ChildSelector.new('path')
+      sel.chain(DescendantSelector.new('subgroup'))
+      o = yo({'path' => [{'subgroup' => 'a', 'c' => 'd'}, {'subgroup' => 'b', 'c' => 'd'}]})
+
+      found = sel.select(o)
+      found.length.should eql(2)
+      found[0].should eql('a')
+      found[1].should eql('b')
+    end
   end
 end

data/spec/path/yamls/6.yml

@@ -0,0 +1,7 @@
+a:
+  - b: c
+    quick: brown
+  - b: d
+    quick: fox
+  - b: e
+    quick: jumped

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ytools
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -75,6 +75,7 @@ files:
 - spec/path/yamls/3.yml
 - spec/path/yamls/4.yml
 - spec/path/yamls/5.yml
+- spec/path/yamls/6.yml
 - spec/yaml_object_spec.rb
 has_rdoc: true
 homepage: http://github.com/gabemc/ytools