couchmodel 0.1.0.beta2 → 0.1.0.beta3

data/README.rdoc

@@ -29,9 +29,10 @@ To define a model, it's necessary to create a subclass of <tt>CouchModel::Base</
 
   class User < CouchModel::Base
 
-    setup_database :url                     => "http://localhost:5984/test",
-                   :setup_on_initialization => true,
-                   :delete_if_exists        => false
+    setup_database :url               => "http://localhost:5984/test",
+                   :create_if_missing => true,
+                   :delete_if_exists  => false,
+                   :push_design       => true
 
     key_accessor :name
     key_accessor :email
@@ -39,11 +40,13 @@ To define a model, it's necessary to create a subclass of <tt>CouchModel::Base</
   end
 
 The <tt>setup_database</tt> method defines a database for the model. The +url+ option is required and specifies the url
-of the database in the scheme <em>http://[host]:[port]/[database_name]</em>. If the option
-<tt>setup_on_initialization</tt> is set to true, CouchModel will try to create the database when the model is
-initialized. If the option <tt>delete_if_exists</tt> is specified, the database will be deleted and re-created. If the
-option <tt>setup_on_initialization</tt> is not specified or false, the database setup be done manually by calling
-<tt>CouchModel::Configuration.setup_databases</tt> and <tt>CouchModel::Configuration.setup_designs</tt>.
+of the database in the scheme <tt>[scheme]://[host]:[port]/[database_name]</tt>. If the option
+<tt>create_if_missing</tt> is set to true, CouchModel will try to create the database when the model is
+initialized. If the option <tt>delete_if_exists</tt> is specified, the database will be deleted and re-created. The
+option <tt>push_design</tt> will make CouchModel upload the design document assigned to the model during it's
+initialization process. If the option <tt>create_if_missing</tt> is not specified or false, the database setup be done
+manually by calling <tt>CouchModel::Configuration.setup_databases</tt> and
+<tt>CouchModel::Configuration.setup_designs</tt>.
 
 The method <tt>key_accessor</tt> defined access methods to the given keys of the CouchDB document. It's also possible
 to use <tt>key_reader</tt> and <tt>key_writer</tt> here.
@@ -55,7 +58,7 @@ Each defined model has a realted design document, that keeps all the views for t
   CouchModel::Configuration.design_directory = "[directory]"
 
 a directory is specfied that keeps all the design document. CouchModel will watch out for a file with the name
-<em>[design directory]/[model_name].design</em> and will use it as the related design document. If no such file exists,
+<tt>[design directory]/[model_name].design</tt> and will use it as the related design document. If no such file exists,
 a design document will be created (but not saved to the file). The design ducument can be asscessed via
 <tt>Model.design</tt>.
 
@@ -109,7 +112,7 @@ In this example, the <tt>belongs_to</tt> adds a <tt>key_accessor</tt> named <tt>
 generates getters and setters for the session object itself (<tt>session</tt> and <tt>session=</tt>).
 
 The <tt>has_many</tt> acts as a wrapper for the specified view. The previously defined view
-<em>by_user_id_and_created_at</em> emits membership-documents by thier <tt>user_id</tt> and the <tt>created_at</tt>
+<tt>by_user_id_and_created_at</tt> emits membership-documents by thier <tt>user_id</tt> and the <tt>created_at</tt>
 date. The given query option specifes a method that returns a query hash for the specifed view. The arguments for this
 method can be passed membership association method.
 

data/lib/couch_model/active_model.rb

@@ -35,10 +35,11 @@ module CouchModel
 
     alias destroyed? new?
 
-    alias save_without_dirty save
+    alias save_without_active_model save
 
     def save
-      result = save_without_dirty
+      return false unless valid?
+      result = save_without_active_model
       discard_changes!
       result
     end

data/lib/couch_model/base/setup.rb

@@ -50,15 +50,19 @@ module CouchModel
         private
 
         def initialize_database(options)
-          url                     = options[:url] || raise(ArgumentError, "no url was given to define the database")
-          setup_on_initialization = options[:setup_on_initialization] || false
+          url               = options[:url] || raise(ArgumentError, "no url was given to define the database")
+          delete_if_exists  = options[:delete_if_exists]  || false
+          create_if_missing = options[:create_if_missing] || false
 
           uri = URI.parse url
           server = Server.new :host => uri.host, :port => uri.port
           database = Database.new :server => server, :name => uri.path.gsub("/", "")
           @database = Configuration.register_database database
 
-          @database.setup! options if setup_on_initialization && @database === database
+          if @database === database
+            @database.delete_if_exists!   if delete_if_exists
+            @database.create_if_missing!  if create_if_missing
+          end
         end
 
         def initialize_design
@@ -71,8 +75,8 @@ module CouchModel
         end
 
         def push_design(options)
