tree_filter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4aed6475c535ad77186d563ce4eb1aae077440
-  data.tar.gz: b6aaf6e676e1c2fd16022e37aea6fa47a713c828
+  metadata.gz: 09010d265cf27cdf7d25e64aa810b3dc49e6ae65
+  data.tar.gz: 35ef59923c919d9ec6cbaea1d508cce9fffedd7a
 SHA512:
-  metadata.gz: 155685535bc93a517363950614df705167ea5209f099fdca991fc6528788ff281bb1719ea5d64f14dcf1f1a19e3a27d109e7c23af1d7514350dfb0930a8a7233
-  data.tar.gz: d79a3622fb629cdccdfb1a677accd723002b43fed72a26d460d927ce28b0a5220b480eb2d0d5163ae54b081708d891d3573ac00e390df14e56e0d6d3da4d9b88
+  metadata.gz: f4a10c49c5a6606ed4577fbdc498a7dd429253b0a3d1740bae0879be2842bed79ff1cf80f4c720a1b3d86a19a26bc597cd55e9941965282282760b4c837a5959
+  data.tar.gz: 11e5bba35645c9ed5854fbf1c3df24eb55eeda04f462da58d3b1cd9f0b03752ba5aa0f2f824cea258bdf6dde0fb2a33adce66f5467167a7532e746cd437d04a4

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Tree Filter History
 
+## 1.0.1 - 25 March 2015
+
+* Correctly expand Leaf nodes inside arrays and hashes.
+
 ## 1.0.0 - 18 March 2015
 
 * Initial release!

data/lib/tree_filter.rb

@@ -75,10 +75,16 @@ class TreeFilter
   class NullSlice
     def filter(x)
       case x
-      when Leaf
-        filter(x.left)
+      when Hash
+        x.each_with_object({}) do |(k, v), h|
+          h[k] = filter(v)
+        end
+      when Array
+        x.map {|y| filter(y) }
       when Defer
         filter(x.call)
+      when Leaf
+        filter(x.left)
       else
         x
       end
@@ -86,10 +92,6 @@ class TreeFilter
   end
 
   Slice = Struct.new(:attrs) do
-    def inspect
-      "<Slice #{@attrs.inspect}>"
-    end
-
     def initialize(attrs = {})
       super
       @attrs = attrs
@@ -115,16 +117,7 @@ class TreeFilter
         slices.each_with_object({}) do |(attr, slice), ret|
           slice ||= NullSlice.new
 
-          val = value[attr]
-
-          filtered = case val
-          when Array
-            val.map {|x| slice.filter(x) }
-          else
-            slice.filter(val)
-          end
-
-          ret[attr] = filtered
+          ret[attr] = slice.filter(value[attr])
         end
       when Array
         value.map {|x| filter(x) }

data/spec/tree_filter_spec.rb

@@ -1,5 +1,11 @@
 require 'json'
 
+require 'simplecov'
+SimpleCov.minimum_coverage 100
+SimpleCov.start do
+  add_filter "/vendor/bundle/"
+end
+
 require 'tree_filter'
 
 describe 'Tree filter spec:' do
@@ -7,6 +13,12 @@ describe 'Tree filter spec:' do
     TreeFilter.new(input).filter(data)
   end
 
+  describe 'inspecting' do
+    it 'is readable' do
+      expect(TreeFilter.new("*").inspect).to include("<TreeFilter")
+    end
+  end
+
   describe 'filtering a hash' do
     it 'only includes specified attributes' do
       data = {'a' => 1, 'b' => 2, 'c' => 3}
@@ -42,7 +54,7 @@ describe 'Tree filter spec:' do
       expect(filter(data, 'a')).to eq('a' => 1)
     end
 
-    it 'filters defered evaluations' do
+    it 'filters deferred evaluations' do
       data = {
         'a' => TreeFilter::Defer.new(->{{'b' => 1, 'c' => 2}}),
       }
@@ -50,6 +62,42 @@ describe 'Tree filter spec:' do
       expect(filter(data, 'a[b]')).to eq('a' => {'b' => 1})
     end
 
+    it 'expands leafs in defers' do
+      data = {
+        'a' => TreeFilter::Defer.new(->{
+          TreeFilter::Leaf.new('/a', {'b' => 1, 'c' => 2})
+        }),
+      }
+
+      expect(filter(data, 'a[b]')).to eq('a' => {'b' => 1})
+      expect(filter(data, 'a')).to eq('a' => '/a')
+      expect(filter(data, '*')).to eq('a' => '/a')
+    end
+
+    it 'expands leafs in deferred arrays' do
+      data = {
+        'a' => TreeFilter::Defer.new(->{[
+          TreeFilter::Leaf.new('/a', {'b' => 1, 'c' => 2})
+        ]}),
+      }
+
+      expect(filter(data, 'a[b]')).to eq('a' => [{'b' => 1}])
+      expect(filter(data, 'a')).to eq('a' => ['/a'])
+      expect(filter(data, '*')).to eq('a' => ['/a'])
+    end
+
+    it 'expands leafs in deferred hashes' do
+      data = {
+        'a' => TreeFilter::Defer.new(->{{
+          'b' => TreeFilter::Leaf.new('/b', {'c' => 2})
+        }}),
+      }
+
+      expect(filter(data, 'a[b[*]]')).to eq('a' => {'b' => {'c' => 2}})
+      expect(filter(data, 'a')).to eq('a' => {'b' => '/b'})
+      expect(filter(data, 'a[*]')).to eq('a' => {'b' => '/b'})
+    end
+
     it 'allows cyclic references with defer' do
       data = {
         'a' => TreeFilter::Leaf.new(1, TreeFilter::Defer.new(->{ data }))
@@ -72,6 +120,28 @@ describe 'Tree filter spec:' do
       expect(filter(data, 'a[id]')).to eq('a' => {'id' => 'a'})
     end
 
+    it 'allows leaf alternation in an array' do
+      data = {'a' => [TreeFilter::Leaf.new('/a', 'id' => 'a', 'name' => 'b')]}
+
+      expect(filter(data, 'a')).to eq('a' => ['/a'])
+      expect(filter(data, 'a[id]')).to eq('a' => [{'id' => 'a'}])
+    end
+
+    it 'allows leaf alternation in a hash' do
+      data = {'a' => {
+        'b' => TreeFilter::Leaf.new('/b', 'id' => 'b', 'name' => 'b')
+      }}
+
+      expect(filter(data, 'a')).to eq('a' => {'b' => '/b'})
+      expect(filter(data, 'a[b]')).to eq('a' => {'b' => '/b'})
+      expect(filter(data, 'a[*]')).to eq('a' => {'b' => '/b'})
+      expect(filter(data, 'a[b[id]]')).to eq('a' => {'b' => {'id' => 'b'}})
+      expect(filter(data, 'a[b[*]]')).to eq('a' => {'b' => {
+        'id' => 'b',
+        'name' => 'b'
+      }})
+    end
+
     it 'allows recursive leaf alternation' do
       data = {'a' => TreeFilter::Leaf.new('',
         'b' => TreeFilter::Leaf.new('/b', 'f')

data/tree_filter.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.name          = "tree_filter"
   gem.require_paths = ["lib"]
   gem.license       = "Apache 2.0"
-  gem.version       = '1.0.0'
+  gem.version       = '1.0.1'
   gem.has_rdoc      = false
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tree_filter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Xavier Shay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies: []
 description: Filter arbitrary data trees with a concise query language.
 email: