couchobject 0.5.0 → 0.6.0

data/spec/server_spec.rb

@@ -3,19 +3,19 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 describe CouchObject::Server do
   
   it "should initialize with a URI" do
-    server = CouchObject::Server.new("http://localhost:8888")
+    server = CouchObject::Server.new("http://localhost:5984")
     server.host.should == "localhost"
-    server.port.should == 8888
+    server.port.should == 5984
   end
   
   it "should have a connection active when its initialized" do
-    server = CouchObject::Server.new("http://localhost:8888")
+    server = CouchObject::Server.new("http://localhost:5984")
     server.connection.should_not be(nil)    
     server.connection.class.should == Net::HTTP
   end
   
   it "should dispatch requests" do
-    server = CouchObject::Server.new("http://localhost:8888")
+    server = CouchObject::Server.new("http://localhost:5984")
     request = mock(Net::HTTP::Get)
     server.connection.should_receive(:request).with(request).and_return("response")
     server.request(request)
@@ -24,7 +24,7 @@ end
 
 describe CouchObject::Server, "Request methods" do
   before(:each) do
-    @server = CouchObject::Server.new("http://localhost:8888")
+    @server = CouchObject::Server.new("http://localhost:5984")
     @mock_request = mock("Net::HTTP::{requestmethod}")
   end
   

data/spec/utils_spec.rb

@@ -15,4 +15,64 @@ describe CouchObject::Utils do
     CouchObject::Utils.join_url("/foo/", "/bar").should == "foo/bar"
     CouchObject::Utils.join_url("/foo/", "/bar/").should == "foo/bar"
   end
+  
+  it "should be able to add %22 to the beginning and end of a string" do
+    CouchObject::Utils.encode_querystring_parameter("hei").
+      should == "%22hei%22"
+  end
+  
+  it "should be able to encode values correctly" do
+    CouchObject::Utils.encode_querystring_parameter(123).
+      should == "123"
+      
+    CouchObject::Utils.encode_querystring_parameter("hallo").
+      should == "%22hallo%22"    
+
+    CouchObject::Utils.encode_querystring_parameter(true).
+      should == "true"
+
+    CouchObject::Utils.encode_querystring_parameter(false).
+      should == "false"
+
+    CouchObject::Utils.encode_querystring_parameter(123123123123123123123).
+      should == "123123123123123123123"      
+              
+    CouchObject::Utils.encode_querystring_parameter([12123,"ASD", \
+      true,false,123123123123123123123123]).
+      should == "[12123,%22ASD%22,true,false,123123123123123123123123]"
+
+    CouchObject::Utils.encode_querystring_parameter("http://hei.com").
+      should == JSON.unparse("%22http://hei.com%22")[1..-2]
+      
+  end
+
+  # it "should convert strings in arrays and hashes to UTF-8" do
+  # 
+  #   a_encoded = "Math: ∮ E⋅da = Q,  n → ∞, ∑ f(i) = ∏ g(i),"
+  #   a_decoded = "Math: ∮ E⋅da = Q,  n → ∞, ∑ f(i) = ∏ g(i),"
+  #   b_encoded = "Geek: STARGΛ̊TE SG-1"
+  #   b_decoded = "Geek: STARG캛첊TE SG-1" # This is what we want though... "Geek: STARGΛ̊TE SG-1"
+  #   c_encoded = "Braille: ⡌⠁⠧⠑ ⠼⠁⠒  ⡍⠜⠇⠑⠹⠰⠎ ⡣⠕⠌"
+  #   c_decoded = "Braille: ⡌⠁⠧⠑ ⠼⠁⠒  ⡍⠜⠇⠑⠹⠰⠎ ⡣⠕⠌"
+  #   d_encoded = "На берегу пустынных волн"
+  #   d_decoded = "На берегу пустынных волн"
+  #   e_encoded = "Russian: На берегу пустынных волн"
+  #   e_decoded = "Russian: На берегу пустынных волн"
+  # 
+  #   array_before = [a_encoded,[b_encoded,[c_encoded,[d_encoded,[e_encoded]]]]]
+  #   array_after = [a_decoded,[b_decoded,[c_decoded,[d_decoded,[e_decoded]]]]]
+  #   
+  #   CouchObject::Utils::decode_strings(array_before).should == array_after
+  #   
+  #   hash_before = {:key => a_encoded, :sub => {:other_key => b_encoded, :more_keys => c_encoded}, :ha => d_encoded, :other_sub => {:ja => e_encoded}}
+  #   hash_after  = {:key => a_decoded, :sub => {:other_key => b_decoded, :more_keys => c_decoded}, :ha => d_decoded, :other_sub => {:ja => e_decoded}}
+  #   
+  #   CouchObject::Utils::decode_strings(hash_before).should == hash_after
+  #   
+  #   mix_before = [a_encoded, {:key => b_encoded, :array => [c_encoded, 123, true]}]
+  #   mix_after = [a_decoded, {:key => b_decoded, :array => [c_decoded, 123, true]}]    
+  #   
+  #   CouchObject::Utils::decode_strings(mix_before).should == mix_after
+  #   
+  # end
 end

