boombera 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/boombera.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boombera}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "boombera.gemspec",
     "lib/boombera.rb",
     "lib/boombera/content_item.rb",
+    "lib/boombera/information.rb",
     "spec/integration/boombera_spec.rb",
     "spec/lib/boombera/content_item_spec.rb",
     "spec/lib/boombera_spec.rb",

data/lib/boombera.rb

@@ -1,48 +1,18 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__)))
 require 'couchrest'
+
+# Boombera constant is defined first as `Class.new` so that the definitions in
+# the required files can use `class Boombera::Whatever` even with the `require`
+# statements appearing before the actual class definition.
+Boombera = Class.new
+
 require 'boombera/content_item'
+require 'boombera/information'
 
 class Boombera
   VersionMismatch = Class.new(StandardError)
 
-  class << self
-    def version
-      File.read(File.expand_path(File.join(File.dirname(__FILE__), '..', 'VERSION')))
-    end
-
-    def database_version(db)
-      db.get('_design/boombera')['gem_version']
-    rescue RestClient::ResourceNotFound
-      nil
-    end
-
-    def install_design_doc!(database)
-      db = CouchRest.database!(database)
-      design = design_doc
-      existing = db.documents(:key => '_design/boombera')['rows'].first
-      design['_rev'] = existing['value']['rev'] unless existing.nil?
-      db.save_doc(design)
-    end
-
-    def design_doc
-      {
-        '_id' => '_design/boombera',
-        'language' => 'javascript',
-        'gem_version' => version,
-        'views' => {
-          'content_map' => {
-            'map' => <<-EOF
-              function(doc) {
-                if (doc['path']) {
-                  emit(doc.path, doc.path);
-                }
-              }
-              EOF
-          }
-        }
-      }
-    end
-  end
+  extend Boombera::Information
 
   attr_reader :db
 
@@ -52,8 +22,8 @@ class Boombera
   end
 
   def put(path, body)
-    content_item = get(path) || ContentItem.new(:path => path, :database => db)
-    content_item.body = body
+    content_item = get(path) and content_item.body = body
+    content_item ||= ContentItem.new(path, body, db)
     content_item.save
   end
 

data/lib/boombera/content_item.rb

@@ -1,33 +1,41 @@
-class Boombera
-  class ContentItem < CouchRest::Document
-    class << self
-      def get(path, database)
-        rows = database.view('boombera/content_map', :key => path)['rows']
-        return nil if rows.empty?
-        id = rows.first['id']
-        new(database.get(id))
-      end
+class Boombera::ContentItem < CouchRest::Document
+  class << self
+    def get(path, database)
+      rows = database.view('boombera/content_map', :key => path)['rows']
+      return nil if rows.empty?
+      id = rows.first['id']
+      new(database.get(id))
     end
+  end
 
-    def initialize(pkeys = {})
-      @database = if pkeys.respond_to?(:database)
-                    pkeys.database
-                  else
-                    pkeys.delete(:database)
-                  end
-      super
-    end
+  attr_accessor :body
+  attr_reader :path
 
