couchmodel 0.1.0.beta3 → 0.1.0.beta4

data/spec/integration/basic_spec.rb

@@ -15,7 +15,7 @@ class User < CouchModel::Base
   setup_database DATABASE
 
   key_accessor :username
-  key_accessor :email
+  key_accessor :email, :default => "no email"
 
   has_many :memberships,
            :class_name  => "Membership",
@@ -41,7 +41,7 @@ describe "integration" do
   context "on new models" do
 
     before :each do
-      @user = User.new :username => "user", :email => "email"
+      @user = User.new :username => "user"
     end
 
     describe "setup" do
@@ -82,16 +82,10 @@ describe "integration" do
   context "on saved models" do
 
     before :each do
-      @user_one = User.new :username => "user one", :email => "email one"
-      @user_one.save
-      @user_two = User.new :username => "user two", :email => "email two"
-      @user_two.save
-      @membership_one = Membership.new :created_at => "yesterday"
-      @membership_one.user = @user_one
-      @membership_one.save
-      @membership_two = Membership.new :created_at => "yesterday"
-      @membership_two.user = @user_two
-      @membership_two.save
+      @user_one = User.create :username => "user one"
+      @user_two = User.create :username => "user two"
+      @membership_one = Membership.create :created_at => "yesterday", :user => @user_one
+      @membership_two = Membership.create :created_at => "yesterday", :user => @user_two
     end
 
     describe "save" do
@@ -133,6 +127,14 @@ describe "integration" do
 
     end
 
+    describe "count" do
+
+      it "should return the number of users" do
+        User.count.should >= 2
+      end
+
+    end
+
     describe "belongs_to" do
 
       it "should return the related model" do
@@ -161,6 +163,18 @@ describe "integration" do
 
     end
 
+    describe "user_count" do
+
+      before :each do
+        @rows = User.user_count :returns => :rows
+      end
+
+      it "should return the user count" do
+        @rows.first.value.should >= 2
+      end
+
+    end
+
   end
 
 end

data/spec/integration/design/membership.design

@@ -1,5 +1,5 @@
 :id:        "membership"
 :language:  "javascript"
 :views:
-  "by_user_id_and_created_at":
+  :by_user_id_and_created_at:
     :keys:  [ "user_id", "created_at" ]

data/spec/integration/design/user.design

@@ -1,2 +1,14 @@
 :id:        "user"
 :language:  "javascript"
+:views:
+  :user_count:
+    :map:
+      function(document) {
+        if (document['model_class'] == 'User') {
+          emit('user_count', 1);
+        }
+      }
+    :reduce:
+      function(keys, values, rereduce) {
+        return sum(values);
+      }

data/spec/lib/core_extension/array_spec.rb

@@ -3,6 +3,30 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "li
 
 describe Array do
 
+  describe "resize" do
+
+    it "should extend an array to the given length with the given elements" do
+      [ 1, 2, 3 ].resize(6, 4).should == [ 1, 2, 3, 4, 4, 4 ]
+    end
+
+    it "should shrink the array to the given length" do
+      [ 1, 2, 3 ].resize(1).should == [ 1 ]
+    end
+
+    it "should return the original array if the given length fits" do
+      [ 1, 2, 3 ].resize(3).should == [ 1, 2, 3 ]
+    end
+
+    it "should not change the original array" do
+      array = [ 1, 2, 3 ]
+      lambda do
+        array.resize 6
+        array.resize 1
+      end.should_not change(array, :size)
+    end
+
+  end
+  
   describe "wrap" do
 
     it "should wrap an object into an array" do

data/spec/lib/couch_model/active_model_spec.rb

@@ -123,6 +123,14 @@ describe ActiveTestModel do
 
   end
 
+  describe "to_param" do
+
+    it "should return the model's id" do
+      @model.to_param.should == @model.id
+    end
+
+  end
+  
   describe "save" do
 
     before :each do
@@ -172,6 +180,49 @@ describe ActiveTestModel do
 
   end
 
