compo 0.4.0 → 0.5.0

data/spec/parentless_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'compo'
 
-describe Compo::Composites::Parentless do
+RSpec.describe Compo::Composites::Parentless do
   let(:child) { double(:child) }
 
   describe '#add' do
@@ -12,17 +12,20 @@ describe Compo::Composites::Parentless do
     end
 
     it 'calls #update_parent on the child with a Parentless' do
-      expect(child).to receive(:update_parent).once do |parent, _|
-        expect(parent).to be_a(Compo::Composites::Parentless)
-      end
       subject.add(:id, child)
+
+      expect(child).to have_received(:update_parent).once.with(
+        a_kind_of(Compo::Composites::Parentless),
+        anything
+      )
     end
 
     it 'calls #update_parent on the child with a nil-returning ID proc' do
-      expect(child).to receive(:update_parent).once do |_, idp|
-        expect(idp.call).to be_nil
-      end
       subject.add(:id, child)
+      expect(child).to have_received(:update_parent).once.with(
+        anything,
+        an_object_satisfying { |idp| idp.call.nil? }
+      )
     end
   end
 
@@ -40,13 +43,20 @@ describe Compo::Composites::Parentless do
     specify { expect(subject.url).to eq('') }
   end
 
-  describe '#child_url' do
-    specify { expect(subject.child_url(:id)).to eq('') }
-  end
-
   describe '#parent' do
     it 'returns the exact same Parentless object' do
       expect(subject.parent).to be(subject)
     end
   end
+
+  describe '#on_node' do
+    it 'ignores the block given' do
+      expect { |block| subject.on_node(&block) }.to_not yield_control
+    end
+
+    it 'returns nil' do
+      expect(subject.on_node { |subject| subject }).to be_nil
+      expect(subject.on_node { 3 }).to be_nil
+    end
+  end
 end

data/spec/root_finder_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'compo'
+
+RSpec.describe Compo::Finders::Root do
+  subject { Compo::Finders::Root }
+
+  it { should < Enumerable }
+
+  describe '.find' do
+    context 'when given a root' do
+      it 'returns the root' do
+        l = Compo::Branches::Leaf.new
+
+        expect { |b| subject.find(l, &b) }.to yield_with_args(l)
+      end
+    end
+
+    context 'when given a leaf' do
+      it 'returns its root' do
+        a = Compo::Branches::Hash.new
+        b = Compo::Branches::Hash.new
+        l = Compo::Branches::Leaf.new
+
+        l.move_to(b, :l)
+        b.move_to(a, :b)
+
+        expect { |block| subject.find(l, &block) }.to yield_with_args(a)
+      end
+    end
+  end
+
+  describe '.each' do
+    subject { Compo::Finders::Root.new(leaf) }
+
+    context 'when given a root' do
+      let(:leaf) { Compo::Branches::Leaf.new }
+
+      it 'returns the root' do
+        expect { |block| subject.each(&block) }.to yield_with_args(leaf)
+      end
+    end
+
+    context 'when given a leaf' do
+      let(:root) { Compo::Branches::Hash.new }
+      let(:a) { Compo::Branches::Hash.new }
+      let(:b) { Compo::Branches::Hash.new }
+      let(:c) { Compo::Branches::Hash.new }
+      let(:leaf) do
+        l = Compo::Branches::Leaf.new
+
+        l.move_to(c,    :l)
+        c.move_to(b,    :c)
+        b.move_to(a,    :b)
+        a.move_to(root, :a)
+
+        l
+      end
+
+      it 'returns each item in the path' do
+        expect { |b| subject.each(&b) }.to yield_successive_args(
+          leaf, c, b, a, root
+        )
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'simplecov'
 
 RSpec.configure do |config|
+  config.expose_dsl_globally = false
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

data/spec/url_finder_shared_examples.rb

@@ -1,6 +1,6 @@
 require 'compo'
 
