boombera 0.2.3 → 0.3.0

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem 'autotest', '~> 4.4.6'
   gem 'autotest-growl', '~> 0.2.9'
   gem 'autotest-fsevent', '~> 0.2.5'
+  gem 'ruby-debug19', '~> 0.11.6'
 end

data/Gemfile.lock

@@ -2,11 +2,13 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
+    archive-tar-minitar (0.5.2)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-fsevent (0.2.5)
       sys-uname
     autotest-growl (0.2.9)
+    columnize (0.3.2)
     couchrest (1.0.2)
       json (~> 1.5.1)
       mime-types (~> 1.15)
@@ -18,6 +20,8 @@ GEM
       git (>= 1.2.5)
       rake
     json (1.5.1)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mime-types (1.16)
     rake (0.9.0)
     rcov (0.9.9)
@@ -36,9 +40,19 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.5)
@@ -58,3 +72,4 @@ DEPENDENCIES
   rdoc (~> 3.6.1)
   reek (~> 1.2.8)
   rspec (~> 2.6.0)
+  ruby-debug19 (~> 0.11.6)

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/boombera.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boombera}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger"]
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     "lib/boombera/content_item.rb",
     "lib/boombera/information.rb",
     "spec/integration/boombera_spec.rb",
-    "spec/lib/boombera/content_item_map_resolver_spec.rb",
     "spec/lib/boombera/content_item_spec.rb",
     "spec/lib/boombera_spec.rb",
     "spec/spec_helper.rb"
@@ -57,6 +56,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<autotest>, ["~> 4.4.6"])
       s.add_development_dependency(%q<autotest-growl>, ["~> 0.2.9"])
       s.add_development_dependency(%q<autotest-fsevent>, ["~> 0.2.5"])
+      s.add_development_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
     else
       s.add_dependency(%q<couchrest>, ["~> 1.0.2"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<autotest>, ["~> 4.4.6"])
       s.add_dependency(%q<autotest-growl>, ["~> 0.2.9"])
       s.add_dependency(%q<autotest-fsevent>, ["~> 0.2.5"])
+      s.add_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
     end
   else
     s.add_dependency(%q<couchrest>, ["~> 1.0.2"])
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<autotest>, ["~> 4.4.6"])
     s.add_dependency(%q<autotest-growl>, ["~> 0.2.9"])
     s.add_dependency(%q<autotest-fsevent>, ["~> 0.2.5"])
+    s.add_dependency(%q<ruby-debug19>, ["~> 0.11.6"])
   end
 end
 

data/lib/boombera.rb

@@ -110,7 +110,8 @@ class Boombera
   # +body+:: can be # any object that can convert to JSON.
   # +path+:: should be a String with /-separated tokens (i.e. "/foo/bar/baz").
   def put(path, body)
-    content_item = get_pointer(path) and content_item.body = body
+    content_item = ContentItem.get_pointer(path, database)  \
+      and content_item.body = body
     content_item ||= ContentItem.new(path, body, database)
     content_item.save
   end
@@ -119,7 +120,7 @@ class Boombera
   # is found. If +path+ is mapped to another ContentItem, the resolved
   # ContentItem will be returned.
   def get(path)
-    ContentItem::MapResolver.new(path, database).resolve
+    ContentItem.get(path, database)
   end
 
   # Creates a content mapping so that two paths can reference the same content
@@ -131,17 +132,13 @@ class Boombera
   # 
   # raises:: InvalidMapping
   def map(path, source_path)
-    content_map = get_pointer(path) || ContentItem.new(path, nil, database)
+    content_map = ContentItem.get_pointer(path, database) \
+      || ContentItem.new(path, nil, database)
     content_map.map_to source_path
     content_map.save
   end
 
   private
-
-  def get_pointer(path)
-    ContentItem::MapResolver.new(path, database, :resolve_map => false).resolve
-  end
-
   def check_database_version!
     database_version = Boombera.database_version(database)
     unless Boombera.version == database_version