-    def path
-      self[:path]
+  def initialize(doc_or_path, body = nil, database = nil)
+    case doc_or_path
+    when CouchRest::Document
+      @database = doc_or_path.database
+      super(doc_or_path)
+    when String
+      @database = database
+      super(:path => 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 body
-      self[:body]
-    end
+  # :nodoc:
+  def path
+    self[:path]
+  end
 
-    def body=(new_body)
-      self[:body] = new_body
-    end
+  # :nodoc:
+  def body
+    self[:body]
+  end
+
+  # :nodoc:
+  def body=(new_body)
+    self[:body] = new_body
   end
 end

data/lib/boombera/information.rb

@@ -0,0 +1,45 @@
+module Boombera::Information
+  def version
+    File.read(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')))
+  end
+
+  def database_version(db)
+    doc = current_design_doc(db)
+    doc && doc['gem_version']
+  end
+
+  def install_design_doc!(database)
+    db = CouchRest.database!(database)
+    existing = current_design_doc(db)
+    design = design_doc
+    design['_rev'] = existing['_rev'] unless existing.nil?
+    db.save_doc(design)
+  end
+
+  def design_doc
+    {
+      '_id' => '_design/boombera',
+      'language' => 'javascript',
+      'gem_version' => version,
+      'views' => {
+        'content_map' => {
+          'map' => <<-EOF
+            function(doc) {
+              if (doc['path']) {
+                emit(doc.path, doc.path);
+              }
+            }
+            EOF
+        }
+      }
+    }
+  end
+
+  private
+
+  def current_design_doc(db)
+    db.get('_design/boombera')
+  rescue RestClient::ResourceNotFound
+    nil
+  end
+end

data/spec/lib/boombera/content_item_spec.rb

@@ -11,7 +11,7 @@ describe Boombera::ContentItem do
           .and_return(view_result)
         db.should_receive(:get) \
           .with('123') \
-          .and_return({'path' => '/foo', 'body' => 'bar'})
+          .and_return(CouchRest::Document.new('path' => '/foo', 'body' => 'bar'))
         result = Boombera::ContentItem.get('/foo', db)
         result.path.should == '/foo'
         result.body.should == 'bar'
@@ -20,11 +20,9 @@ describe Boombera::ContentItem do
   end
 
   describe '.new' do
-    context 'when passed a plain hash' do
-      it 'sets the database from the params hash' do
-        content_item = Boombera::ContentItem.new(:path => '/foo',
-                                                 :body => 'bar',
-                                                 :database => :the_database)
+    context 'when passed a path, body and database' do
+      it 'sets the database from the database argument' do
+        content_item = Boombera::ContentItem.new('/foo', 'bar', :the_database)
         content_item.database.should == :the_database
       end
     end
@@ -41,21 +39,21 @@ describe Boombera::ContentItem do
 
   describe '#path' do
     it 'returns the path from the associated document' do
-      content = Boombera::ContentItem.new('path' => '/index.html')
+      content = Boombera::ContentItem.new('/index.html')
       content.path.should == '/index.html'
     end
   end
 
   describe '#body' do
     it 'returns the body from the associated document' do
-      content = Boombera::ContentItem.new('body' => 'foo bar baz')
+      content = Boombera::ContentItem.new('/foo', 'foo bar baz')
       content.body.should == 'foo bar baz'
     end
   end
 
   describe '#body=' do
     it 'overwrites the current contents of the document body' do
-      content = Boombera::ContentItem.new('body' => 'foo')
+      content = Boombera::ContentItem.new('/foo', 'not bar')
       content.body = 'bar'
       content.body.should == 'bar'
     end

data/spec/lib/boombera_spec.rb

@@ -38,7 +38,6 @@ describe Boombera do
     let(:content_item) { mock(Boombera::ContentItem) }
     let(:content_item_save_expectations) do
       lambda {
-        content_item.should_receive(:body=).with('bar')
         content_item.should_receive(:save).and_return(true)
         boombera = Boombera.new('boombera_test')
         boombera.put('/foo', 'bar').should == true
@@ -48,6 +47,7 @@ describe Boombera do
     context "to an existing path" do
       it 'updates and saves the existing content item' do
         Boombera::ContentItem.should_receive(:get).with('/foo', db).and_return(content_item)
+        content_item.should_receive(:body=).with('bar')
         content_item_save_expectations.call
       end
     end
@@ -56,7 +56,7 @@ describe Boombera do
       it 'creates and saves the existing content item' do
         Boombera::ContentItem.stub!(:get => nil)
         Boombera::ContentItem.should_receive(:new) \
-          .with(:path => '/foo', :database => db) \
+          .with('/foo', 'bar', db) \
           .and_return(content_item)
         content_item_save_expectations.call
       end
@@ -78,10 +78,11 @@ describe Boombera do
         CouchRest.should_receive(:database!) \
           .with('boombera_test') \
           .and_return(db)
-        db.should_receive(:documents) \
-          .with(:key => '_design/boombera') \
-          .and_return({'rows' => []})
-        db.should_receive(:save_doc).with(Boombera.design_doc)
+        db.should_receive(:get) \
+          .with('_design/boombera') \
+          .and_raise(RestClient::ResourceNotFound)
+        db.should_receive(:save_doc) \
+          .with(Boombera.design_doc)
         Boombera.install_design_doc!('boombera_test')
       end
     end
@@ -91,9 +92,9 @@ describe Boombera do
         CouchRest.should_receive(:database!) \
           .with('boombera_test') \
           .and_return(db)
-        db.should_receive(:documents) \
-          .with(:key => '_design/boombera') \
-          .and_return({'rows' => [{'value' => {'rev' => '123'}}]})
+        db.should_receive(:get) \
+          .with('_design/boombera') \
+          .and_return({'_id' => '_design/boombera', '_rev' => '123'})
         db.should_receive(:save_doc).with(Boombera.design_doc.merge('_rev' => '123'))
         Boombera.install_design_doc!('boombera_test')
       end

metadata

@@ -2,7 +2,7 @@
 name: boombera
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - John Wilger
@@ -146,6 +146,7 @@ files:
 - boombera.gemspec
 - lib/boombera.rb
 - lib/boombera/content_item.rb
+- lib/boombera/information.rb
 - spec/integration/boombera_spec.rb
 - spec/lib/boombera/content_item_spec.rb
 - spec/lib/boombera_spec.rb
@@ -164,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3756736400322567909
+      hash: 2330631431022327628
       segments: 
       - 0
       version: "0"