fzip 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTg0MWE1NTE4M2IyYmVjN2UxZjQ1NGM4YTdjNTQwZTAxNzkzOWQ5NQ==
+    ZDhiOWFhY2M0MTBiNGZiZjRjZThiYmE4OTg4ZTc3OGZlODkzZjA0ZA==
   data.tar.gz: !binary |-
-    ZTg4YWE1NWIxMDViZDA3YThiZDliYTI3MjY0MTQ2YTU5Nzc2MmI0YQ==
+    MzE5MWUwYjVjNTU0YmFjZmE1MjNkZjdiMDBiZWI2MDc3OWE2MWVjZQ==
 SHA512:
   metadata.gz: !binary |-
-    MmRiYzljMTVhNzhmNDk0MDdlZTZmOTViNTIyZmZjM2FhZTBkZjZmYmUzNTlm
-    ZTA0NWU5ZDYyNDhjNmY0YWNhYjA5MzBhNjc1NzJhZTA0MzgxZTc0NzVhMzRm
-    MDE0NjcyYjI0ZDAyZjVkMWJiZmU1ZThjNWZiNjFmZDU5NjViNDg=
+    ODBiYmZjNTE2NzAzNmQwY2JkMGU0Njk3MTAyYTMxOTY0ZTJkYzQ1MWE2YWEx
+    NjQzZjU1ZTE0Mjg2ZjE2MGY5Yjc0Yjk3YzhjNjEyNWQ2MmRhZGI3NmMxYWU5
+    NDI2ODBmZjUzYjI3NDczZjczYzg1NmQxM2U4OTkzZjJmZjNhMDY=
   data.tar.gz: !binary |-
-    NTQwZDkzMzVmYWYzMzRjYWI1OGIwMzUzODEyN2U4MzFlZmJhNGJiODBmMDg2
-    YmNlNWIyYzM4ZjA5M2VkMzhjODA5MzYxZmM1MWMxZDAwNTZkNjg3ODRkM2Iw
-    MzAyYmVlYjhiNWY3ZTMzYmVjMjI2YjAyMmNhNDQ0ZmM2OWY1ZDg=
+    YjM4NzdhNjFkNThkYWUwNTMxMjVlMDBhMmM3N2NkMTRhN2YxYjM3M2MyMDAy
+    N2M0NTVhMDdkZDdlNjNkZDEwMGJkOTY2MTZhMWJhYzkyYmVlMGRlNjg0OTE3
+    ZTY5YzQxZmQwYWYyZGM5YTc4ZDM2ZjgyZjg3YjM2YzA4MmU1NWY=

data/.gitignore

@@ -1 +1,2 @@
 coverage
+pkg

data/fzip.gemspec

