Merge branch 'fujin/chef-222'

Conflicts:

	chef/spec/unit/couchdb_spec.rb

Author: adamhjk

chef/lib/chef/couchdb.rb

@@ -144,12 +144,6 @@ def has_key?(obj_type, name)
       end
     end
 
-    private
-    
-    def safe_name(name)
-      name.gsub(/\./, "_")
-    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]
@@ -159,6 +153,12 @@ def view_uri(design, view)
         "#{Chef::Config[:couchdb_database]}/_view/#{design}/#{view}"
       end
     end
-
+    
+    private
+    
+    def safe_name(name)
+      name.gsub(/\./, "_")
+    end
+      
   end
 end

chef/spec/unit/couchdb_spec.rb

@@ -248,14 +248,48 @@ def do_delete(rev=nil)
   end
 end
 
-describe Chef::CouchDB, "safe_name" do
+describe Chef::CouchDB, "view_uri" do
   before do
-    @couchdb = mock("Chef::CouchDB", :null_object => true)
-    Chef::CouchDB.stub!(:new).and_return(@couchdb)
+    @mock_rest = mock("Chef::REST", :null_object => true, :url => "http://monkeypants")
+    Chef::REST.stub!(:new).and_return(@mock_rest)
+    @couchdb = Chef::CouchDB.new("http://localhost")    
+  end
+  
+  describe "when the couchdb version is unknown" do
+    it "should set the couchdb version appropriately" do
+      ov = Chef::Config[:couchdb_version]
+      Chef::Config[:couchdb_version] = nil      
+      @mock_rest.should_receive(:run_request).with(
+        :GET, 
+        URI.parse("http://monkeypants/"), 
+        false, 
+        10, 
+        false
+      ).and_return({ "version" => "0.9" })
+      @couchdb.view_uri("nodes", "all")
+      Chef::Config[:couchdb_version] = ov
+    end
   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")
+  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