-          setup_on_initialization = options[:setup_on_initialization] || false
-          @design.push if setup_on_initialization
+          push_design = options[:push_design] || false
+          @design.push if push_design
         end
 
         def find_view(name)

data/lib/couch_model/base.rb

@@ -105,7 +105,7 @@ module CouchModel
     end
 
     def update
-      response = Transport.request :put, self.url, :json => self.attributes, :expected_status_code => 200
+      response = Transport.request :put, self.url, :json => self.attributes, :expected_status_code => 201
       self.rev = response["rev"]
       true
     rescue Transport::UnexpectedStatusCodeError

data/lib/couch_model/configuration.rb

@@ -42,8 +42,12 @@ module CouchModel
       end
 
       def setup_databases(options = { })
+        delete_if_exists  = options[:delete_if_exists]  || false
+        create_if_missing = options[:create_if_missing] || false
+
         @@databases.each do |database|
-          database.setup! options
+          database.delete_if_exists!  if delete_if_exists
+          database.create_if_missing! if create_if_missing
         end
       end
 

data/lib/couch_model/database.rb

@@ -28,19 +28,16 @@ module CouchModel
       Transport.request :put, url, :expected_status_code => 201
     end
 
+    def create_if_missing!
+      create! unless exists?
+    end
+
     def delete!
       Transport.request :delete, url, :expected_status_code => 200
     end
 
-    def setup!(options = { })
-      delete_if_exists = options[:delete_if_exists] || false
-
-      if delete_if_exists
-        delete! if exists?
-        create!
-      else
-        create! unless exists?
-      end
+    def delete_if_exists!
+      delete! if exists?
     end
 
     def informations

data/lib/couch_model/transport.rb

@@ -49,7 +49,7 @@ module CouchModel
         json        = options[:json]
 
         case request_class.to_s
-          when "Net::HTTP::Get"
+          when "Net::HTTP::Get", "Net::HTTP::Delete"
             request_class.new uri.path +
               (parameters.empty? ? "" : "?" + parameters.collect{ |key, value| "#{key}=#{URI.escape(value.to_s)}" }.reverse.join("&"))
           when "Net::HTTP::Post", "Net::HTTP::Put"

data/spec/fake_transport.yml

@@ -82,7 +82,7 @@
   :http_method: "put"
   :url:         "http://localhost:5984/test/test_model_1"
   :response:
-    :code:      "200"
+    :code:      "201"
     :json:
       "ok":   true
       "id":   "test_model_1"

data/spec/integration/basic_spec.rb

@@ -3,9 +3,16 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "c
 
 CouchModel::Configuration.design_directory = File.join File.dirname(__FILE__), "design"
 
+DATABASE = {
+  :url                => "http://localhost:5984/test",
+  :create_if_missing  => true,
+  :delete_if_exists   => true,
+  :push_design        => true
+}.freeze unless defined?(DATABASE)
+
 class User < CouchModel::Base
 
-  setup_database :url => "http://localhost:5984/test", :setup_on_initialization => true, :delete_if_exists => true
+  setup_database DATABASE
 
   key_accessor :username
   key_accessor :email
@@ -19,7 +26,7 @@ end
 
 class Membership < CouchModel::Base
 
-  setup_database :url => "http://localhost:5984/test", :setup_on_initialization => true, :delete_if_exists => true
+  setup_database DATABASE
 
   key_accessor :created_at
 
@@ -64,6 +71,10 @@ describe "integration" do
         @user.should_not be_new
       end
 
+      it "should return true" do
+        @user.save.should be_true
+      end
+
     end
 
   end
@@ -83,6 +94,36 @@ describe "integration" do
       @membership_two.save
     end
 
+    describe "save" do
+
+      before :each do
+        @user_one.username = "new username"
+      end
+
+      it "should update the model" do
+        @user_one.save
+        @user_one.username.should == "new username"
+      end
+
+      it "should return true" do
+        @user_one.save.should be_true
+      end
+
+    end
+
+    describe "destroy" do
+
+      it "should return true" do
+        @user_one.destroy.should be_true
+      end
+
+      it "should set the model to new" do
+        @user_one.destroy
+        @user_one.should be_new
+      end
+
+    end
+
     describe "all" do
 
       it "should include the saved user" do

data/spec/lib/couch_model/active_model_spec.rb

@@ -139,6 +139,11 @@ describe ActiveTestModel do
       @model.save
     end
 
+    it "should not save on failing validations" do
+      @model.name = ""
+      @model.save.should be_false
+    end
+
     describe "on a new model" do
 
       before :each do

data/spec/lib/couch_model/configuration_spec.rb

@@ -42,38 +42,25 @@ describe CouchModel::Configuration do
 
     before :each do
       CouchModel::Configuration.class_variable_set :@@databases, [ ]
+      @database = CouchModel::Database.new :name => "test"
+      CouchModel::Configuration.register_database @database
+
+      @database.stub!(:delete_if_exists!)
+      @database.stub!(:create_if_missing!)
     end
 
     def do_setup