+  describe "save!" do
+
+    before :each do
+      @model.name = "test"
+    end
+
+    it "should commit the changes" do
+      @model.save!
+      @model.should_not be_changed
+    end
+
+    it "should raise InvalidModelError on failing validations" do
+      @model.name = ""
+      lambda do
+        @model.save!
+      end.should raise_error(CouchModel::Base::InvalidModelError)
+    end
+
+    it "should raise StandardError on all other errors" do
+      @model.stub!(:save).and_return(false)
+      lambda do
+        @model.save!
+      end.should raise_error(StandardError)
+    end
+
+  end
+
+  describe "create!" do
+
+    it "should create a model" do
+      model = ActiveTestModel.create! :id => "test_model_1", :name => "test"
+      model.should be_instance_of(ActiveTestModel)
+      model.should_not be_new
+    end
+
+    it "should raise InvalidModelError on failing validations" do
+      lambda do
+        ActiveTestModel.create! :id => "test_model_1", :name => ""
+      end.should raise_error(CouchModel::Base::InvalidModelError)
+    end
+
+  end
+
   describe "destroy" do
 
     def do_destroy

data/spec/lib/couch_model/base_spec.rb

@@ -163,7 +163,36 @@ describe BaseTestModel do
     it "should return a collection for the class view" do
       BaseTestModel.all.should be_instance_of(CouchModel::Collection)
     end
-    
+
+  end
+
+  describe "create" do
+
+    it "should return a new created model" do
+      model = BaseTestModel.create :id => "test_model_1"
+      model.should be_instance_of(BaseTestModel)
+      model.should_not be_new
+    end
+
+    it "should return nil on error" do
+      CouchModel::Transport.stub!(:request).and_raise(CouchModel::Transport::UnexpectedStatusCodeError.new(500))
+      model = BaseTestModel.create :id => "test_model_1"
+      model.should be_nil
+    end
+
+  end
+
+  describe "destroy_all" do
+
+    before :each do
+      BaseTestModel.stub!(:all).and_return([ @model ])
+    end
+
+    it "should destroy all documents of the class" do
+      @model.should_receive(:destroy)
+      BaseTestModel.destroy_all
+    end
+
   end
 
 end

data/spec/lib/couch_model/collection_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "couch_model", "base"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "couch_model", "collection"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "couch_model", "row"))
 
 CouchModel::Configuration.design_directory = File.join File.dirname(__FILE__), "design"
 
@@ -30,7 +31,7 @@ describe CouchModel::Collection do
     end
 
     it "should set the options" do
-      @collection.options.should == { :option => "test" }
+      @collection.options.should == { :option => "test", :returns => :models }
     end
 
   end
@@ -41,7 +42,7 @@ describe CouchModel::Collection do
 
       it "should perform a meta fetch (with a limit of zero)" do
         CouchModel::Transport.should_receive(:request).with(anything, anything,
-          hash_including(:parameters => { "include_docs" => "true", "limit" => "0" }))
+          hash_including(:parameters => { :include_docs => true, :limit => 0 }))
         @collection.total_count
       end
 
@@ -80,10 +81,33 @@ describe CouchModel::Collection do
       do_fetch.should be_true
     end
 
-    it "should fetch the model" do
-      do_fetch
-      @collection.first.should be_instance_of(CollectionTestModel)
-      @collection.first.name.should == "phil"
+    context "returning models" do
+
+      before :each do
+        @collection.options[:returns] = :models
+      end
+
+      it "should fetch the model" do
+        do_fetch
+        @collection.first.should be_instance_of(CollectionTestModel)
+        @collection.first.name.should == "phil"
+      end
+
+    end
+
+    context "returning rows" do
+
+      before :each do
+        @collection.options[:returns] = :rows
+      end
+
+      it "should fetch the row" do
+        do_fetch
+        @collection.first.should be_instance_of(CouchModel::Row)
+        @collection.first.model.should be_instance_of(CollectionTestModel)
+        @collection.first.model.name.should == "phil"
+      end
+
     end
 
   end
@@ -92,7 +116,7 @@ describe CouchModel::Collection do
 
     it "should convert options to request parameters" do
       parameters = @collection.send :request_parameters
-      parameters.should == { "include_docs" => "true", "limit" => "1" }
+      parameters.should == { :include_docs => true, :limit => 1 }
     end
 
   end

data/spec/lib/couch_model/configuration_spec.rb

@@ -41,7 +41,7 @@ describe CouchModel::Configuration do
   describe "setup_databases" do
 
     before :each do
-      CouchModel::Configuration.class_variable_set :@@databases, [ ]
+      CouchModel::Configuration.instance_variable_set :@databases, [ ]
       @database = CouchModel::Database.new :name => "test"
       CouchModel::Configuration.register_database @database
 
