Permalink
Browse files

merge from mongoid/mongoid master

  • Loading branch information...
2 parents 624ec3d + 0dbba7e commit 3a34b808bfb330e0fa76ce34216f89f683155359 @flyerhzm committed Jan 20, 2011
Showing 372 changed files with 30,191 additions and 12,031 deletions.
View
@@ -7,5 +7,11 @@ tmp/*
RAILS
.bundle
Gemfile.lock
-.rvmrc
rdoc/*
+TODO
+ISSUES
+DONATE
+.yardoc/*
+doc/*
+*.swp
+*.un~
View
3 .rspec
@@ -1,2 +1,3 @@
--colour
---format nested
+--format documentation
+--fail-fast
@@ -1,2 +1,2 @@
rvm_gemset_create_on_use_flag=1
-rvm gemset use mongoid
+rvm use 1.9.2@mongoid
View
@@ -1,4 +1,8 @@
-# Use `bundle install` in order to install these gems
-# Use `bundle exec rake` in order to run the specs using the bundle
source "http://rubygems.org"
gemspec
+if RUBY_VERSION < '1.9'
+ gem 'ruby-debug'
+else
+ gem 'ruby-debug19'
+end
+
View
File renamed without changes.
View
@@ -11,16 +11,19 @@ Mongoid is an ODM (Object-Document-Mapper) framework for MongoDB in Ruby.
== Compatibility
-Mongoid is developed against Ruby 1.8.7, 1.9.1, 1.9.2, and REE.
+Mongoid is developed against Ruby 1.8.7, 1.9.2, and REE.
= Documentation
Please see the new Mongoid website for up-to-date documentation:
{mongoid.org}[http://mongoid.org]
+= Donating
+* {Support Mongoid at Pledgie}[http://www.pledgie.com/campaigns/7757]
+
= License
-Copyright (c) 2009, 2010 Durran Jordan
+Copyright (c) 2009, 2010, 2011 Durran Jordan
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
@@ -19,18 +19,23 @@ task :install => :build do
end
task :release => :build do
- puts "Tagging #{Mongoid::VERSION}..."
system "git tag -a #{Mongoid::VERSION} -m 'Tagging #{Mongoid::VERSION}'"
- puts "Pushing to Github..."
system "git push --tags"
- puts "Pushing to rubygems.org..."
system "gem push mongoid-#{Mongoid::VERSION}.gem"
end
Rspec::Core::RakeTask.new(:spec) do |spec|
spec.pattern = "spec/**/*_spec.rb"
end
+Rspec::Core::RakeTask.new("spec:unit") do |spec|
+ spec.pattern = "spec/unit/**/*_spec.rb"
+end
+
+Rspec::Core::RakeTask.new("spec:integration") do |spec|
+ spec.pattern = "spec/integration/**/*_spec.rb"
+end
+
Rspec::Core::RakeTask.new('spec:progress') do |spec|
spec.rspec_opts = %w(--format progress)
spec.pattern = "spec/**/*_spec.rb"
@@ -39,4 +39,6 @@ bg:
references_many като масив.
calling_document_find_with_nil_is_invalid:
Извикването на Document#find със nil е невалидно
-
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -39,3 +39,6 @@ de:
Es ist nicht erlaubt, inverse_of für diese Beziehung zu definieren.
Diese Option kann nur für embedded_in oder references_many als Array
verwendet werden.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -40,3 +40,6 @@ en:
use this option on embedded_in or references_many as array.
calling_document_find_with_nil_is_invalid:
Calling Document#find with nil is invalid
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -39,3 +39,6 @@ es:
association_cant_have_inverse_of:
No está permitido definir inverse_of en esta asociación. Utilice
esta opción sólo en embedded_in o en references_many as array.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -39,4 +39,7 @@ fr:
pour les associations references_on ou references_many."
association_cant_have_inverse_of:
"Definir un inverse_of pour cette association n'est pas autorisé.
- Utilisez cette option seulement sur embedded_in ou references_many."
+ Utilisez cette option seulement sur embedded_in ou references_many."
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -42,4 +42,6 @@ hu:
esetében használható.
calling_document_find_with_nil_is_invalid:
Document#find parancs nil érték esetében érvénytelen.
-
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -37,3 +37,6 @@ it:
association_cant_have_inverse_of:
Non è permesso definire un inverse_of in questa associazione.
Usa questa opzione solo per embedded_in o references_many as array.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
View
@@ -8,43 +8,43 @@ kr:
errors:
messages:
document_not_found:
- 클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
+ 클라스 %{klass}와 id를 %{identifiers} 위한 문서를 찾을수 없습니다.
#Document not found for class %{klass} with id(s) %{identifiers}.
invalid_database:
- 데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
+ 데이타베이스가 Mongo::DB이어야 합니다, %{name}이면 안됩니다.
#Database should be a Mongo::DB, not %{name}.
invalid_type:
- 데이터 필드가 %{klass} 처럼 정의를 내립니다. 하지만 그것은 %{other}를 %{value} 으로 산출되어 받습니다
+ 데이터 필드가 %{klass} 처럼 정의를 내립니다. 하지만 그것은 %{other}를 %{value} 으로 산출되어 받습니다
#Field was defined as a(n) %{klass}, but received a %{other} with
#the value %{value}.
unsupported_version:
- MongoDB %{version} 를 사용할수 없습니다. %{mongo_version} 으로 업그레이드 시켜주세요.
+ MongoDB %{version} 를 사용할수 없습니다. %{mongo_version} 으로 업그레이드 시켜주세요.
#MongoDB %{version} not supported, please upgrade
#to %{mongo_version}.
validations:
- 확인할수 없습니다 - %{errors}.
+ 확인할수 없습니다 - %{errors}.
#Validation failed - %{errors}.
invalid_collection:
- %{klass} 를 위한 콜렉션에 접근하는것은 임베디드 문서이게 때문에 허락되지 않습니다. 루트 문서에서 콜렉션을 접근해 주세요
+ %{klass} 를 위한 콜렉션에 접근하는것은 임베디드 문서이게 때문에 허락되지 않습니다. 루트 문서에서 콜렉션을 접근해 주세요
#Access to the collection for %{klass} is not allowed since it
#is an embedded document, please access a collection from
#the root document.
invalid_field:
- 필드의 정의를 %{name}으로 이름짓는것은 허락되지 않습니다.
- Mongoid 내부의 속성과 메서드이름이 충돌이 되므로 필드의 정의를 내리지 마세요.
- 어떤이름이 포함되는지 보려면 Document#instance_methods를 사용하세요.
+ 필드의 정의를 %{name}으로 이름짓는것은 허락되지 않습니다.
+ Mongoid 내부의 속성과 메서드이름이 충돌이 되므로 필드의 정의를 내리지 마세요.
+ 어떤이름이 포함되는지 보려면 Document#instance_methods를 사용하세요.
#Defining a field named %{name} is not allowed. Do not define
#fields that conflict with Mongoid internal attributes or method
#names. Use Document#instance_methods to see what names this includes.
-
- too_many_nested_attribute_records:
- %{association} 을 위한 내부의 속성을 수용하는것은 %{limit}데이터로 제한되어있습니다.
+
+ too_many_nested_attribute_records:
+ %{association} 을 위한 내부의 속성을 수용하는것은 %{limit}데이터로 제한되어있습니다.
#Accepting nested attributes for %{association} is limited
#to %{limit} records.
@@ -53,13 +53,16 @@ kr:
#Options for embedded_in association must include inverse_of.
dependent_only_references_one_or_many:
- 공급되는 dependent => destroy|delete 옵션은 오직 references_one 또는 references_many 관련되는것에서만 확인 가능합니다.
+ 공급되는 dependent => destroy|delete 옵션은 오직 references_one 또는 references_many 관련되는것에서만 확인 가능합니다.
#The dependent => destroy|delete option that was supplied
#is only valid on references_one or references_many associations.
association_cant_have_inverse_of:
- 이관련된것에서 inverse_of 처럼 정의내리는것은 허락되지 않습니다.
- 오직 embedded_in 에있는 옵션 또는 array된 references_many 옵션을 사용하세요
+ 이관련된것에서 inverse_of 처럼 정의내리는것은 허락되지 않습니다.
+ 오직 embedded_in 에있는 옵션 또는 array된 references_many 옵션을 사용하세요
#Defining an inverse_of on this association is not allowed. Only
#use this option on embedded_in or references_many as array.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
View
@@ -0,0 +1,42 @@
+nl:
+ activemodel:
+ errors:
+ messages:
+ taken: al in gebruik
+
+ mongoid:
+ errors:
+ messages:
+ document_not_found:
+ Document niet gevonden voor class %{klass} met de id(s) %{identifiers}.
+ invalid_database:
+ Database moet een Mongo::DB zijn, niet een %{name}.
+ invalid_type:
+ Veld was gedefinieerd als een %{klass}, maar ontvangen als %{other} met
+ de waarde %{value}.
+ unsupported_version:
+ MongoDB %{version} wordt niet ondersteund, upgrade naar versie %{mongo_version}.
+ validations:
+ Gefaalde validatie - %{errors}.
+ invalid_collection:
+ Toegang tot de collectie voor %{klass} is niet toegestaan aangezien het
+ een embedded document is, benader de collectie van een root document.
+ invalid_field:
+ Het is niet toegestaan om een veld genaamd %{name} te definiëren.
+ Definieer geen velden die conflicteren met de Mongoid interne attributen of methode namen.
+ Gerbuik Document#instance_methods om welke namen dit gaat.
+ too_many_nested_attribute_records:
+ Het accepteren van nested attributes voor %{association} is gelimiteerd tot %{limit} records.
+ embedded_in_must_have_inverse_of:
+ Opties voor embedded_in association moet gebruik maken van de inverse_of optie.
+ dependent_only_references_one_or_many:
+ De dependent => destroy|delete optie die was meegegeven is alleen geldig
+ op references_one en references_many associations.
+ association_cant_have_inverse_of:
+ Het definieren van een inverse_of op deze association is niet toegestaan. Gebruik
+ alleen deze optie met embedded_in en references_many as array.
+ calling_document_find_with_nil_is_invalid:
+ Het is niet toegestaan om Document#find aan te roepen met de waarde nil.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -37,3 +37,6 @@ pl:
association_cant_have_inverse_of:
Definiowanie inverse_of dla tej asocjacji jest niedozwolone. Używaj
tej opcji tylko z embedded_in lub references_many as array.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -38,3 +38,6 @@ pt-br:
association_cant_have_inverse_of:
A definição de inverse_of nesta associação não é permitida. Apenas
use esta opção em embedded_in ou references_many as array.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -38,3 +38,6 @@ pt:
association_cant_have_inverse_of:
A definição de inverse_of nesta associação não é permitida. Apenas
use esta opção em embedded_in ou references_many como lista.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -1,4 +1,4 @@
-en:
+ro:
activemodel:
errors:
messages:
@@ -44,4 +44,6 @@ en:
tip embedded_in sau references_many as array.
calling_document_find_with_nil_is_invalid:
Folosirea metodei Document#find cu valoarea nil este invalidă.
-
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -37,4 +37,7 @@ sv:
är endast giltigt för references_one eller references_many associationer.
association_cant_have_inverse_of:
Att definera inverse_of på denna association är inte tillåtet. Använd
- endast detta alternativ på embedded_in eller references_many as array.
+ endast detta alternativ på embedded_in eller references_many as array.
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
@@ -29,3 +29,6 @@ en:
dependent => destroy|delete 选项只有在references_one或者references_many时候有效.
association_cant_have_inverse_of:
在当前的关联中,不允许定义inverse_of去,其只有在embedded_in或者references_many是数组的情况下使用
+ unsaved_document:
+ You cannot call create or create! through a relational association
+ relation (%{document}) who's parent (%{base}) is not already saved.
Oops, something went wrong.

0 comments on commit 3a34b80

Please sign in to comment.