Skip to content
This repository has been archived by the owner on Jan 2, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' into chinese
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhhz
zhhz committed Dec 10, 2008
2 parents 9ea5bbc + f2bee85 commit 5b1218c
Show file tree
Hide file tree
Showing 98 changed files with 2,112 additions and 98 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.DS_Store
log/*
nbproject
4 changes: 2 additions & 2 deletions README.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ Please follow our editor guidelines, especially:
* Chinese: http://github.com/zhhz (Zhonghai Zuo)
* French: http://github.com/pointcom (Mathieu Fosse)
* German: http://github.com/cypher (Markus Prinz)
* Italian: (pending)
* Italian: http://github.com/carlopecchia (Carlo Pecchia)
* Japanese: http://github.com/kwatch (Makoto Kuwata)
* Portuguese: http://github.com/akitaonrails (Fabio Akita)
* Russian: http://github.com/cheba (Alex Mankuta)
* Spanish: (pending)
* Dutch: http://github.com/pvelder (Peter De Velder)
* Arabic
* Arabic http://github.com/khelll (Khaled AlHabache)

## Legal

Expand Down
65 changes: 32 additions & 33 deletions app/views/layout/application.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="<%= language %>">
<head>
<title>The Merb Open Source Book</title>
<title>- The Merb Open Source Book - <%= params[:page_name] || params[:chapter_name] %></title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" href="/stylesheets/master.css" type="text/css"
<link rel="stylesheet" href="/stylesheets/merb_book.css" type="text/css"
media="screen" charset="utf-8" />
</head>
<body>
<p id="warning">This book is a work in progress; feel free to
<a href="http://github.com/mattetti/merb-book">contribute</a>.</p>
<%#= message[:notice] %>
<p id="warning">This book is a work in progress; feel free to
<a href="http://github.com/mattetti/merb-book">contribute</a>.</p>

<div id="book-title"><a href="/">The Merb Open Source Book</a></div>
<div id="book">
<div class="toc-link">
<a href="<%= url(:toc, :language => language) %>"
>table of contents</a></div>
<div id="language-switch">
<%= language_switch %>
</div>
<div id="book-title"><a href="/">The Merb Open Source Book</a></div>
<div id="book">
<div class="toc-link">
<a href="<%= url(:toc, :language => language) %>">table of contents</a>
</div>
<div id="language-switch">
<%= language_switch %>
</div>

<div id="book-content" <%= rtl_support_class %> >
<%= catch_content :for_layout %>
</div>
<div id="nav-links">
<%= page_nav_links %>
</div>
<div id="book-content" <%= rtl_support_class %> >
<%= catch_content :for_layout %>
</div>
<div id="nav-links">
<%= page_nav_links %>
</div>

</div>
</div>

<div id="footer">
<span>The content of this book is licensed under the
<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/"
>Creative Commons Attribution-Non Commercial-Share Alike 3.0
license</a>.</span>
<div id="footer">
<span>The content of this book is licensed under the
<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/"
>Creative Commons Attribution-Non Commercial-Share Alike 3.0
license</a>.</span>

<p>The source code of the book application is dual licensed under the
<a href="http://www.opensource.org/licenses/mit-license.php">MIT</a>
and <a href="http://www.gnu.org/licenses/gpl.html">GPL</a> licenses. </p>
</div>
<script type="text/javascript">
<p>The source code of the book application is dual licensed under the
<a href="http://www.opensource.org/licenses/mit-license.php">MIT</a>
and <a href="http://www.gnu.org/licenses/gpl.html">GPL</a> licenses. </p>
</div>
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
</script>
Expand Down
1 change: 1 addition & 0 deletions bin/log/merb.main.pid
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
439
107 changes: 54 additions & 53 deletions book-content/ar/toc.markdown
View file
Original file line number Diff line number Diff line change
@@ -1,62 +1,63 @@
#قائمة المحتويات

#فهرس الكتاب

<div id="intro" class=".available-for-translation">
<p>Welcome to the Merb Open Source Book. The purpose of this book is simple: to guide beginners and advanced users through the Merb Framework.</p>
<p>In all honesty, this book won't answer all of your questions about Merb or Ruby, let alone cover all of the use cases. However, with the help of the Ruby Community, we will be able to cover most of what you need to use Merb on a daily basis.</p>
<p>If you are learning through this material, or if you already use Merb frequently, <strong>please consider helping improve the content of this book</strong>.</p>
<p>اهلا بكم في الكتاب المفتوح المصدر ل Merb. الهدف من هذا الكتاب بسيط: ارشاد المستخدمين المستجدّين والخبراء منهم حول كيفية استخدام Merb</p>
<p> بكل صدق, لن يجيب هذا الكتاب عن كل اسئلتك حول Merb او Ruby, ولن يغطي كل حالات الإستخدام الممكنة. ولكن بدعم من مجتمع Ruby, يمكن ان نغطي معظم مايمكن ان تحتاجه في الاستخدام اليومي.</p>
<p>إذا كنت تتعلم من خلال هذه المادة,او إذا كنت تستخدم Merb بشكل دوري, <strong>فنتمنّى عليك ان تنظر في امكانية تطوير محتوى هذا الكتاب</strong>.</p>
</div>

0. [Front Matter](/front-matter)
1. [Foreword By Yehuda Katz](/front-matter/foreword)
2. [Preface by Matt Aimonetti](/front-matter/preface)
3. [Contributors](/front-matter/contributors)
1. [Introduction](/introduction)
1. [Ruby Language](/introduction/ruby)
2. [Merb Web Framework](/introduction/merb)
3. [DataMapper ORM](/introduction/datamapper)
4. [RSpec testing framework](/introduction/rspec)
2. [Getting Started](/getting-started)
1. [Install Instructions](/getting-started/install-instructions)
1. [Generate an application](/getting-started/generate-an-application)
1. [Project structure](/getting-started/project-structure)
1. [MVC](/getting-started/mvc)
1. [Controllers](/getting-started/controllers)
1. [Views](/getting-started/views)
1. [Models](/getting-started/models)
1. [Request path](/getting-started/request-path)
1. [Router](/getting-started/router)
3. [Interacting with the database](/interacting-with-the-database)
1. [Setting up the database connection](/interacting-with-the-database/dm-setting-up)
1. [Database Schema](/interacting-with-the-database/dm-schema)
1. [Database Queries](/interacting-with-the-database/dm-queries)
1. [Model Relationships](/interacting-with-the-database/dm-relationships)
1. [Database Migrations](/interacting-with-the-database/dm-migrations)
1. [Model Validations](/interacting-with-the-database/dm-validations)
4. [Testing your application](/testing-your-application)
1. [Why test](/testing-your-application/why)
1. [Testing your models](/testing-your-application/models)
1. [Testing your requests](/testing-your-application/requests)
1. [Integration testing with RSpec Cucumber](/testing-your-application/cucumber)
5. [Merb More](/merb-more)
1. [Authentication](/merb-more/authentication)
1. [Mailer](/merb-more/mailer)
1. [Caching](/merb-more/caching)
1. [Exceptions](/merb-more/exceptions)
1. [Slices](/merb-more/slices)
6. [Recipes](/recipes)
1. [Simple Blog](/recipes/simple-blog)
1. [Building a Blog Slice](/recipes/blog-slice)
7. [Deployment](/deployment)
1. [Passenger](/deployment/passenger)
1. [nginx](/deployment/nginx)
1. [JRuby and Glassfish](/deployment/jruby)
1. [Bundling your Merb application](/deployment/bundle)
0. [توطئة](/ar/front-matter)
1. [إهداء من Yehuda Katz](/ar/front-matter/foreword)
2. [تقدمة من Matt Aimonetti](/ar/front-matter/preface)
3. [المشاركون](/ar/front-matter/contributors)
1. [المقدمة](/ar/introduction)
1. [لغة Ruby](/ar/introduction/ruby)
2. [إطار عمل Merb](/ar/introduction/merb)
3. [DataMapper ORM](/ar/introduction/datamapper)
4. [إطار الإختبار RSpec](/ar/introduction/rspec)
2. [بدء العمل](/ar/getting-started)
1. [تعليمات التنصيب](/ar/getting-started/install-instructions)
1. [توليد التطبيق](/ar/getting-started/generate-an-application)
1. [بنية المشروع](/ar/getting-started/project-structure)
1. [MVC](/ar/getting-started/mvc)
1. [المتحكمات Controllers](/ar/getting-started/controllers)
1. [واجهة العرض Views](/ar/getting-started/views)
1. [النماذج Models](/ar/getting-started/models)
1. [مسار الطلب Request path](/ar/getting-started/request-path)
1. [الموجّه Router](/ar/getting-started/router)
3. [التعامل مع قاعدة البيانات](/ar/interacting-with-the-database)
1. [إنشاء الإتصال مع قاعدة البيانات](/ar/interacting-with-the-database/dm-setting-up)
1. [مخطط قاعدة البيانات](/ar/interacting-with-the-database/dm-schema)
1. [استعلامات قاعدة البيانات](/ar/interacting-with-the-database/dm-queries)
1. [علاقات النموذج](/ar/interacting-with-the-database/dm-relationships)
1. [Database Migrations](/ar/interacting-with-the-database/dm-migrations)
1. [التحقق من النماذج](/ar/interacting-with-the-database/dm-validations)
4. [اختبار التطبيق](/ar/testing-your-application)
1. [لماذا الإختبار](/ar/testing-your-application/why)
1. [اختبار النماذج](/ar/testing-your-application/models)
1. [اختبار الطلبات ](/ar/testing-your-application/requests)
1. [التكامل مع RSpec Cucumber](/ar/testing-your-application/cucumber)
5. [ المزيد من Merb](/ar/merb-more)
1. [التوثيق](/ar/merb-more/authentication)
1. [مزود البريد](/ar/merb-more/mailer)
1. [التخزين المؤقت Caching](/ar/merb-more/caching)
1. [الإستثناءات Exceptions](/ar/merb-more/exceptions)
1. [الشرائح Slices](/ar/merb-more/slices)
6. [الوصفات](/ar/recipes)
1. [مدوّنة بسيطة](/ar/recipes/simple-blog)
1. [بناء شريحة لمدونة](/ar/recipes/blog-slice)
7. [التوظيف](/ar/deployment)
1. [Passenger](/ar/deployment/passenger)
1. [nginx](/ar/deployment/nginx)
1. [JRuby and Glassfish](/ar/deployment/jruby)
1. [تجميع تطبيق Merb](/ar/deployment/bundle)

{: #toc .available-for-translation}

* [Appendix](/appendix)
1. [Hints/Tips](/appendix/hints-tips)
1. [Available Slices](/appendix/slices)
1. [Useful Gems](/appendix/gems)
* [ملحق](/ar/appendix)
1. [تلميحات وحيل](/ar/appendix/hints-tips)
1. [الشرائح المتوافرة ](/ar/appendix/slices)
1. [Gems مفيدة](/ar/appendix/gems)

{: #appendices}
3 changes: 3 additions & 0 deletions book-content/bg/0-front-matter/0-foreword.markdown
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Предисловие

Предговор от Яхуда Катз, главен разработчик на Merb
50 changes: 50 additions & 0 deletions book-content/bg/0-front-matter/1-preface.markdown
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Уводни думи

Назад във времето, когато нямаше Merb стек, нямаше недостъпен API,
нямаше оргранизирана документация и кодовата база се променяше често, [Матю Форд](http://github.com/deimos1986) реши да работи върху [Open Source][] книга със семплата цел: да помогне на смелите рубисти, които живеят на ръба и бяха решили да пробват Merb, [DataMapper][], and [RSpec][].

От тогава Merb се разви много, разработката и употребата се улесниха, което доведе до решение да бъде напревена "**opinionated**" версия на стека: Merb, DataMapper, and RSpec!

Като един от първите разработчици на Merb, имах удоволствието да чета книгата на Мат, както и да помагам с идеи и съдържание. Тогава се присъдединих към екипа разработчици на Merb;
с останалите се фокусирахме върху версия 1.0.
Направихме това в две(успешни!) стъпки:
първият Release Candidate по време на [MerbCamp 2008][]
и финалната версия 1.0 по време на [RubyConf 2008][].

Наличието на Merb 1.0 е страхотно, но Джейсън Сайфър от [RailsEnvy.com][] ми сподели след обявяването на 1.0 следното:

> Merb притежава страхотна и лесно четима документация на кода, но липсва документация на ниво потребител.
И беше прав. Естествено, имахме [Merb wiki][] и няколко налични книги, но имайки предвид други "frameworks" като [Django][], екипа знаеше, че трява да направи нещо по въпроса.

Усилията на Форд бяха забелязани и [Apress][] му предложиха да напише книга: [Beginning Merb][].
Както можете да си представите, беше друдно за Мат да напише книга за издател, да работи отделно и да допринася на няколко Open Source проекта, да следи развитието на Merb и да редактира и дописва "Оpen Source" книгата, която започна преди време.
Освен това много неща в pre-1.0 бяха променени и някои части на наличното съдържание трябваше да бъдат написани на ново.

За това екипът на Merb реши, че е време да се намеси и фокусира върху потребителски ориентирана книга.

Щастлив съм от решението на екипа да поеме отговорността за тази книга и Ви уверявам, че тя ще остане организирана и актуална и организиране.

Въперки това, книгата, както Merb,
не би се развила без помоща на обществото.
За това Ви моля да ни изпращата корекции, нови примери, нови глави.
so this book can help the community as a whole.

[Мат Аимонети](http://merbist.com), член на Merb Core екипа


[Apress]: http://www.apress.com/
[Beginning Merb]: http://www.apress.com/book/view/9781430218234
[DataMapper]: http://datamapper.org/doku.php
[Django]: http://www.djangobook.com/
[Matt Aimonetti]: http://merbist.com
[Matthew Ford]: http://github.com/deimos1986
[MerbCamp 2008]: http://merbcamp.com
[Open Source]: http://en.wikipedia.org/wiki/Open_Source
[RailsEnvy.com]: http://railsenvy.com
[RSpec]: http://rspec.info
[RubyConf 2008]: http://rubyconf.org
[Merb wiki]: http://wiki.merbivore.com



16 changes: 16 additions & 0 deletions book-content/bg/0-front-matter/2-contributors.markdown
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Хора, които допринасят за развитието на Merb

Благодарим на хората, виновни за написването на книгата !

**В азбучен ред :**

* [Мат Аимонети ](http://merbist.com)
* [Фабио Акита ](http://akitaonrails.com)
* [Дейл Кембъл ](http://corrupt.save-state.net/)
* [Матю Форд ](http://github.com/deimos1986)
* [Матю Фос ](http://blog.kawooa.org)
* [Маркъс Принс ](http://blog.nuclearsquid.com/)
* [Яхуда Катз ](http://yehudakatz.com)
* [Макото Кувата ](http://www.kuwata-lab.com/)
* [Рич Морин ](http://cfcl.com/rdm)
* [Фой Сава ](http://foysavas.com/)

0 comments on commit 5b1218c

Please sign in to comment.