-      CouchModel::Configuration.setup_databases
+      CouchModel::Configuration.setup_databases :delete_if_exists => true, :create_if_missing => true
     end
-    
-    describe "for an existing database" do
-
-      before :each do
-        @database = CouchModel::Database.new :name => "test"
-        CouchModel::Configuration.register_database @database
-      end
-
-      it "should not create the database" do
-        @database.should_not_receive(:create!)
-        do_setup
-      end
 
+    it "should call delete_if_exists!" do
+      @database.should_receive(:delete_if_exists!)
+      do_setup
     end
 
-    describe "for a not-existing database" do
-
-      before :each do
-        @database = CouchModel::Database.new :name => "new_database"
-        CouchModel::Configuration.register_database @database
-      end
-
-      it "should create the database" do
-        @database.should_receive(:create!)
-        do_setup
-      end      
-
+    it "should call create_if_missing!" do
+      @database.should_receive(:create_if_missing!)
+      do_setup
     end
 
   end

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

@@ -41,10 +41,18 @@ describe SetupTestModel do
       database.object_id.should == SetupTestModel.database.object_id
     end
 
-    it "should setup the database on initialization if requested" do
-      @options[:setup_on_initialization] = true
+    it "should delete the database if requested" do
+      @options[:delete_if_exists] = true
       database = SetupTestModel.database
-      database.should_receive(:setup!).with(@options)
+      database.should_receive(:delete_if_exists!)
+      CouchModel::Database.stub!(:new).and_return(database)
+      do_setup
+    end
+
+    it "should create the database if requested" do
+      @options[:create_if_missing] = true
+      database = SetupTestModel.database
+      database.should_receive(:create_if_missing!)
       CouchModel::Database.stub!(:new).and_return(database)
       do_setup
     end
@@ -70,8 +78,8 @@ describe SetupTestModel do
       SetupTestModel.test_view.should be_instance_of(CouchModel::Collection)
     end
 
-    it "should push the design on initialization if requested" do
-      @options[:setup_on_initialization] = true
+    it "should push the design if requested" do
+      @options[:push_design] = true
       @design.should_receive(:push)
       do_setup
     end

data/spec/lib/couch_model/database_spec.rb

@@ -59,6 +59,26 @@ describe CouchModel::Database do
 
   end
 
+  describe "create_if_missing!" do
+
+    before :each do
+      @database.stub!(:create!)      
+    end
+
+    it "should not call create! if the database exists" do
+      @database.stub!(:exists?).and_return(true)
+      @database.should_not_receive(:create!)
+      @database.create_if_missing!
+    end
+
+    it "should call create! if the database not exists" do
+      @database.stub!(:exists?).and_return(false)
+      @database.should_receive(:create!)
+      @database.create_if_missing!
+    end
+
+  end
+
   describe "delete!" do
 
     before :each do
@@ -73,60 +93,22 @@ describe CouchModel::Database do
 
   end
 
-  describe "setup!" do
+  describe "delete_if_exists!" do
 
     before :each do
-      @database.stub!(:create!)
       @database.stub!(:delete!)
-      @database.stub!(:exists?).and_return(true)
-      @options = { }
     end
 
-    def do_setup
-      @database.setup! @options
-    end
-
-    describe "with delete_if_exists set to true" do
-
-      before :each do
-        @options.merge! :delete_if_exists => true
-      end
-
-      it "should delete an existing database" do
-        @database.should_receive(:delete!)
-        do_setup
-      end
-
-      it "should not delete a not-existing database" do
-        @database.stub!(:exists?).and_return(false)
-        @database.should_not_receive(:delete!)
-        do_setup
-      end
-
-      it "should create the database" do
-        @database.should_receive(:create!)
-        do_setup
-      end
-
+    it "should call delete! if the database exists" do
+      @database.stub!(:exists?).and_return(true)
+      @database.should_receive(:delete!)
+      @database.delete_if_exists!
     end
 
-    describe "with delete_if_exists set to false" do
-
-      before :each do
-        @options.merge! :delete_if_exists => false
-      end
-
-      it "should create a not-existing database" do
-        @database.stub!(:exists?).and_return(false)
-        @database.should_receive(:create!)
-        do_setup
-      end
-
-      it "should not create an existing database" do
-        @database.should_not_receive(:create!)
-        do_setup
-      end
-
+    it "should not call delete! if the database not exists" do
+      @database.stub!(:exists?).and_return(false)
+      @database.should_not_receive(:delete!)
+      @database.delete_if_exists!
     end
 
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 0
-  - beta2
-  version: 0.1.0.beta2
+  - beta3
+  version: 0.1.0.beta3
 platform: ruby
 authors: 
 - "Philipp Br\xC3\xBCll"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +01:00
+date: 2010-03-10 00:00:00 +01:00
 default_executable: 
 dependencies: []