data/spec/view_spec.rb

@@ -4,33 +4,66 @@ describe CouchObject::View do
 
   before(:each) do
     @server = mock("CouchObject::Server mock")
-    @db = CouchObject::Database.open("http://localhost:8888/foo")
+    @db = CouchObject::Database.open("http://localhost:5984/foo")
     @db.server = @server
     @js = "function(doc){ return doc }"
     @response = mock("Net::HTTP::Response")
     @response.stub!(:code).and_return(200)
-    @response.stub!(:body).and_return(%Q'{"view":"_foo_view:#{@js}","total_rows":0,"rows":[]}')
+    @response.stub!(:body).
+      and_return(%Q'{"view":"_foo_view:#{@js}","total_rows":0,"rows":[]}')
+    @other_response = mock("Net::HTTP::Response")
+    @other_response.stub!(:body).
+      and_return(%Q'{"total_rows":3,"offset":0,"rows":[{"id":"foo_1","key":"foo","value":"bar_1"},{"id":"foo_2","key":"foo","value":"bar_2"},{"id":"foo_3","key":"foo","value":"bar_3"}]}')
   end
   
   it "should create a new views" do
-    @db.should_receive(:post).with("/foo/_view_myview", @js).and_return(@response)
+    @db.should_receive(:put).
+      with("_design%2Fmyview", @js).and_return(@response)
+
     CouchObject::View.create(@db, "myview", @js)    
   end
   
   it "should initialzie with db and name and have a view name" do
     view = CouchObject::View.new(@db, "myview")
-    view.name.should == "_view_myview"
+    view.name.should == "_view/myview"
     view.db.should == @db
   end
   
   it "should delete a view" do
     view = CouchObject::View.new(@db, "myview")
-    @db.should_receive(:delete).with("/foo/_view_myview").and_return(true)
+    @db.should_receive(:delete).with("/foo/_view/myview").and_return(true)
     view.delete
   end
   
-  # it "should query the database with itself"
+  it "should query the database with itself" do
+    @db.should_receive(:get).
+      with("_view/myview").and_return(@other_response)
+
+    view = CouchObject::View.new(@db,"myview")
+    return_value = view.query
+    return_value.should be_a_kind_of(Array)
+    return_value.size.should == 3
+    return_value[0].should == "bar_1"
+    return_value[1].should == "bar_2"
+    return_value[2].should == "bar_3"
+  end
+
+  it "should be possible to query the database by supplying only an URI string on initialization" do    
+    view = CouchObject::View.new("http://localhost:5984/foo","myview")
+    db = view.db
+    db.should_receive(:get).
+      with("_view/myview").and_return(@other_response)
+      
+    return_value = view.query
+    return_value.should be_a_kind_of(Array)
+    return_value.size.should == 3
+    return_value[0].should == "bar_1"
+    return_value[1].should == "bar_2"
+    return_value[2].should == "bar_3"
+  end
+
+  
   # it "should have a ::query singleton for temp view queries"
   # it "should iterate over the results"