@@ -83,7 +83,7 @@ describe CouchModel::Configuration do
   describe "setup_designs" do
 
     before :each do
-      CouchModel::Configuration.class_variable_set :@@designs, [ ]
+      CouchModel::Configuration.instance_variable_set :@designs, [ ]
 
       @database = CouchModel::Database.new :name => "test"
       @design = CouchModel::Design.new @database, :id => "test_design"

data/spec/lib/couch_model/core/accessor_spec.rb

@@ -16,7 +16,7 @@ describe AccessorTestModel do
   describe "key_reader" do
 
     before :each do
-      AccessorTestModel.key_reader :test
+      AccessorTestModel.key_reader :test, :default => "test default"
       @model = AccessorTestModel.new
     end
 
@@ -24,12 +24,16 @@ describe AccessorTestModel do
       @model.should respond_to(:test)
     end
 
+    it "should set a default value" do
+      @model.test.should == "test default"
+    end
+
   end
 
   describe "key_writer" do
 
     before :each do
-      AccessorTestModel.key_writer :test
+      AccessorTestModel.key_writer :test, :default => "test default"
       @model = AccessorTestModel.new
     end
 
@@ -37,12 +41,16 @@ describe AccessorTestModel do
       @model.should respond_to(:test=)
     end
 
+    it "should set a default value" do
+      @model.test.should == "test default"
+    end
+
   end
 
   describe "key_accessor" do
 
     before :each do
-      AccessorTestModel.key_accessor :test
+      AccessorTestModel.key_accessor(:test, :default => "test default")
       @model = AccessorTestModel.new
     end
 

data/spec/lib/couch_model/core/association_spec.rb

@@ -24,6 +24,10 @@ class AssociationTestModelTwo < CouchModel::Base
            :view_name   => :by_related_id_and_name,
            :query       => lambda { |name| { :startkey => [ self.id, (name || nil) ], :endkey => [ self.id, (name || { }) ] } }
 
+  has_many :also_related,
+           :class_name  => "AssociationTestModelOne",
+           :view_name   => :by_related_id_and_name
+
 end
 
 describe AssociationTestModelOne do
@@ -109,6 +113,28 @@ describe AssociationTestModelTwo do
       @model.related(@other.name).should include(@other)
     end
 
+    it "should receive an extra query hash" do
+      @model.related(@other.name, :returns => :rows).first.should be_instance_of(CouchModel::Row)
+    end
+
+  end
+
+  describe "also_related" do
+
+    before :each do
+      @other = AssociationTestModelOne.find "test_model_1"
+      @query = { :startkey => [ @model.id, @other.name ], :endkey => [ @model.id, @other.name ] }
+    end
+
+    it "should return a collection" do
+      @model.also_related(@query).should be_instance_of(CouchModel::Collection)
+    end
+
+    it "should include the test model one" do
+      @model.also_related(@query).should include(@other)
+      @model.also_related(@query).should include(@other)
+    end
+
   end
 
 end

data/spec/lib/couch_model/core/setup_spec.rb

@@ -93,4 +93,12 @@ describe SetupTestModel do
 
   end
 
+  describe "count" do
+
+    it "should return the count of all documents of this class" do
+      SetupTestModel.count.should == 14
+    end
+
+  end
+
 end

data/spec/lib/couch_model/design_spec.rb

@@ -44,10 +44,6 @@ describe CouchModel::Design do
 
     context "file does exists" do
 
-      before :each do
-        File.stub!(:exists?).and_return(true)
-      end
-
       it "should set the attributes" do
         do_load
         @design.id.should == "test_design"
@@ -64,7 +60,7 @@ describe CouchModel::Design do
     context "file doesn't exists" do
 
       before :each do
-        File.stub!(:exists?).and_return(false)
+        @design.stub!(:filename).and_return("invalid")
       end
 
       it "should return false" do

