Merge branch 'master' into skeptomai/chef-174

Author: adamhjk

chef-server/bin/chef-server

@@ -63,6 +63,7 @@ class Config
       :remotefile_url => "http://localhost:4000",
       :search_url => "http://localhost:4000",
       :couchdb_database => "chef",
+      :couchdb_version => nil,
       :openid_store_couchdb => false,
       :openid_cstore_couchdb => false,
       :openid_store_path => "/var/chef/openid/db",

chef/lib/chef/config.rb

@@ -25,10 +25,11 @@
 class Chef
   class CouchDB
     include Chef::Mixin::ParamsValidate
-    
+
     def initialize(url=nil)
       url ||= Chef::Config[:couchdb_url]
       @rest = Chef::REST.new(url)
+      Chef::Config[:couchdb_version] ||= @rest.run_request(:GET, URI.parse(@rest.url + "/"), false, 10, false)["version"].gsub(/-.+/,"").to_f
     end
 
     def create_db
@@ -119,9 +120,9 @@ def list(view, inflate=false)
         }
       )
       if inflate
-        @rest.get_rest("#{Chef::Config[:couchdb_database]}/_view/#{view}/all")
+        @rest.get_rest(view_uri(view, "all"))
       else
-        @rest.get_rest("#{Chef::Config[:couchdb_database]}/_view/#{view}/all_id")
+        @rest.get_rest(view_uri(view, "all_id"))
       end
     end
 
@@ -145,9 +146,19 @@ def has_key?(obj_type, name)
     end
 
     private
-      def safe_name(name)
-        name.gsub(/\./, "_")
+    
+    def safe_name(name)
+      name.gsub(/\./, "_")
+    end
+      
+    def view_uri(design, view)
+      case Chef::Config[:couchdb_version]
+      when 0.9
+        "#{Chef::Config[:couchdb_database]}/_design/#{design}/_view/#{view}"
+      when 0.8
+        "#{Chef::Config[:couchdb_database]}/_view/#{design}/#{view}"
       end
+    end
 
   end
 end

chef/lib/chef/couchdb.rb

@@ -19,15 +19,26 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "spec_helper"))
 
 describe Chef::CouchDB, "new" do
+  before do
+    @mock_rest = mock("Chef::REST", :null_object => true)
+    @mock_rest.stub!(:run_request).and_return({"couchdb" => "Welcome", "version" =>"0.9.0"})
+    @mock_rest.stub!(:url).and_return("http://localhost:5984")
+    Chef::REST.stub!(:new).and_return(@mock_rest)
+  end
+  
   it "should create a new Chef::REST object from the default url" do
     Chef::Config[:couchdb_url] = "http://monkey"
-    Chef::REST.should_receive(:new).with("http://monkey").and_return(true)
+    Chef::REST.should_receive(:new).with("http://monkey")
     Chef::CouchDB.new
   end
 
   it "should create a new Chef::REST object from a provided url" do
-    Chef::REST.should_receive(:new).with("http://monkeypants").and_return(true)
+    Chef::REST.should_receive(:new).with("http://monkeypants")
     Chef::CouchDB.new("http://monkeypants")
+  end  
+  
+  it "should parse the CouchDB version number" do
+    
   end
 end
 
@@ -185,18 +196,42 @@ def do_delete(rev=nil)
 
 describe Chef::CouchDB, "list" do
   before(:each) do
-    @mock_rest = mock("Chef::REST", :null_object => true)
+    @mock_rest = mock("Chef::REST", :null_object => true, :url => "http://monkeypants")
     Chef::REST.stub!(:new).and_return(@mock_rest)
+    @couch = Chef::CouchDB.new("http://monkeypants")
+    Chef::Config.stub!(:[]).with(:couchdb_database).and_return("chef")
   end
 
-  it "should get the view for all objects if inflate is true" do
-    @mock_rest.should_receive(:get_rest).with("chef/_view/node/all").and_return(true)
-    Chef::CouchDB.new.list("node", true)
+  describe "on couchdb 0.8" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.8)
+    end
+    
+    it "should get the view for all objects if inflate is true" do
+      @mock_rest.should_receive(:get_rest).with("chef/_view/node/all").and_return(true)
+      @couch.list("node", true)
+    end
+
+    it "should get the view for just the object id's if inflate is false" do
+      @mock_rest.should_receive(:get_rest).with("chef/_view/node/all_id").and_return(true)
+      @couch.list("node", false)
+    end
   end
-  
-  it "should get the view for just the object id's if inflate is false" do
-    @mock_rest.should_receive(:get_rest).with("chef/_view/node/all_id").and_return(true)
-    Chef::CouchDB.new.list("node", false)
+
+  describe "on couchdb 0.9" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.9)
+    end
+    
+    it "should get the view for all objects if inflate is true" do
+      @mock_rest.should_receive(:get_rest).with("chef/_design/node/_view/all").and_return(true)
+      @couch.list("node", true)
+    end
+
+    it "should get the view for just the object id's if inflate is false" do
+      @mock_rest.should_receive(:get_rest).with("chef/_design/node/_view/all_id").and_return(true)
+      @couch.list("node", false)
+    end
   end
 end
 
@@ -216,3 +251,45 @@ def do_delete(rev=nil)
     Chef::CouchDB.new.has_key?("node", "bob").should eql(false)
   end
 end
+
+describe Chef::CouchDB, "safe_name" do
+  before do
+    @couchdb = mock("Chef::CouchDB", :null_object => true)
+    Chef::CouchDB.stub!(:new).and_return(@couchdb)
+  end
+  
+  it "should convert the name to a safe name" do
+    @couchdb.should_receive(:safe_name).with("asdf.lol.com").and_return("asdf_lol_com")
+    @couchdb.safe_name("asdf.lol.com")
+  end
+end
+
+describe Chef::CouchDB, "view_uri" do
+  before do
+    @couchdb = mock("Chef::CouchDB", :null_object => true)
+    Chef::CouchDB.stub!(:new).and_return(@couchdb)
+    Chef::Config.stub!(:[]).with(:couchdb_database).and_return("chef")
+  end
+  
+  describe "on couchdb 0.8" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.8)
+    end
+    
+    it "should output an appropriately formed view URI" do
+      @couchdb.should_receive(:view_uri).with("nodes", "all").and_return("chef/_view/nodes/all")
+      @couchdb.view_uri("nodes", "all")
+    end
+  end
+
+  describe "on couchdb 0.9" do
+    before do
+      Chef::Config.stub!(:[]).with(:couchdb_version).and_return(0.9)
+    end
+
+    it "should output an appropriately formed view URI" do
+      @couchdb.should_receive(:view_uri).with("nodes", "all").and_return("chef/_design/nodes/_view/all")
+      @couchdb.view_uri("nodes", "all")
+    end
+  end
+end