-shared_examples 'a URL finding' do
+RSpec.shared_examples 'a URL finding' do
   let(:target) { Compo::Branches::Leaf.new }
 
   context 'when given a nil URL' do

data/spec/url_finder_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'compo'
 require 'url_finder_shared_examples'
 
-describe Compo::Finders::Url do
+RSpec.describe Compo::Finders::Url do
   subject { Compo::Finders::Url }
   describe '.find' do
     context 'when given a nil root' do

data/spec/url_referenceable_shared_examples.rb

@@ -1,10 +1,14 @@
-shared_examples 'a URL referenceable object' do
+RSpec.shared_examples 'a URL referenceable object' do
   let(:parent) { nil }
-  let(:id) { double(:id) }
+  let(:id) { :id }
+  let(:parent_id) { :parent_id }
 
   before(:each) do
-    allow(subject).to receive(:id).and_return(id)
-    allow(subject).to receive(:parent).and_return(parent)
+    allow(subject).to receive_messages(
+      id: id,
+      parent: parent,
+      root?: false
+    )
   end
 
   describe '#url' do
@@ -15,26 +19,24 @@ shared_examples 'a URL referenceable object' do
     context 'when the UrlReferenceable has a parent' do
       let(:parent) { double(:parent) }
       before(:each) do
-        allow(parent).to receive(:child_url).and_return(:child_url)
+        allow(parent).to receive_messages(
+          parent: Compo::Composites::Parentless.new,
+          root?: true
+        )
       end
 
       it 'calls #id' do
-        expect(subject).to receive(:id)
         subject.url
+        expect(subject).to have_received(:id)
       end
 
       it 'calls #parent' do
-        expect(subject).to receive(:parent)
         subject.url
+        expect(subject).to have_received(:parent)
       end
 
-      it 'calls #child_url on the parent with the ID' do
-        expect(parent).to receive(:child_url).with(id)
-        subject.url
-      end
-
-      it 'returns the result of calling #child_url' do
-        expect(subject.url).to eq(:child_url)
+      it 'returns /id' do
+        expect(subject.url).to eq('/id')
       end
     end
   end

data/spec/url_referenceable_spec.rb

@@ -7,6 +7,6 @@ class MockUrlReferenceable
   include Compo::Mixins::UrlReferenceable
 end
 
-describe MockUrlReferenceable do
+RSpec.describe MockUrlReferenceable do
   it_behaves_like 'a URL referenceable object'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Windsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +108,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\n    Compo provides mixins and classes that assist in implementing
-  a variant of\n    the Composite design pattern, in which each child has an ID that
-  uniquely\n    identifies it inside the parent's child set.\n  "
+description: |2
+      Compo provides mixins and classes that assist in implementing a variant of
+      the Composite design pattern, in which each child has an ID that uniquely
+      identifies it inside the parent's child set.
 email:
 - matt.windsor@ury.org.uk
 executables: []
@@ -133,6 +120,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE.txt
@@ -153,6 +141,7 @@ files:
 - lib/compo/composites/leaf.rb
 - lib/compo/composites/parentless.rb
 - lib/compo/finders.rb
+- lib/compo/finders/root.rb
 - lib/compo/finders/url.rb
 - lib/compo/mixins.rb
 - lib/compo/mixins/movable.rb
@@ -177,6 +166,7 @@ files:
 - spec/movable_spec.rb
 - spec/parent_tracker_spec.rb
 - spec/parentless_spec.rb
+- spec/root_finder_spec.rb
 - spec/spec_helper.rb
 - spec/url_finder_shared_examples.rb
 - spec/url_finder_spec.rb
@@ -225,6 +215,7 @@ test_files:
 - spec/movable_spec.rb
 - spec/parent_tracker_spec.rb
 - spec/parentless_spec.rb
+- spec/root_finder_spec.rb
 - spec/spec_helper.rb
 - spec/url_finder_shared_examples.rb
 - spec/url_finder_spec.rb