data/spec/lib/couch_model/row_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "couch_model", "base"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "couch_model", "row"))
+
+class RowTestModel < CouchModel::Base
+
+  key_accessor :name
+
+end
+
+describe CouchModel::Row do
+
+  before :each do
+    @hash = {
+      "id"    => "test id",
+      "key"   => "test key",
+      "value" => "test value",
+      "doc"   => {
+        "_id"                                 => "test doc id",
+        CouchModel::Configuration::CLASS_KEY  => "RowTestModel",
+        "name"                                => "test doc name"
+      }
+    }
+    @row = CouchModel::Row.new @hash
+  end
+
+  describe "initialize" do
+
+    it "should assign the id" do
+      @row.id.should == "test id"
+    end
+
+    it "should assign the key" do
+      @row.key.should == "test key"
+    end
+
+    it "should assign the id" do
+      @row.value.should == "test value"
+    end
+
+    it "should assign the document" do
+      @row.document.should == {
+        "_id"                                 => "test doc id",
+        CouchModel::Configuration::CLASS_KEY  => "RowTestModel",
+        "name"                                => "test doc name"
+      }
+    end
+
+  end
+
+  describe "model" do
+
+    it "should return a casted model" do
+      @row.model.should be_instance_of(RowTestModel)
+    end
+
+    it "should set the model's values" do
+      @row.model.id.should == "test doc id"
+      @row.model.name.should == "test doc name"
+    end
+
+    it "should raise a StandardError if model_class isn't defined" do
+      @row.document[CouchModel::Configuration::CLASS_KEY] = "invalid"
+      lambda do
+        @row.model
+      end.should raise_error(StandardError)
+    end
+
+  end
+
+end

data/spec/lib/couch_model/transport_spec.rb

@@ -24,7 +24,7 @@ describe CouchModel::Transport do
     end
 
     it "should initialize the correct request object" do
-      Net::HTTP::Get.should_receive(:new).with("/").and_return(@request)
+      Net::HTTP::Get.should_receive(:new).with("/", { }).and_return(@request)
       do_request
     end
 
@@ -41,4 +41,21 @@ describe CouchModel::Transport do
 
   end
 
+  describe "serialize_parameters" do
+
+    before :each do
+      @parameters = { :test => [ :test, 1, 2, 3 ], :another_test => :test }
+    end
+
+    it "should return an empty string on empty parameter hash" do
+      CouchModel::Transport.send(:serialize_parameters, { }).should == ""
+    end
+    
+    it "should serialize the given parameters" do
+      CouchModel::Transport.send(:serialize_parameters, @parameters).should ==
+        "?another_test=%22test%22&test=[%22test%22,1,2,3]"
+    end
+
+  end
+
 end

data/spec/lib/couch_model/view_spec.rb

@@ -57,7 +57,7 @@ describe CouchModel::View do
 
     end
 
-    context "using explizit functions" do
+    context "using explicit functions" do
 
       before :each do
         @options.merge! :map    => "map function",
@@ -89,7 +89,7 @@ describe CouchModel::View do
     end
 
     it "should pass the options to the collection" do
-      @view.collection(:test => "test").options.should == { :test => "test" }
+      @view.collection(:test => "test").options.should == { :test => "test", :returns => :models }
     end
 
   end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'rspec'
+gem 'rspec', '1.3.0'
 require 'spec'
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "couch_model", "configuration"))

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 0
-  - beta3
-  version: 0.1.0.beta3
+  - beta4
+  version: 0.1.0.beta4
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 +01:00
+date: 2010-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - lib/couch_model/base/finder.rb
 - lib/couch_model/base/association.rb
 - lib/couch_model/active_model.rb
+- lib/couch_model/row.rb
 - lib/couch_model/view.rb
 - lib/couch_model/collection.rb
 - lib/couch_model/server.rb
@@ -63,6 +64,7 @@ files:
 - spec/lib/couch_model/design/setup_test_model.design
 - spec/lib/couch_model/configuration_spec.rb
 - spec/lib/couch_model/database_spec.rb
+- spec/lib/couch_model/row_spec.rb
 - spec/lib/couch_model/base_spec.rb
 - spec/lib/couch_model_spec.rb
 - spec/lib/core_extension/string_spec.rb
@@ -121,6 +123,7 @@ test_files:
 - spec/lib/couch_model/collection_spec.rb
 - spec/lib/couch_model/configuration_spec.rb
 - spec/lib/couch_model/database_spec.rb
+- spec/lib/couch_model/row_spec.rb
 - spec/lib/couch_model/base_spec.rb
 - spec/lib/couch_model_spec.rb
 - spec/lib/core_extension/string_spec.rb