data/lib/boombera/content_item.rb

@@ -2,41 +2,26 @@
 # content-mapping semantics and method-based access to the attributes that
 # Boombera knows about.
 class Boombera::ContentItem < CouchRest::Document
-  class MapResolver #:nodoc: all
-    def initialize(path, database, options = {})
-      @path = path
-      @database = database
-      @final_attempt = options[:resolve_map] == false
-    end
-
-    def resolve
-      id, maps_to = content_map
-      return if id.nil?
-      if @final_attempt || maps_to == @path
-        Boombera::ContentItem.new(@database.get(id))
-      else
-        @path = maps_to
-        resolve
-      end
-    end
-
-    private
-
-    def content_map
-      rows = @database.view('boombera/content_map', :key => @path)['rows']
-      return if rows.empty?
-      match = rows.first
-      [match['id'], match['value']]
-    end
-  end
-
   # The actual content that is being stored
   attr_accessor :body
 
-  # The path used to access the ContentItem
+  # The path used to access the ContentItem, it is stored as the '_id' attribute
+  # in CouchDB
   attr_reader :path
 
-  attr_reader :maps_to #:nodoc:
+  def self.get(path, db)
+    doc = get_pointer(path, db)
+    until doc.nil? || doc.resolved?
+      doc = get_pointer(doc.maps_to, db)
+    end
+    doc
+  end
+
+  def self.get_pointer(path, db)
+    Boombera::ContentItem.new(db.get(path))
+  rescue RestClient::ResourceNotFound
+    nil
+  end
 
   def initialize(doc_or_path, body = nil, database = nil) #:nodoc:
     case doc_or_path
@@ -45,20 +30,20 @@ class Boombera::ContentItem < CouchRest::Document
       super(doc_or_path)
     when String
       @database = database
-      super(:path => doc_or_path, :body => body)
+      super('_id' => doc_or_path, 'body' => body)
     else
       raise ArgumentError, "doc_or_path must either be an instance of CouchRest::Document or a String"
     end
   end
 
   def map_to(source_path) #:nodoc:
-    rows = @database.view('boombera/content_map', :key => source_path)['rows']
+    rows = @database.view('boombera/content_paths', :key => source_path)['rows']
     if rows.empty?
       raise Boombera::InvalidMapping,
         "Tried to map #{path} to #{source_path}, but #{source_path} doesn't exist."
     else
       self.body = nil
-      self[:maps_to] = source_path
+      self['maps_to'] = source_path
     end
   end
 
@@ -68,20 +53,30 @@ class Boombera::ContentItem < CouchRest::Document
     rows.map{ |row| row['value'] }.sort
   end
 
+  def save(*args)
+    self['maps_to'] = maps_to
+    self['type'] = 'content_item'
+    super
+  end
+
+  def resolved?
+    path == maps_to
+  end
+
+  def maps_to #:nodoc:
+    return path unless body.nil?
+    self['maps_to'] || path
+  end
+
   def path #:nodoc:
-    self[:path]
+    self['_id']
   end
 
   def body #:nodoc:
-    self[:body]
+    self['body']
   end
 
   def body=(new_body) #:nodoc:
-    self[:body] = new_body
-    self[:maps_to] = path unless new_body.nil?
-  end
-
-  def maps_to #:nodoc:
-    self[:maps_to]
+    self['body'] = new_body
   end
 end

data/lib/boombera/information.rb

