and_feathers 1.0.0.pre → 1.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8677ebc7f56d9f906f50385f52023ac81ba58bd
-  data.tar.gz: c480d1890de2bc3d78f2d7da5daf317300113be0
+  metadata.gz: 0d9656435e6178a04aab438ddf7e730aa2d577b8
+  data.tar.gz: 49ac9dc20c608f43b2c90cf9a28bb462718c0439
 SHA512:
-  metadata.gz: f9fb0a23273a125b5a519d11c3f8a5a00cde68e7a33afbf0c5159c8d2b10954b159c42fc9de5212f5a8d4ff97d0a1fec8d463910f1960f9fd29503465b6614b3
-  data.tar.gz: 9e541a6708157de758811e543cbc6bef2cdd25dea3dad6aac1c0243f0f288b62834eb702d1672633ef7788a53718826da671c09753080422a9dc803675fd4a43
+  metadata.gz: b30cb6a4608a3608ae83cba864e65d1d050067aa22436c6a6e25cf4bf564e60e0aa066c25174f76673223fc702eb9439e856b20b4d3699792c22866f130d8598
+  data.tar.gz: d62bd5885dfd95b601cdd37a8b5e23ad20e7cc6462a4991869638fd9d410b9b8df2fdb2f5d1966baf957a184e5e704c897ece207013d8e8d398fd0da31148185

data/and_feathers.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/and_feathers/directory.rb

@@ -9,7 +9,7 @@ module AndFeathers
     include Enumerable
 
     attr_reader :name, :mode
-    attr_writer :parent
+    attr_accessor :parent
 
     #
     # @!attribute [r] name
@@ -36,6 +36,28 @@ module AndFeathers
       @directories = {}
     end
 
+    #
+    # Reset +parent+ and clone +files+ and +directories+ when calling +dup+ or
+    # +clone+ on a +Directory+
+    #
+    # @param source [Directory]
+    #
+    def initialize_copy(source)
+      super
+
+      @files = {}
+      @directories = {}
+      @parent = nil
+
+      source.directories.map(&:dup).each do |new_directory|
+        add_directory(new_directory)
+      end
+
+      source.files.map(&:dup).each do |new_file|
+        add_file(new_file)
+      end
+    end
+
     #
     # This +Directory+'s path
     #
@@ -80,7 +102,7 @@ module AndFeathers
         raise ArgumentError, "#{other} is not a Directory"
       end
 
-      self.dup.tap do |directory|
+      dup.tap do |directory|
         other.files.each do |file|
           directory.add_file(file.dup)
         end
@@ -91,7 +113,7 @@ module AndFeathers
           if existing_directory.nil?
             directory.add_directory(new_directory.dup)
           else
-            directory.add_directory(new_directory.dup | existing_directory.dup)
+            directory.add_directory(new_directory | existing_directory)
           end
         end
       end

data/lib/and_feathers/file.rb

@@ -4,7 +4,7 @@ module AndFeathers
   #
   class File
     attr_reader :name, :mode, :content
-    attr_writer :parent
+    attr_accessor :parent
 
     #
     # @!attribute [r] name
@@ -34,6 +34,17 @@ module AndFeathers
       @parent = nil
     end
 
+    #
+    # Reset +parent+ when calling +dup+ or +clone+ on a +File+
+    #
+    # @param source [File]
+    #
+    def initialize_copy(source)
+      super
+
+      @parent = nil
+    end
+
     #
     # This +File+'s path
     #

data/lib/and_feathers/version.rb

@@ -4,5 +4,5 @@ module AndFeathers
   # introduces the change to a configurable output format, which breaks the
   # interface of the initial release.
   #
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre.1"
 end

data/spec/unit/directory_spec.rb

@@ -3,66 +3,136 @@ require 'and_feathers/directory'
 
 module AndFeathers
   describe Directory do
-    it 'can be unioned with another directory' do
-      one = Directory.new
-      two = Directory.new
-      one.dir('a') do |a|
-        a.dir('b') do |b|
-          b.file('c')
-        end
-        a.dir('c')
+    describe 'dupping/cloning' do
+      it 'does not preserve the parent relationship' do
+        one = Directory.new.tap { |d| d.file('a/b/c') }
+
+        b = one.find { |e| e.name == 'b' }
+
+        expect(b.dup.parent).to be_nil
       end
+    end
 
-      two.dir('a') do |a|
-        a.dir('b') do |b|
-          b.file('d')
+    describe '#|' do
+      it 'unions the contents of two directories' do
+        one = Directory.new
+        one.dir('a') do |a|
+          a.file('b/c')
+          a.dir('c')
         end
+
+        two = Directory.new
+        two.file('a/b/d')
+
+        three = one | two
+
+        expect(three.to_a.map(&:path)).
+          to eql(['./a', './a/b', './a/b/c', './a/b/d', './a/c'])
+      end
+
+      it 'does not mutate the left-hand side files' do
+        one = Directory.new.tap { |o| o.file('a/b') }
+        two = Directory.new.tap { |t| t.file('a/c') ; t.file('d/e') }
+
+        one_a = one.to_a.find { |e| e.name == 'a' }
+
+        expect do
+          one | two
+        end.to_not change(one_a, :files)
       end
 
-      three = one | two
+      it 'does not mutate the right-hand side files' do
+        one = Directory.new.tap { |o| o.file('a/b') }
+        two = Directory.new.tap { |t| t.file('a/c') ; t.file('d/e') }
+
+        two_a = one.to_a.find { |e| e.name == 'a' }
+
+        expect do
+          one | two
+        end.to_not change(two_a, :files)
+      end
 