@@ -2,7 +2,7 @@ require File.expand_path('../lib/fzip/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'fzip'
-  gem.version     = '0.1.0'
+  gem.version     = Fzip::VERSION
   gem.authors     = [ 'Arne Brasseur' ]
   gem.email       = [ 'arne@arnebrasseur.net' ]
   gem.description = 'Functional zipper class'

data/lib/fzip/adapter.rb

@@ -1,11 +1,19 @@
 module FZip
   class Adapter
+    # Can the node have children
+    #
+    # Returns true if the node can have even if it currently doesn't.
     def branch?(node)
     end
 
+    # The children of a node
+    #
+    # Return an array, or an object that responds to first, drop and +
     def children(node)
     end
 
+    # Given a node and an array of children, returns a new branch node of the
+    # same type with the supplied children.
     def make_node(node, children)
     end
   end

data/lib/fzip/version.rb

@@ -1,3 +1,3 @@
 module Fzip
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/fzip/zipper.rb

@@ -1,14 +1,22 @@
 module Fzip
   class Zipper
-    attr_reader :adapter, :parent, :path, :node, :lefts, :rights, :at_end
+    attr_reader :adapter
+    attr_reader :parent
+    attr_reader :path
+    attr_reader :node
+    attr_reader :lefts
+    attr_reader :rights
+    attr_reader :at_end
 
     def initialize(adapter, node, lefts = nil, path = nil, parent = nil, rights = nil, changed = false, at_end = false)
       @adapter   = adapter
+
       @node      = node
       @lefts     = lefts
-      @path      = path
-      @parent    = parent
       @rights    = rights
+
+      @path      = path    # Array[Node]
+      @parent    = parent  # Zipper
       @changed   = changed
       @at_end    = at_end
     end
@@ -48,7 +56,7 @@ module Fzip
     end
 
     def down
-      if branch? && children
+      if branch? && children.any?
         new(
           node: children.first,
           lefts: [],
@@ -64,7 +72,7 @@ module Fzip
         return parent unless changed?
         parent_path = path.drop(1)
         new(
-          node:   make_node(node, lefts + [node] + rights),
+          node:   make_node(parent.node, lefts + [node] + rights),
           lefts:  parent.lefts,
           path:   parent_path.empty? ? nil : parent_path,
           parent: parent.parent,
@@ -88,7 +96,14 @@ module Fzip
       end
     end
 
-    #def rightmost
+    def rightmost
+      return self unless path && rights && !rights.empty?
+      new(
+        node: rights.last,
+        lefts: (lefts + [node] + rights)[0..-2],
+        rights: []
+      )
+    end
 
     def left
       if path && lefts && !lefts.empty?
@@ -100,7 +115,14 @@ module Fzip
       end
     end
 
-    # def leftmost
+    def leftmost
+      return self unless path && lefts && !lefts.empty?
+      new(
+        node: lefts.first,
+        lefts: [],
+        rights: (lefts + [node] + rights).drop(1)
+      )
+    end
 
     def insert_left(item)
       raise "insert at top" unless path
@@ -152,9 +174,38 @@ module Fzip
         backtrack.(self)
     end
 
-    # def prev
+    def prev
+      return up unless loc = left
+      loop do
+        if child = loc.branch? && loc.down
+          loc = child.rightmost
+        else
+          return loc
+        end
+      end
+    end
 
-    # def remove
+    # Removes the node at loc, returning the loc that would have preceded
+    # it in a depth-first walk.
+    def remove
+      raise "Remove at top" unless path
+      if lefts.empty?
+        parent.new(
+          node: make_node(parent.node, rights),
+          changed: true
+        )
+      else
+        loc = new(
+          node: lefts.first,
+          lefts: lefts.drop(1),
+          changed: true
+        )
+        loop do
+          return loc unless child = loc.branch? && loc.down
+          loc = child.rightmost
+        end
+      end
+    end
 
     def each
       return to_enum unless block_given?
@@ -165,3 +216,8 @@ module Fzip
     end
   end
 end
+
+# Notes on the port from zip.clj :
+# Gave these variables a different name
+#   pnodes => path
+#   ppath  => parent

data/spec/fzip_spec.rb

@@ -1,6 +1,4 @@
-$LOAD_PATH.unshift(Pathname(__FILE__).dirname.parent.join('lib'))
-
-require 'fzip'
+require 'spec_helper'
 
 describe Fzip, 'array' do
   let(:tree) {

data/spec/next_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Fzip::Zipper, 'next' do
+  let(:tree) {
+    [
+      ['x', '+', 'y'],
+      ['a', '*', 'b']
+    ]
+  }
+  let(:zipper) { Fzip.array(tree) }
+
+  let(:sequence) {
+    [
+      tree,
+      ['x', '+', 'y'],
+      'x',
+      '+',
+      'y',
+      ['a', '*', 'b'],
+      'a',
+      '*',
+      'b'
+    ]
+  }
+
+  it 'should go depth first' do
+    sequence.each.with_index do |n, idx|
+      nth = (0...idx).inject(zipper) {|z| z.next}
+      expect(nth.node).to eq n
+
+      p nth.node
+      sequence.first(idx+1).reverse.each.with_index do |p, pidx|
+        puts " => #{p.inspect}"
+        pth = (0...pidx).inject(nth) {|n| n.prev}
+        expect(pth.node).to eq p
+      end
+    end
+  end
+
+  it 'should go to the end' do
+    z = zipper
+    9.times do
+      expect(z.end?).to be_false
+      z = z.next
+    end
+    expect(z.end?).to be_true
+  end
+
+end

data/spec/remove_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Fzip::Zipper, 'remove' do
+  let(:tree) {
+    [
+      ['x', '+', 'y'],
+      ['a', '*', 'b']
+    ]
+  }
+
+  let(:zipper) { Fzip.array(tree) }
+
+  context 'when removing the top node' do
+    it 'should raise an exception' do
+      expect { zipper.remove }.to raise_error
+    end
+  end
+
+  context 'when removing a node that has a left sibling' do
+    let(:zipper) { super().down.down.right }
+
+    it 'should remove the node' do
+      expect(zipper.remove.root).to eq [
+        ['x',      'y'],
+        ['a', '*', 'b']
+      ]
+    end
+
+    it 'should return the zipper pointing to the left sibling' do
+      expect(zipper.remove.node).to eq 'x'
+    end
+  end
+
+  context 'without left siblings' do
+    let(:zipper) { super().down.down }
+
+    it 'should remove the node' do
+      expect(zipper.remove.root).to eq [
+        [     '+', 'y'],
+        ['a', '*', 'b']
+      ]
+    end
+
+    it 'should point to the parent' do
+      expect(zipper.remove.node).to eq [ '+', 'y' ]
+    end
+
+    context 'without right siblings' do
+      let(:tree) {
+        [
+          [ 'z' ]
+        ]
+      }
+
+      it 'should remove the node' do
+        expect(zipper.remove.root).to eq [ [] ]
+      end
+
+      it 'should point to the parent node' do
+        expect(zipper.remove.node).to eq []
+      end
+    end
+  end
+
+  context 'with left cousins' do
+    let(:zipper) { super().down.right }
+
+    it 'should remove the node' do
+      expect(zipper.remove.root).to eq [ ['x', '+', 'y'] ]
+    end
+
+    it 'should point to the rightmost left cousin' do
+      expect(zipper.remove.root).to eq [ ['x', '+', 'y'] ]
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift(Pathname(__FILE__).dirname.parent.join('lib'))
+
+require 'fzip'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fzip
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -57,6 +57,9 @@ files:
 - lib/fzip/version.rb
 - lib/fzip/zipper.rb
 - spec/fzip_spec.rb
+- spec/next_spec.rb
+- spec/remove_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/plexus/fzip
 licenses:
 - MIT
@@ -83,3 +86,6 @@ specification_version: 4
 summary: Functional zipper class
 test_files:
 - spec/fzip_spec.rb
+- spec/next_spec.rb
+- spec/remove_spec.rb
+- spec/spec_helper.rb