-  # 
+
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>CouchObject</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/couch_object"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/couch_object" class="numbers">0.5.0</a>
+      <a href="http://rubyforge.org/projects/couch_object" class="numbers">0.6.0</a>
     </div>
     <h1>&#x2192; &#8216;couch_object&#8217;</h1>
 
@@ -41,7 +41,7 @@
 	<h2>What</h2>
 
 
-	<p>CouchObject is a set of classes to help you talk to <a href="http://couchdbwiki.com/">CouchDb</a> with and in Ruby.</p>
+	<p>CouchObject is a set of classes to help you talk to <a href="http://incubator.apache.org/couchdb/">CouchDB</a> with and in Ruby.</p>
 
 
 	<h2>Installing</h2>
@@ -59,30 +59,45 @@
 	<p>See the <a href="http://couchobject.rubyforge.org/rdoc/">RDoc</a></p>
 
 
-	<h2>How to submit patches</h2>
+	<h2>Getting the source and how to submit patches</h2>
+
+
+	<h3>Getting the source</h3>
 
 
 <pre>
-  $ git clone git://repo.or.cz/couchobject.git
+  $ git clone git://gitorious.org/couchobject/mainline.git
 </pre>
 
+	<h3>Contributing</h3>
+
+
+	<p>Create a public clone on http://gitorious.org/projects/couchobject and submit a merge request via the web interface.</p>
+
+
 	<h2>License</h2>
 
 
 	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 
 
-	<h2>Contact</h2>
+	<h2>Authors &#38; Contact</h2>
 
 
 	<ul>
 	<li>Author: Johan Sørensen</li>
 		<li>Contact: johan (at) johansorensen <span class="caps">DOT</span> com</li>
 		<li>Home: <a href="http://rubyforge.org/projects/couchobject/">Rubyforge</a> | <a href="http://couchobject.rubyforge.org">Rubyforge hme</a></li>
-		<li>Source (Git): <a href="http://repo.or.cz/w/couchobject.git">http://repo.or.cz/w/couchobject.git</a></li>
+		<li>Source (Git): <a href="http://gitorious.org/projects/couchobject">http://gitorious.org/projects/couchobject</a></li>
+	</ul>
+
+
+	<ul>
+	<li>Author: Sebastian Probst Eide</li>
+		<li>Contact: sebastian.probst.eide (at) gmail <span class="caps">DOT</span> com</li>
 	</ul>
     <p class="coda">
-      <a href="">TODO</a>, 15th September 2007<br>
+      <a href="">TODO</a>, 12th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -5,7 +5,7 @@ h1. → 'couch_object'
 
 h2. What
 
-CouchObject is a set of classes to help you talk to "CouchDb":http://couchdbwiki.com/ with and in Ruby.
+CouchObject is a set of classes to help you talk to "CouchDB":http://incubator.apache.org/couchdb/ with and in Ruby.
 
 h2. Installing
 
@@ -18,20 +18,28 @@ h2. Demonstration of usage
 
 See the "RDoc":http://couchobject.rubyforge.org/rdoc/
 
-h2. How to submit patches
+h2. Getting the source and how to submit patches
+
+h3. Getting the source
 
 <pre>
-  $ git clone git://repo.or.cz/couchobject.git
+  $ git clone git://gitorious.org/couchobject/mainline.git
 </pre>
 
+h3. Contributing
+
+Create a public clone on http://gitorious.org/projects/couchobject and submit a merge request via the web interface.
+
 h2. License
 
 This code is free to use under the terms of the MIT license. 
 
-h2. Contact
+h2. Authors & Contact
 
 * Author: Johan Sørensen
 * Contact: johan (at) johansorensen DOT com
 * Home: "Rubyforge":http://rubyforge.org/projects/couchobject/ | "Rubyforge hme":http://couchobject.rubyforge.org