@@ -14,14 +14,14 @@ module Boombera::Information #:nodoc: all
       'language' => 'javascript',
       'gem_version' => version,
       'views' => {
-        'content_map' => {
+        'content_paths' => {
           'map' => <<-EOF
             function(doc) {
-              if (doc['path']) {
+              if (doc['type'] && doc.type == 'content_item') {
                 if (doc['maps_to']) {
-                  emit(doc.path, doc.maps_to);
+                  emit(doc._id, doc.maps_to);
                 } else {
-                  emit(doc.path, doc.path);
+                  emit(doc._id, doc._id);
                 }
               }
             }
@@ -30,8 +30,8 @@ module Boombera::Information #:nodoc: all
         'map_references' => {
           'map' => <<-EOF
             function(doc) {
-              if(doc['maps_to'] && doc.maps_to != doc.path) {
-                emit(doc.maps_to, doc.path);
+              if(doc['maps_to'] && doc.maps_to != doc._id) {
+                emit(doc.maps_to, doc._id);
               }
             }
             EOF

data/spec/integration/boombera_spec.rb

@@ -65,20 +65,16 @@ describe 'The Boombera library:' do
   describe 'putting content in the database' do
     it 'saves content to a new path' do
       boombera.put('/foo', 'foo bar baz')
-      results = db.view('boombera/content_map', :key => '/foo')['rows']
-      results.length.should == 1
-      document = db.get(results.first['id'])
-      document['path'].should == '/foo'
+      document = db.get('/foo')
+      document['_id'].should == '/foo'
       document['body'].should == 'foo bar baz'
     end
 
     it 'saves content to an existing path' do
       boombera.put('/foo', 'foo bar baz')
       boombera.put('/foo', 'the new content')
-      results = db.view('boombera/content_map', :key => '/foo')['rows']
-      results.length.should == 1
-      document = db.get(results.first['id'])
-      document['path'].should == '/foo'
+      document = db.get('/foo')
+      document['_id'].should == '/foo'
       document['body'].should == 'the new content'
     end
 
@@ -86,12 +82,10 @@ describe 'The Boombera library:' do
       boombera.put('/foo', 'foo bar baz')
       boombera.map('/bar', '/foo')
       boombera.put('/bar', 'the new content')
-      results = db.view('boombera/content_map', :key => '/bar')['rows']
-      results.length.should == 1
-      document = db.get(results.first['id'])
-      document['path'].should == '/bar'
+      document = db.get('/bar')
+      document['_id'].should == '/bar'
       document['body'].should == 'the new content'
-      document['points_to'].should be_nil
+      document['maps_to'].should == '/bar'
     end
   end
 
@@ -99,10 +93,9 @@ describe 'The Boombera library:' do
     it 'creates a pointer from a path to another path' do
       boombera.put('/foo', 'foo bar baz')
       boombera.map('/bar', '/foo')
-      results = db.view('boombera/content_map', :key => '/bar')['rows']
-      results.length.should == 1
-      map_item = results.first
-      map_item['value'].should == '/foo'
+      result = boombera.get('/bar')
+      result.path.should == '/foo'
+      result.body.should == 'foo bar baz'
     end
 
     it 'updates a pointer from a path to another path' do
@@ -110,22 +103,18 @@ describe 'The Boombera library:' do
       boombera.put('/spam', 'ham spam can')
       boombera.map('/bar', '/foo')
       boombera.map('/bar', '/spam')
-      results = db.view('boombera/content_map', :key => '/bar')['rows']
-      results.length.should == 1
-      map_item = results.first
-      map_item['value'].should == '/spam'
+      result = boombera.get('/bar')
+      result.path.should == '/spam'
+      result.body.should == 'ham spam can'
     end
 
     it 'turns a content item into a pointer' do
       boombera.put('/foo', 'foo bar baz')
       boombera.put('/bar', 'some old bar content')
       boombera.map('/bar', '/foo')
-      results = db.view('boombera/content_map', :key => '/bar')['rows']
-      results.length.should == 1
-      map_item = results.first
-      map_item['value'].should == '/foo'
-      doc = db.get(map_item['id'])
-      doc['body'].should be_nil
+      result = boombera.get('/bar')
+      result.path.should == '/foo'
+      result.body.should == 'foo bar baz'
     end
   end
 
@@ -135,7 +124,7 @@ describe 'The Boombera library:' do
     end
 
     it 'gives you a ContentItem if the content is there' do
-      db.save_doc({'path' => '/index', 'body' => 'Hello, World!'})
+      boombera.put('/index', 'Hello, World!')
       result = boombera.get('/index')
       result.path.should == '/index'
       result.body.should == 'Hello, World!'

data/spec/lib/boombera/content_item_spec.rb

@@ -1,6 +1,12 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe Boombera::ContentItem do
+  let(:db) do
+    db = stub(CouchRest::Database)
+    CouchRest.stub!(:database! => db)
+    db
+  end
+
   describe '.new' do
     context 'when passed a path, body and database' do
       it 'sets the database from the database argument' do
@@ -20,10 +26,16 @@ describe Boombera::ContentItem do
   end
 
   describe '#path' do
-    it 'returns the path from the associated document' do
+    it 'returns the path from the arguments' do
       content = Boombera::ContentItem.new('/index.html')
       content.path.should == '/index.html'
     end
+
+    it 'returns the _id when initialized with a Document' do
+      doc = CouchRest::Document.new('_id' => '/foobar')
+      content = Boombera::ContentItem.new(doc)
+      content.path.should == '/foobar'
+    end
   end
 
   describe '#body' do
@@ -34,27 +46,12 @@ describe Boombera::ContentItem do
   end
 
   describe '#body=' do
-    let(:db) { stub(CouchRest::Database) }
     let(:content) { Boombera::ContentItem.new('/foo', 'not bar', db) }
 
     it 'overwrites the current contents of the document body' do
       content.body = 'bar'
       content.body.should == 'bar'
     end
-
-    it 'sets the maps_to attribute equal to the path attribute if argument is not nil' do
-      db.stub!(:view => {'rows' => [{'value' => '/foo'}]})
-      content.map_to '/bar'
-      content.body = 'something'
-      content.maps_to.should == '/foo'
-    end
-
-    it 'does not change the maps_to attribute if the argument is nil' do
-      db.stub!(:view => {'rows' => [{'value' => '/foo'}]})
-      content.map_to '/bar'
-      content.body = nil
-      content.maps_to.should == '/bar'
-    end
   end
 
   describe '#map_to' do
@@ -74,8 +71,8 @@ describe Boombera::ContentItem do
 
       before(:each) do
         db.should_receive(:view) \
-          .with('boombera/content_map', :key => '/foo') \
-          .and_return({'rows' => [{'value' => '/foo'}]})
+          .with('boombera/content_paths', :key => '/foo') \
+          .and_return({'rows' => [{'id' => '/foo'}]})
         content.map_to '/foo'
       end
 
@@ -88,4 +85,68 @@ describe Boombera::ContentItem do
       end
     end
   end
+
+  describe '#save' do
+    it 'ensures that the type attribute is set to "content_item"' do
+      content = Boombera::ContentItem.new('/foo', 'bar', db)
+      db.should_receive(:save_doc) \
+        .with({'_id' => '/foo', 'body' => 'bar', 'type' => 'content_item',
+              'maps_to' => '/foo'}, false) \
+        .and_return({'ok' => true})
+      content.save
+    end
+
+    context 'when the body is not nil' do
+      it 'sets the maps_to attribute equal to the path' do
+        content = Boombera::ContentItem.new('/foo', 'bar', db)
+        db.should_receive(:save_doc) \
+          .with({'_id' => '/foo', 'body' => 'bar', 'type' => 'content_item',
+                'maps_to' => '/foo'}, false) \
+                .and_return({'ok' => true})
+        content.save
+      end
+
+      context 'but the maps_to attribute points to another document' do
+        it 'sets the maps_to attribute equal to the path' do
+          db.stub!(:view => {'rows' => [{'id' => '/bar'}]})
+          content = Boombera::ContentItem.new('/foo', nil, db)
+          content.map_to('/bar')
+          content.body = 'bar'
+          db.should_receive(:save_doc) \
+            .with({'_id' => '/foo', 'body' => 'bar', 'type' => 'content_item',
+                  'maps_to' => '/foo'}, false) \
+                  .and_return({'ok' => true})
+          content.save
+        end
+      end
+    end
+
+    context 'when the body is nil' do
+      it 'does not change the maps_to attribute if it is already set' do
+        # stub result from boombera/content_paths view
+        db.stub(:view => {'rows' => [{'id' => '/bar'}]})
+        content = Boombera::ContentItem.new('/foo', nil, db)
+        content.map_to('/bar')
+        db.should_receive(:save_doc) \
+          .with({'_id' => '/foo', 'body' => nil, 'type' => 'content_item',
+                'maps_to' => '/bar'}, false) \
+                .and_return({'ok' => true})
+        content.save
+      end
+    end
+  end
+
+  describe '#resolved' do
+    it 'returns true if maps_to == path' do
+      content = Boombera::ContentItem.new('/foo', 'bar', db)
+      content.should be_resolved
+    end
+
+    it 'returns false if maps_to != path' do
+      db.stub!(:view => {'rows' => [{'id' => '/bar'}]})
+      content = Boombera::ContentItem.new('/foo', nil, db)
+      content.map_to '/bar'
+      content.should_not be_resolved
+    end
+  end
 end

data/spec/lib/boombera_spec.rb

@@ -40,10 +40,9 @@ describe Boombera do
   describe '#put' do
     context "to an existing path" do
       it 'updates and saves the existing content item' do
-        resolver = stub(Boombera::ContentItem::MapResolver, :resolve => content_item)
-        Boombera::ContentItem::MapResolver.should_receive(:new) \
-          .with('/foo', db, :resolve_map => false) \
-          .and_return(resolver)
+        Boombera::ContentItem.should_receive(:get_pointer) \
+          .with('/foo', db) \
+          .and_return(content_item)
         content_item.should_receive(:body=).with('bar')
         content_item.should_receive(:save).and_return(true)
         boombera.put('/foo', 'bar').should == true
@@ -52,7 +51,7 @@ describe Boombera do
 
     context "to a new path" do
       it 'creates and saves the content item' do
-        Boombera::ContentItem::MapResolver.stub!(:new => stub('resolver', :resolve => nil))
+        Boombera::ContentItem.stub!(:get_pointer => nil)
         Boombera::ContentItem.should_receive(:new) \
           .with('/foo', 'bar', db) \
           .and_return(content_item)
@@ -64,20 +63,20 @@ describe Boombera do
 
   describe '#get' do
     it 'gets the content item at the specified path from the current database' do
-      resolver = stub(Boombera::ContentItem::MapResolver, :resolve => :a_content_item)
-      Boombera::ContentItem::MapResolver.should_receive(:new) \
+      Boombera::ContentItem.should_receive(:get) \
         .with('/foo', db) \
-        .and_return(resolver)
-      boombera.get('/foo').should == :a_content_item
+        .and_return(content_item)
+      boombera.get('/foo').should == content_item
     end
   end
 
   describe '#map' do
     context 'to a new path' do
       before(:each) do
-        resolver = stub(Boombera::ContentItem::MapResolver, :resolve => nil)
-        Boombera::ContentItem::MapResolver.stub!(:new => resolver)
-        Boombera::ContentItem.should_receive(:new).with('/bar', nil, db).and_return(content_item)
+        Boombera::ContentItem.stub!(:get_pointer => nil)
+        Boombera::ContentItem.should_receive(:new) \
+          .with('/bar', nil, db) \
+          .and_return(content_item)
       end
 
       it 'creates and saves ContentItem as pointer' do
@@ -95,10 +94,9 @@ describe Boombera do
 
     context 'to an existing path' do
       before(:each) do
-        resolver = stub(Boombera::ContentItem::MapResolver, :resolve => content_item)
-        Boombera::ContentItem::MapResolver.should_receive(:new) \
-          .with('/bar', db, :resolve_map => false) \
-          .and_return(resolver)
+        Boombera::ContentItem.should_receive(:get_pointer) \
+          .with('/bar', db) \
+          .and_return(content_item)
       end
 
       it 'updates ContentItem as pointer' do

metadata

@@ -2,7 +2,7 @@
 name: boombera
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Wilger
@@ -123,6 +123,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.6
+  type: :development
+  prerelease: false
+  version_requirements: *id011
 description: CouchDB-backed content repository for multi-tenant, multi-stage applications
 email: johnwilger@gmail.com
 executables: []
@@ -148,7 +159,6 @@ files:
 - lib/boombera/content_item.rb
 - lib/boombera/information.rb
 - spec/integration/boombera_spec.rb
-- spec/lib/boombera/content_item_map_resolver_spec.rb
 - spec/lib/boombera/content_item_spec.rb
 - spec/lib/boombera_spec.rb
 - spec/spec_helper.rb
@@ -166,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2561778337164614726
+      hash: -4409328939730188519
       segments: 
       - 0
       version: "0"

data/spec/lib/boombera/content_item_map_resolver_spec.rb

@@ -1,66 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
-
-describe Boombera::ContentItem::MapResolver do
-  describe '#resolve' do
-    context 'with an existing content item' do
-      it 'returns a ContentItem instance for the found document' do
-        view_result = {'rows' => [{'id' => '123', 'value' => '/foo'}]}
-        db = mock(CouchRest::Database)
-        db.should_receive(:view) \
-          .with('boombera/content_map', :key => '/foo') \
-          .and_return(view_result)
-        db.should_receive(:get) \
-          .with('123') \
-          .and_return(CouchRest::Document.new('path' => '/foo', 'body' => 'bar'))
-        result = Boombera::ContentItem::MapResolver.new('/foo', db).resolve
-        result.path.should == '/foo'
-        result.body.should == 'bar'
-      end
-    end
-
-    context 'with a non-existant content item' do
-      it 'returns nil' do
-        view_result = {'rows' => []}
-        db = mock(CouchRest::Database)
-        db.should_receive(:view) \
-          .with('boombera/content_map', :key => '/foo') \
-          .and_return(view_result)
-        Boombera::ContentItem::MapResolver.new('/foo', db).resolve.should == nil
-      end
-    end
-
-    context 'with a path that maps to another content item' do
-      it 'returns the mapped content item' do
-        map_view_result = {'rows' => [{'id' => '123', 'value' => '/bar'}]}
-        content_view_result = {'rows' => [{'id' => '456', 'value' => '/bar'}]}
-        db = mock(CouchRest::Database)
-        db.should_receive(:view) \
-          .with('boombera/content_map', :key => '/foo') \
-          .and_return(map_view_result)
-        db.should_receive(:view) \
-          .with('boombera/content_map', :key => '/bar') \
-          .and_return(content_view_result)
-        db.should_receive(:get) \
-          .with('456') \
-          .and_return(CouchRest::Document.new('path' => '/bar', 'body' => 'bar'))
-        result = Boombera::ContentItem::MapResolver.new('/foo', db).resolve
-        result.path.should == '/bar'
-        result.body.should == 'bar'
-      end
-
-      it 'returns the pointer content item when passed the :resolve_map option as false' do
-        map_view_result = {'rows' => [{'id' => '123', 'value' => '/bar'}]}
-        db = mock(CouchRest::Database)
-        db.should_receive(:view) \
-          .with('boombera/content_map', :key => '/foo') \
-          .and_return(map_view_result)
-        db.should_receive(:get) \
-          .with('123') \
-          .and_return(CouchRest::Document.new('path' => '/foo', 'maps_to' => '/bar'))
-        result = Boombera::ContentItem::MapResolver.new('/foo', db, :resolve_map => false).resolve
-        result.path.should == '/foo'
-        result.maps_to.should == '/bar'
-      end
-    end
-  end
-end