CHEF-222: chef 0.9 compat without client trying to connect to the couch server

  Removed private method specifications
  Shifted CouchDB version detection into view_uri

Author: AJ Christensen

chef/lib/chef/config.rb

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

chef/lib/chef/couchdb.rb

@@ -25,11 +25,10 @@
 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
@@ -152,6 +151,7 @@ def safe_name(name)
     end
 
     def view_uri(design, view)
+      Chef::Config[:couchdb_version] ||= @rest.run_request(:GET, URI.parse(@rest.url + "/"), false, 10, false)["version"].gsub(/-.+/,"").to_f
       case Chef::Config[:couchdb_version]
       when 0.9
         "#{Chef::Config[:couchdb_database]}/_design/#{design}/_view/#{view}"

chef/spec/unit/couchdb_spec.rb

@@ -36,10 +36,6 @@
     Chef::REST.should_receive(:new).with("http://monkeypants")
     Chef::CouchDB.new("http://monkeypants")
   end  
-  
-  it "should parse the CouchDB version number" do
-    
-  end
 end
 
 describe Chef::CouchDB, "create_db" do
@@ -262,34 +258,4 @@ def do_delete(rev=nil)
     @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