spec/couchrest/more/extended_doc_attachment_spec.rb spec/couchrest/more/extended_doc_view_spec.rb @@ -59,13 +59,7 @@ Creating and Querying Views: ## CouchRest::Model -CouchRest::Model is a module designed along the lines of DataMapper::Resource. -By subclassing, suddenly you get all sorts of powerful sugar, so that working -with CouchDB in your Rails or Merb app is no harder than working with the -standard SQL alternatives. See the CouchRest::Model documentation for an -example article class that illustrates usage. - -CouchRest::Model will be removed from this package. +CouchRest::Model has been deprecated and replaced by CouchRest::ExtendedDocument ## CouchRest::ExtendedDocument README.md @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{couchrest} - s.version = "0.14.2" + s.version = "0.15" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["J. Chris Anderson", "Matt Aimonetti"] @@ -10,7 +10,7 @@ Gem::Specification.new do |s| s.description = %q{CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.} s.email = %q{jchris@apache.org} s.extra_rdoc_files = ["README.md", "LICENSE", "THANKS.md"] - s.files = ["LICENSE", "README.md", "Rakefile", "THANKS.md", "examples/model", "examples/model/example.rb", "examples/word_count", "examples/word_count/markov", "examples/word_count/views", "examples/word_count/views/books", "examples/word_count/views/books/chunked-map.js", "examples/word_count/views/books/united-map.js", "examples/word_count/views/markov", "examples/word_count/views/markov/chain-map.js", "examples/word_count/views/markov/chain-reduce.js", "examples/word_count/views/word_count", "examples/word_count/views/word_count/count-map.js", "examples/word_count/views/word_count/count-reduce.js", "examples/word_count/word_count.rb", "examples/word_count/word_count_query.rb", "examples/word_count/word_count_views.rb", "lib/couchrest", "lib/couchrest/commands", "lib/couchrest/commands/generate.rb", "lib/couchrest/commands/push.rb", "lib/couchrest/core", "lib/couchrest/core/database.rb", "lib/couchrest/core/design.rb", "lib/couchrest/core/document.rb", "lib/couchrest/core/model.rb", "lib/couchrest/core/response.rb", "lib/couchrest/core/server.rb", "lib/couchrest/core/view.rb", "lib/couchrest/helper", "lib/couchrest/helper/pager.rb", "lib/couchrest/helper/streamer.rb", "lib/couchrest/mixins", "lib/couchrest/mixins/attachments.rb", "lib/couchrest/mixins/callbacks.rb", "lib/couchrest/mixins/design_doc.rb", "lib/couchrest/mixins/document_queries.rb", "lib/couchrest/mixins/extended_attachments.rb", "lib/couchrest/mixins/extended_document_mixins.rb", "lib/couchrest/mixins/properties.rb", "lib/couchrest/mixins/validation.rb", "lib/couchrest/mixins/views.rb", "lib/couchrest/mixins.rb", "lib/couchrest/monkeypatches.rb", "lib/couchrest/more", "lib/couchrest/more/casted_model.rb", "lib/couchrest/more/extended_document.rb", "lib/couchrest/more/property.rb", "lib/couchrest/support", "lib/couchrest/support/blank.rb", "lib/couchrest/support/class.rb", "lib/couchrest/validation", "lib/couchrest/validation/auto_validate.rb", "lib/couchrest/validation/contextual_validators.rb", "lib/couchrest/validation/validation_errors.rb", "lib/couchrest/validation/validators", "lib/couchrest/validation/validators/absent_field_validator.rb", "lib/couchrest/validation/validators/confirmation_validator.rb", "lib/couchrest/validation/validators/format_validator.rb", "lib/couchrest/validation/validators/formats", "lib/couchrest/validation/validators/formats/email.rb", "lib/couchrest/validation/validators/formats/url.rb", "lib/couchrest/validation/validators/generic_validator.rb", "lib/couchrest/validation/validators/length_validator.rb", "lib/couchrest/validation/validators/method_validator.rb", "lib/couchrest/validation/validators/numeric_validator.rb", "lib/couchrest/validation/validators/required_field_validator.rb", "lib/couchrest.rb", "spec/couchrest", "spec/couchrest/core", "spec/couchrest/core/couchrest_spec.rb", "spec/couchrest/core/database_spec.rb", "spec/couchrest/core/design_spec.rb", "spec/couchrest/core/document_spec.rb", "spec/couchrest/core/model_spec.rb", "spec/couchrest/core/server_spec.rb", "spec/couchrest/helpers", "spec/couchrest/helpers/pager_spec.rb", "spec/couchrest/helpers/streamer_spec.rb", "spec/couchrest/more", "spec/couchrest/more/casted_model_spec.rb", "spec/couchrest/more/extended_doc_spec.rb", "spec/couchrest/more/property_spec.rb", "spec/fixtures", "spec/fixtures/attachments", "spec/fixtures/attachments/couchdb.png", "spec/fixtures/attachments/README", "spec/fixtures/attachments/test.html", "spec/fixtures/couchapp", "spec/fixtures/couchapp/_attachments", "spec/fixtures/couchapp/_attachments/index.html", "spec/fixtures/couchapp/doc.json", "spec/fixtures/couchapp/foo", "spec/fixtures/couchapp/foo/bar.txt", "spec/fixtures/couchapp/foo/test.json", "spec/fixtures/couchapp/test.json", "spec/fixtures/couchapp/views", "spec/fixtures/couchapp/views/example-map.js", "spec/fixtures/couchapp/views/example-reduce.js", "spec/fixtures/couchapp-test", "spec/fixtures/couchapp-test/my-app", "spec/fixtures/couchapp-test/my-app/_attachments", "spec/fixtures/couchapp-test/my-app/_attachments/index.html", "spec/fixtures/couchapp-test/my-app/foo", "spec/fixtures/couchapp-test/my-app/foo/bar.txt", "spec/fixtures/couchapp-test/my-app/views", "spec/fixtures/couchapp-test/my-app/views/example-map.js", "spec/fixtures/couchapp-test/my-app/views/example-reduce.js", "spec/fixtures/more", "spec/fixtures/more/card.rb", "spec/fixtures/more/invoice.rb", "spec/fixtures/more/service.rb", "spec/fixtures/views", "spec/fixtures/views/lib.js", "spec/fixtures/views/test_view", "spec/fixtures/views/test_view/lib.js", "spec/fixtures/views/test_view/only-map.js", "spec/fixtures/views/test_view/test-map.js", "spec/fixtures/views/test_view/test-reduce.js", "spec/spec.opts", "spec/spec_helper.rb", "utils/remap.rb", "utils/subset.rb"] + s.files = ["LICENSE", "README.md", "Rakefile", "THANKS.md", "examples/model", "examples/model/example.rb", "examples/word_count", "examples/word_count/markov", "examples/word_count/views", "examples/word_count/views/books", "examples/word_count/views/books/chunked-map.js", "examples/word_count/views/books/united-map.js", "examples/word_count/views/markov", "examples/word_count/views/markov/chain-map.js", "examples/word_count/views/markov/chain-reduce.js", "examples/word_count/views/word_count", "examples/word_count/views/word_count/count-map.js", "examples/word_count/views/word_count/count-reduce.js", "examples/word_count/word_count.rb", "examples/word_count/word_count_query.rb", "examples/word_count/word_count_views.rb", "lib/couchrest", "lib/couchrest/commands", "lib/couchrest/commands/generate.rb", "lib/couchrest/commands/push.rb", "lib/couchrest/core", "lib/couchrest/core/database.rb", "lib/couchrest/core/design.rb", "lib/couchrest/core/document.rb", "lib/couchrest/core/response.rb", "lib/couchrest/core/server.rb", "lib/couchrest/core/view.rb", "lib/couchrest/helper", "lib/couchrest/helper/pager.rb", "lib/couchrest/helper/streamer.rb", "lib/couchrest/mixins", "lib/couchrest/mixins/attachments.rb", "lib/couchrest/mixins/callbacks.rb", "lib/couchrest/mixins/design_doc.rb", "lib/couchrest/mixins/document_queries.rb", "lib/couchrest/mixins/extended_attachments.rb", "lib/couchrest/mixins/extended_document_mixins.rb", "lib/couchrest/mixins/properties.rb", "lib/couchrest/mixins/validation.rb", "lib/couchrest/mixins/views.rb", "lib/couchrest/mixins.rb", "lib/couchrest/monkeypatches.rb", "lib/couchrest/more", "lib/couchrest/more/casted_model.rb", "lib/couchrest/more/extended_document.rb", "lib/couchrest/more/property.rb", "lib/couchrest/support", "lib/couchrest/support/blank.rb", "lib/couchrest/support/class.rb", "lib/couchrest/validation", "lib/couchrest/validation/auto_validate.rb", "lib/couchrest/validation/contextual_validators.rb", "lib/couchrest/validation/validation_errors.rb", "lib/couchrest/validation/validators", "lib/couchrest/validation/validators/absent_field_validator.rb", "lib/couchrest/validation/validators/confirmation_validator.rb", "lib/couchrest/validation/validators/format_validator.rb", "lib/couchrest/validation/validators/formats", "lib/couchrest/validation/validators/formats/email.rb", "lib/couchrest/validation/validators/formats/url.rb", "lib/couchrest/validation/validators/generic_validator.rb", "lib/couchrest/validation/validators/length_validator.rb", "lib/couchrest/validation/validators/method_validator.rb", "lib/couchrest/validation/validators/numeric_validator.rb", "lib/couchrest/validation/validators/required_field_validator.rb", "lib/couchrest.rb", "spec/couchrest", "spec/couchrest/core", "spec/couchrest/core/couchrest_spec.rb", "spec/couchrest/core/database_spec.rb", "spec/couchrest/core/design_spec.rb", "spec/couchrest/core/document_spec.rb", "spec/couchrest/core/server_spec.rb", "spec/couchrest/helpers", "spec/couchrest/helpers/pager_spec.rb", "spec/couchrest/helpers/streamer_spec.rb", "spec/couchrest/more", "spec/couchrest/more/casted_model_spec.rb", "spec/couchrest/more/extended_doc_attachment_spec.rb", "spec/couchrest/more/extended_doc_spec.rb", "spec/couchrest/more/extended_doc_view_spec.rb", "spec/couchrest/more/property_spec.rb", "spec/fixtures", "spec/fixtures/attachments", "spec/fixtures/attachments/couchdb.png", "spec/fixtures/attachments/README", "spec/fixtures/attachments/test.html", "spec/fixtures/couchapp", "spec/fixtures/couchapp/_attachments", "spec/fixtures/couchapp/_attachments/index.html", "spec/fixtures/couchapp/doc.json", "spec/fixtures/couchapp/foo", "spec/fixtures/couchapp/foo/bar.txt", "spec/fixtures/couchapp/foo/test.json", "spec/fixtures/couchapp/test.json", "spec/fixtures/couchapp/views", "spec/fixtures/couchapp/views/example-map.js", "spec/fixtures/couchapp/views/example-reduce.js", "spec/fixtures/couchapp-test", "spec/fixtures/couchapp-test/my-app", "spec/fixtures/couchapp-test/my-app/_attachments", "spec/fixtures/couchapp-test/my-app/_attachments/index.html", "spec/fixtures/couchapp-test/my-app/foo", "spec/fixtures/couchapp-test/my-app/foo/bar.txt", "spec/fixtures/couchapp-test/my-app/views", "spec/fixtures/couchapp-test/my-app/views/example-map.js", "spec/fixtures/couchapp-test/my-app/views/example-reduce.js", "spec/fixtures/more", "spec/fixtures/more/article.rb", "spec/fixtures/more/card.rb", "spec/fixtures/more/course.rb", "spec/fixtures/more/event.rb", "spec/fixtures/more/invoice.rb", "spec/fixtures/more/person.rb", "spec/fixtures/more/question.rb", "spec/fixtures/more/service.rb", "spec/fixtures/views", "spec/fixtures/views/lib.js", "spec/fixtures/views/test_view", "spec/fixtures/views/test_view/lib.js", "spec/fixtures/views/test_view/only-map.js", "spec/fixtures/views/test_view/test-map.js", "spec/fixtures/views/test_view/test-reduce.js", "spec/spec.opts", "spec/spec_helper.rb", "utils/remap.rb", "utils/subset.rb"] s.has_rdoc = true s.homepage = %q{http://github.com/jchris/couchrest} s.require_paths = ["lib"] couchrest.gemspec @@ -1,31 +1,38 @@ -require 'rubygems' -require 'couchrest' +require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'couchrest') def show obj puts obj.inspect puts end -CouchRest::Model.default_database = CouchRest.database!('couchrest-model-example') +SERVER = CouchRest.new +SERVER.default_database = 'couchrest-extendeddoc-example' -class Author < CouchRest::Model - key_accessor :name +class Author < CouchRest::ExtendedDocument + use_database SERVER.default_database + property :name + def drink_scotch puts "... glug type glug ... I'm #{name} ... type glug glug ..." end end -class Post < CouchRest::Model - key_accessor :title, :body, :author - - cast :author, :as => 'Author' +class Post < CouchRest::ExtendedDocument + use_database SERVER.default_database + + property :title + property :body + property :author, :cast_as => 'Author' timestamps! end -class Comment < CouchRest::Model - cast :commenter, :as => 'Author' - +class Comment < CouchRest::ExtendedDocument + use_database SERVER.default_database + + property :commenter, :cast_as => 'Author' + timestamps! + def post= post self["post_id"] = post.id end @@ -33,7 +40,6 @@ class Comment < CouchRest::Model Post.get(self['post_id']) if self['post_id'] end - timestamps! end puts "Act I: CRUD" examples/model/example.rb @@ -27,7 +27,7 @@ require 'couchrest/monkeypatches' # = CouchDB, close to the metal module CouchRest - VERSION = '0.14.2' + VERSION = '0.15' autoload :Server, 'couchrest/core/server' autoload :Database, 'couchrest/core/database' lib/couchrest.rb @@ -279,7 +279,7 @@ module CouchRest private - def uri_for_attachment doc, name + def uri_for_attachment(doc, name) if doc.is_a?(String) puts "CouchRest::Database#fetch_attachment will eventually require a doc as the first argument, not a doc.id" docid = doc lib/couchrest/core/database.rb @@ -31,6 +31,7 @@ module CouchRest def initialize(keys={}) apply_defaults # defined in CouchRest::Mixins::Properties + keys ||= {} super cast_keys # defined in CouchRest::Mixins::Properties unless self['_id'] && self['_rev'] @@ -100,7 +101,7 @@ module CouchRest # missing. In case of error, no attributes are changed. def update_attributes_without_saving(hash) hash.each do |k, v| - raise NoMethodError, "#{k}= method not available, use key_accessor or key_writer :#{k}" unless self.respond_to?("#{k}=") + raise NoMethodError, "#{k}= method not available, use property :#{k}" unless self.respond_to?("#{k}=") end hash.each do |k, v| self.send("#{k}=",v) lib/couchrest/more/extended_document.rb @@ -18,6 +18,8 @@ module CouchRest def parse_type(type) if type.nil? @type = 'String' + elsif type.is_a?(Array) && type.empty? + @type = 'Array' else @type = type.is_a?(Array) ? [type.first.to_s] : type.to_s end lib/couchrest/more/property.rb @@ -704,7 +704,7 @@ describe CouchRest::Database do describe "creating a database" do before(:each) do @db = @cr.database('couchrest-test-db_to_create') - @db.delete! + @db.delete! if @cr.databases.include?('couchrest-test-db_to_create') end it "should just work fine" do spec/couchrest/core/database_spec.rb @@ -1,4 +1,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' +require File.join(FIXTURE_PATH, 'more', 'article') +require File.join(FIXTURE_PATH, 'more', 'course') + describe "ExtendedDocument" do @@ -41,10 +44,86 @@ describe "ExtendedDocument" do end end + class WithTemplateAndUniqueID < CouchRest::ExtendedDocument + use_database TEST_SERVER.default_database + unique_id do |model| + model['important-field'] + end + property :preset, :default => 'value' + property :has_no_default + end + before(:each) do @obj = WithDefaultValues.new end + describe "instance database connection" do + it "should use the default database" do + @obj.database.name.should == 'couchrest-test' + end + + it "should override the default db" do + @obj.database = TEST_SERVER.database!('couchrest-extendedmodel-test') + @obj.database.name.should == 'couchrest-extendedmodel-test' + @obj.database.delete! + end + end + + describe "a new model" do + it "should be a new_record" do + @obj = Basic.new + @obj.rev.should be_nil + @obj.should be_a_new_record + end + it "should be a new_document" do + @obj = Basic.new + @obj.rev.should be_nil + @obj.should be_a_new_document + end + end + + describe "update attributes without saving" do + before(:each) do + a = Article.get "big-bad-danger" rescue nil + a.destroy if a + @art = Article.new(:title => "big bad danger") + @art.save + end + it "should work for attribute= methods" do + @art['title'].should == "big bad danger" + @art.update_attributes_without_saving('date' => Time.now, :title => "super danger") + @art['title'].should == "super danger" + end + + it "should flip out if an attribute= method is missing" do + lambda { + @art.update_attributes_without_saving('slug' => "new-slug", :title => "super danger") + }.should raise_error + end + + it "should not change other attributes if there is an error" do + lambda { + @art.update_attributes_without_saving('slug' => "new-slug", :title => "super danger") + }.should raise_error + @art['title'].should == "big bad danger" + end + end + + describe "update attributes" do + before(:each) do + a = Article.get "big-bad-danger" rescue nil + a.destroy if a + @art = Article.new(:title => "big bad danger") + @art.save + end + it "should save" do + @art['title'].should == "big bad danger" + @art.update_attributes('date' => Time.now, :title => "super danger") + loaded = Article.get(@art.id) + loaded['title'].should == "super danger" + end + end + describe "with default" do it "should have the default value set at initalization" do @obj.preset.should == {:right => 10, :top_align => false} @@ -67,7 +146,137 @@ describe "ExtendedDocument" do end end + describe "a doc with template values (CR::Model spec)" do + before(:all) do + WithTemplateAndUniqueID.all.map{|o| o.destroy(true)} + WithTemplateAndUniqueID.database.bulk_delete + @tmpl = WithTemplateAndUniqueID.new + @tmpl2 = WithTemplateAndUniqueID.new(:preset => 'not_value', 'important-field' => '1') + end + it "should have fields set when new" do + @tmpl.preset.should == 'value' + end + it "shouldn't override explicitly set values" do + @tmpl2.preset.should == 'not_value' + end + it "shouldn't override existing documents" do + @tmpl2.save + tmpl2_reloaded = WithTemplateAndUniqueID.get(@tmpl2.id) + @tmpl2.preset.should == 'not_value' + tmpl2_reloaded.preset.should == 'not_value' + end + end + + describe "getting a model" do + before(:all) do + @art = Article.new(:title => 'All About Getting') + @art.save + end + it "should load and instantiate it" do + foundart = Article.get @art.id + foundart.title.should == "All About Getting" + end + end + + describe "getting a model with a subobjects array" do + before(:all) do + course_doc = { + "title" => "Metaphysics 200", + "questions" => [ + { + "q" => "Carve the ___ of reality at the ___.", + "a" => ["beast","joints"] + },{ + "q" => "Who layed the smack down on Leibniz's Law?", + "a" => "Willard Van Orman Quine" + } + ] + } + r = Course.database.save_doc course_doc + @course = Course.get r['id'] + end + it "should load the course" do + @course.title.should == "Metaphysics 200" + end + it "should instantiate them as such" do + @course["questions"][0].a[0].should == "beast" + end + end + + describe "finding all instances of a model" do + before(:all) do + WithTemplateAndUniqueID.all.map{|o| o.destroy(true)} + WithTemplateAndUniqueID.database.bulk_delete + WithTemplateAndUniqueID.new('important-field' => '1').save + WithTemplateAndUniqueID.new('important-field' => '2').save + WithTemplateAndUniqueID.new('important-field' => '3').save + WithTemplateAndUniqueID.new('important-field' => '4').save + end + it "should make the design doc" do + WithTemplateAndUniqueID.all + d = WithTemplateAndUniqueID.design_doc + d['views']['all']['map'].should include('WithTemplateAndUniqueID') + end + it "should find all" do + rs = WithTemplateAndUniqueID.all + rs.length.should == 4 + end + end + + describe "finding the first instance of a model" do + before(:each) do + @db = reset_test_db! + WithTemplateAndUniqueID.new('important-field' => '1').save + WithTemplateAndUniqueID.new('important-field' => '2').save + WithTemplateAndUniqueID.new('important-field' => '3').save + WithTemplateAndUniqueID.new('important-field' => '4').save + end + it "should make the design doc" do + WithTemplateAndUniqueID.all + d = WithTemplateAndUniqueID.design_doc + d['views']['all']['map'].should include('WithTemplateAndUniqueID') + end + it "should find first" do + rs = WithTemplateAndUniqueID.first + rs['important-field'].should == "1" + end + it "should return nil if no instances are found" do + WithTemplateAndUniqueID.all.each {|obj| obj.destroy } + WithTemplateAndUniqueID.first.should be_nil + end + end + + describe "getting a model with a subobject field" do + before(:all) do + course_doc = { + "title" => "Metaphysics 410", + "professor" => { + "name" => ["Mark", "Hinchliff"] + }, + "final_test_at" => "2008/12/19 13:00:00 +0800" + } + r = Course.database.save_doc course_doc + @course = Course.get r['id'] + end + it "should load the course" do + @course["professor"]["name"][1].should == "Hinchliff" + end + it "should instantiate the professor as a person" do + @course['professor'].last_name.should == "Hinchliff" + end + it "should instantiate the final_test_at as a Time" do + @course['final_test_at'].should == Time.parse("2008/12/19 13:00:00 +0800") + end + end + describe "timestamping" do + before(:each) do + oldart = Article.get "saving-this" rescue nil + oldart.destroy if oldart + @art = Article.new(:title => "Saving this") + @art.save + end + it "should define the updated_at and created_at getters and set the values" do @obj.save obj = WithDefaultValues.get(@obj.id) @@ -76,9 +285,18 @@ describe "ExtendedDocument" do obj.updated_at.should be_an_instance_of(Time) obj.created_at.to_s.should == @obj.updated_at.to_s end + it "should set the time on create" do + (Time.now - @art.created_at).should < 2 + foundart = Article.get @art.id + foundart.created_at.should == foundart.updated_at + end + it "should set the time on update" do + @art.save + @art.created_at.should < @art.updated_at + end end - describe "saving and retrieving" do + describe "basic saving and retrieving" do it "should work fine" do @obj.name = "should be easily saved and retrieved" @obj.save @@ -96,6 +314,145 @@ describe "ExtendedDocument" do end end + describe "saving a model" do + before(:all) do + @sobj = Basic.new + @sobj.save.should == true + end + + it "should save the doc" do + doc = Basic.get(@sobj.id) + doc['_id'].should == @sobj.id + end + + it "should be set for resaving" do + rev = @obj.rev + @sobj['another-key'] = "some value" + @sobj.save + @sobj.rev.should_not == rev + end + + it "should set the id" do + @sobj.id.should be_an_instance_of(String) + end + + it "should set the type" do + @sobj['couchrest-type'].should == 'Basic' + end + end + + describe "saving a model with a unique_id configured" do + before(:each) do + @art = Article.new + @old = Article.database.get('this-is-the-title') rescue nil + Article.database.delete_doc(@old) if @old + end + + it "should be a new document" do + @art.should be_a_new_document + @art.title.should be_nil + end + + it "should require the title" do + lambda{@art.save}.should raise_error + @art.title = 'This is the title' + @art.save.should == true + end + + it "should not change the slug on update" do + @art.title = 'This is the title' + @art.save.should == true + @art.title = 'new title' + @art.save.should == true + @art.slug.should == 'this-is-the-title' + end + + it "should raise an error when the slug is taken" do + @art.title = 'This is the title' + @art.save.should == true + @art2 = Article.new(:title => 'This is the title!') + lambda{@art2.save}.should raise_error + end + + it "should set the slug" do + @art.title = 'This is the title' + @art.save.should == true + @art.slug.should == 'this-is-the-title' + end + + it "should set the id" do + @art.title = 'This is the title' + @art.save.should == true + @art.id.should == 'this-is-the-title' + end + end + + describe "saving a model with a unique_id lambda" do + before(:each) do + @templated = WithTemplateAndUniqueID.new + @old = WithTemplateAndUniqueID.get('very-important') rescue nil + @old.destroy if @old + end + + it "should require the field" do + lambda{@templated.save}.should raise_error + @templated['important-field'] = 'very-important' + @templated.save.should == true + end + + it "should save with the id" do + @templated['important-field'] = 'very-important' + @templated.save.should == true + t = WithTemplateAndUniqueID.get('very-important') + t.should == @templated + end + + it "should not change the id on update" do + @templated['important-field'] = 'very-important' + @templated.save.should == true + @templated['important-field'] = 'not-important' + @templated.save.should == true + t = WithTemplateAndUniqueID.get('very-important') + t.should == @templated + end + + it "should raise an error when the id is taken" do + @templated['important-field'] = 'very-important' + @templated.save.should == true + lambda{WithTemplateAndUniqueID.new('important-field' => 'very-important').save}.should raise_error + end + + it "should set the id" do + @templated['important-field'] = 'very-important' + @templated.save.should == true + @templated.id.should == 'very-important' + end + end + + describe "destroying an instance" do + before(:each) do + @dobj = Basic.new + @dobj.save.should == true + end + it "should return true" do + result = @dobj.destroy + result.should == true + end + it "should be resavable" do + pending "TO FIX" do + @dobj.destroy + @dobj.rev.should be_nil + @dobj.id.should be_nil + @dobj.save.should == true + end + end + it "should make it go away" do + @dobj.destroy + lambda{Basic.get(@dobj.id)}.should raise_error + end + end + + describe "callbacks" do before(:each) do @@ -103,28 +460,11 @@ describe "ExtendedDocument" do end describe "save" do - it "should not run the before filter before saving if the save failed" do - @doc.run_before_save.should be_nil - @doc.save.should be_true - @doc.run_before_save.should be_true - end - it "should not run the before filter before saving if the save failed" do - @doc.should_receive(:save).and_return(false) - @doc.run_before_save.should be_nil - @doc.save.should be_false - @doc.run_before_save.should be_nil - end it "should run the after filter after saving" do @doc.run_after_save.should be_nil @doc.save.should be_true @doc.run_after_save.should be_true end - it "should not run the after filter before saving if the save failed" do - @doc.should_receive(:save).and_return(false) - @doc.run_after_save.should be_nil - @doc.save.should be_false - @doc.run_after_save.should be_nil - end end describe "create" do it "should run the before save filter when creating" do @@ -132,14 +472,6 @@ describe "ExtendedDocument" do @doc.create.should_not be_nil @doc.run_before_save.should be_true end - it "should not run the before save filter when the object creation fails" do - pending "need to ask wycats about chainable callbacks" do - @doc.should_receive(:create_without_callbacks).and_return(false) - @doc.run_before_save.should be_nil - @doc.save - @doc.run_before_save.should be_nil - end - end it "should run the before create filter" do @doc.run_before_create.should be_nil @doc.create.should_not be_nil spec/couchrest/more/extended_doc_spec.rb @@ -1,7 +1,8 @@ require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper') require File.join(FIXTURE_PATH, 'more', 'card') require File.join(FIXTURE_PATH, 'more', 'invoice') -require File.join(FIXTURE_PATH, 'more', 'service.rb') +require File.join(FIXTURE_PATH, 'more', 'service') +require File.join(FIXTURE_PATH, 'more', 'event') describe "ExtendedDocument properties" do @@ -43,7 +44,6 @@ describe "ExtendedDocument properties" do end describe "validation" do - before(:each) do @invoice = Invoice.new(:client_name => "matt", :employee_name => "Chris", :location => "San Diego, CA") end @@ -79,11 +79,9 @@ describe "ExtendedDocument properties" do @invoice.save.should be_false @invoice.should be_new_document end - end describe "autovalidation" do - before(:each) do @service = Service.new(:name => "Coumpound analysis", :price => 3_000) end @@ -112,7 +110,20 @@ describe "ExtendedDocument properties" do @service.errors.on(:name).first.should == "Name must be between 4 and 19 characters long" end end - + end + + describe "casting" do + describe "cast keys to any type" do + before(:all) do + event_doc = { :subject => "Some event", :occurs_at => Time.now } + e = Event.database.save_doc event_doc + + @event = Event.get e['id'] + end + it "should cast created_at to Time" do + @event['occurs_at'].should be_an_instance_of(Time) + end + end end end \ No newline at end of file spec/couchrest/more/property_spec.rb @@ -14,6 +14,10 @@ unless defined?(FIXTURE_PATH) TEST_SERVER.default_database = TESTDB end +class Basic < CouchRest::ExtendedDocument + use_database TEST_SERVER.default_database +end + def reset_test_db! cr = TEST_SERVER db = cr.database(TESTDB) spec/spec_helper.rb lib/couchrest/core/model.rb spec/couchrest/core/model_spec.rb 72542dc87688011a67b31aefce75cf499784d179 Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/couchrest/commit/fe489f2d389b34c210fc570e512cfaee20b78068 fe489f2d389b34c210fc570e512cfaee20b78068 2009-02-24T22:51:13-08:00 2009-02-24T22:51:13-08:00 removed CouchRest::Model, added more specs and fixed a bug with casted CR::ExtendedDocument fc3c68b1e0db65c8d41c5567889bb2228df11de5 Matt Aimonetti mattaimonetti@gmail.com