-* Source (Git): "http://repo.or.cz/w/couchobject.git":http://repo.or.cz/w/couchobject.git
+* Source (Git): "http://gitorious.org/projects/couchobject":http://gitorious.org/projects/couchobject
 
+* Author: Sebastian Probst Eide
+* Contact: sebastian.probst.eide (at) gmail DOT com

metadata

@@ -1,33 +1,48 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: couchobject
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-09-15 00:00:00 +02:00
-summary: CouchObject is a library that maps ruby objects to CouchDb documents
-require_paths: 
-- lib
-email: johan@johansorensen.com
-homepage: http://couchobject.rubyforge.org
-rubyforge_project: couchobject
-description: CouchObject is a library that maps ruby objects to CouchDb documents
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.6.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - "Johan S\xC3\xB8rensen"
+- Sebastian Probst Eide
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-13 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.7
+    version: 
+description: CouchObject is a library that maps ruby objects to CouchDb documents
+email: johan@johansorensen.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- License.txt
+- Manifest.txt
+- README.txt
+- website/index.txt
 files: 
 - History.txt
 - License.txt
@@ -35,15 +50,16 @@ files:
 - README.txt
 - Rakefile
 - TODO
-- bin/couch_ruby_view_requestor
 - config/hoe.rb
 - config/requirements.rb
 - lib/couch_object.rb
 - lib/couch_object/database.rb
 - lib/couch_object/document.rb
-- lib/couch_object/model.rb
+- lib/couch_object/error_classes.rb
 - lib/couch_object/persistable.rb
-- lib/couch_object/proc_condition.rb
+- lib/couch_object/persistable/has_many_relations_array.rb
+- lib/couch_object/persistable/meta_classes.rb
+- lib/couch_object/persistable/overloaded_methods.rb
 - lib/couch_object/response.rb
 - lib/couch_object/server.rb
 - lib/couch_object/utils.rb
@@ -56,13 +72,36 @@ files:
 - script/txt2html
 - setup.rb
 - spec/database_spec.rb
+- spec/database_spec.rb.orig
 - spec/document_spec.rb
 - spec/integration/database_integration_spec.rb
 - spec/integration/document_integration_spec.rb
 - spec/integration/integration_helper.rb
-- spec/model_spec.rb
-- spec/persistable_spec.rb
-- spec/proc_condition_spec.rb
+- spec/persistable/callback.rb
+- spec/persistable/callback_spec.rb
+- spec/persistable/cloning.rb
+- spec/persistable/cloning_spec.rb
+- spec/persistable/comparing_objects.rb
+- spec/persistable/comparing_objects_spec.rb
+- spec/persistable/deleting.rb
+- spec/persistable/deleting_spec.rb
+- spec/persistable/error_messages.rb
+- spec/persistable/error_messages_spec.rb
+- spec/persistable/loading.rb
+- spec/persistable/loading_spec.rb
+- spec/persistable/new_methods.rb
+- spec/persistable/new_methods_spec.rb
+- spec/persistable/persistable_helper.rb
+- spec/persistable/relations.rb
+- spec/persistable/relations_spec.rb
+- spec/persistable/saving.rb
+- spec/persistable/saving_spec.rb
+- spec/persistable/setting_storage_location.rb
+- spec/persistable/setting_storage_location_spec.rb
+- spec/persistable/timestamps.rb
+- spec/persistable/timestamps_spec.rb
+- spec/persistable/unsaved_changes.rb
+- spec/persistable/unsaved_changes_spec.rb
 - spec/response_spec.rb
 - spec/rspec_autotest.rb
 - spec/server_spec.rb
@@ -79,39 +118,32 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
-test_files: 
-- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://couchobject.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- website/index.txt
-executables: 
-- couch_ruby_view_requestor
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby2ruby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.7
-    version: 
+rubyforge_project: couchobject
+rubygems_version: 1.1.0
+signing_key: 
+specification_version: 2
+summary: CouchObject is a library that maps ruby objects to CouchDb documents
+test_files: 
+- spec/spec_helper.rb