-      expect(three.to_a.map(&:path)).
-        to eql(['./a', './a/b', './a/b/c', './a/b/d', './a/c'])
+      it 'does not mutate the left-hand side directories' do
+        one = Directory.new.tap { |o| o.file('a/b') }
+        two = Directory.new.tap { |t| t.file('a/c') ; t.file('d/e') }
+
+        expect do
+          one | two
+        end.to_not change(one, :directories)
+      end
+
+      it 'does not mutate the right-hand side directories' do
+        one = Directory.new.tap { |o| o.file('a/b') }
+        two = Directory.new.tap { |t| t.file('a/c') ; t.file('d/e') }
+
+        expect do
+          one | two
+        end.to_not change(two, :directories)
+      end
+
+      it 'does not mutate the left-hand side parents' do
+        one = Directory.new.tap { |o| o.file('a/b') ; o.file('f/g') }
+        two = Directory.new.tap { |t| t.file('a/c') ; t.file('d/e') }
+
+        one_f = one.to_a.find { |e| e.name == 'f' }
+        one_f_parent = one_f.parent
+
+        one | two
+
+        expect(one_f_parent).to eql(one_f.parent)
+      end
+
+      it 'does not mutate the right-hand side parents' do
+        one = Directory.new.tap { |o| o.file('a/b') }
+        two = Directory.new.tap { |t| t.file('a/c') ; t.file('d/e') }
+
+        two_d = two.to_a.find { |e| e.name == 'd' }
+        two_d_parent = two_d.parent
+
+        one | two
+
+        expect(two_d.parent).to eql(two_d_parent)
+      end
     end
 
     it 'allows for manually nesting directories' do
-      archive = Directory.new
-      archive.dir('a') do |a|
+      directory = Directory.new
+      directory.dir('a') do |a|
         a.dir('b') do |b|
           b.dir('c')
         end
       end
 
-      expect(archive.to_a.map(&:path)).to eql(['./a', './a/b', './a/b/c'])
+      expect(directory.to_a.map(&:path)).to eql(['./a', './a/b', './a/b/c'])
     end
 
     it 'allows for convenient nesting of directories' do
-      archive = Directory.new
-      archive.dir('a/b/c')
+      directory = Directory.new
+      directory.dir('a/b/c')
 
-      expect(archive.to_a.map(&:path)).to eql(['./a', './a/b', './a/b/c'])
+      expect(directory.to_a.map(&:path)).to eql(['./a', './a/b', './a/b/c'])
     end
 
     it 'only creates a given path once' do
-      archive = Directory.new
-      archive.dir('a/b/c')
-      archive.dir('a/b/c/d')
+      directory = Directory.new
+      directory.dir('a/b/c')
+      directory.dir('a/b/c/d')
 
-      expect(archive.to_a.map(&:path)).
+      expect(directory.to_a.map(&:path)).
         to eql(['./a', './a/b', './a/b/c', './a/b/c/d'])
     end
 
     it 'takes the most recent duplicate directory as authoritative' do
-      archive = Directory.new
-      archive.dir('a/b/c')
-      archive.dir('a/b/d')
+      directory = Directory.new
+      directory.dir('a/b/c')
+      directory.dir('a/b/d')
 
-      expect(archive.to_a.map(&:path)).to eql(['./a', './a/b', './a/b/d'])
+      expect(directory.to_a.map(&:path)).to eql(['./a', './a/b', './a/b/d'])
     end
 
     it 'allows for manually nesting files in directories' do
-      archive = Directory.new
-      archive.dir('a') do |a|
+      directory = Directory.new
+      directory.dir('a') do |a|
         a.dir('b') do |b|
           b.dir('c') do |c|
             c.file 'README'
@@ -70,32 +140,32 @@ module AndFeathers
         end
       end
 
-      expect(archive.to_a.map(&:path)).
+      expect(directory.to_a.map(&:path)).
         to eql(['./a', './a/b', './a/b/c', './a/b/c/README'])
     end
 
     it 'allows for convenient nesting of files in directories' do
-      archive = Directory.new
-      archive.file('a/b/c/README')
+      directory = Directory.new
+      directory.file('a/b/c/README')
 
-      expect(archive.to_a.map(&:path)).
+      expect(directory.to_a.map(&:path)).
         to eql(['./a', './a/b', './a/b/c', './a/b/c/README'])
     end
 
     it 'only creates a given file once' do
-      archive = Directory.new
-      archive.file('a/README')
-      archive.file('a/README')
+      directory = Directory.new
+      directory.file('a/README')
+      directory.file('a/README')
 
-      expect(archive.to_a.map(&:path)).to eql(['./a', './a/README'])
+      expect(directory.to_a.map(&:path)).to eql(['./a', './a/README'])
     end
 
     it 'takes the most recent file as the authoritative file' do
-      archive = Directory.new
-      archive.file('a/README') { '1' }
-      archive.file('a/README') { '2' }
+      directory = Directory.new
+      directory.file('a/README') { '1' }
+      directory.file('a/README') { '2' }
 
-      readme = archive.to_a.find { |e| e.is_a?(File) }
+      readme = directory.to_a.find { |e| e.is_a?(File) }
 
       expect(readme.read).to eql('2')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: and_feathers
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre.1
 platform: ruby
 authors:
 - Brian Cobb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler