From c029fd7accb70fe3f48f2ea32ac0cdda29b7c403 Mon Sep 17 00:00:00 2001
From: yafeilee <lyfi2003@gmail.com>
Date: Tue, 1 Apr 2014 19:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE,=20?=
 =?UTF-8?q?=E5=87=86=E5=A4=87=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                 |  5 +--
 config/mongoid.yml         | 69 --------------------------------------
 config/mongoid.yml.example | 28 ++++++++++++++++
 3 files changed, 31 insertions(+), 71 deletions(-)
 delete mode 100644 config/mongoid.yml
 create mode 100644 config/mongoid.yml.example

diff --git a/.gitignore b/.gitignore
index 035c922..21d3dcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,6 @@
 
 *.lock
 
-# Ignore application configuration
-/config/application.yml
+/config/*.yml
+/public/assets/*
+*.old
diff --git a/config/mongoid.yml b/config/mongoid.yml
deleted file mode 100644
index 45c195d..0000000
--- a/config/mongoid.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
-    default:
-      # Defines the name of the default database that Mongoid can connect to.
-      # (required).
-      database: w_blog_development
-      # Provides the hosts the default session can connect to. Must be an array
-      # of host:port pairs. (required)
-      hosts:
-        - localhost:27017
-      options:
-        # Change the default write concern. (default = { w: 1 })
-        # write:
-        # w: 1
-
-        # Change the default consistency model to primary, secondary.
-        # 'secondary' will send reads to secondaries, 'primary' sends everything
-        # to master. (default: primary)
-        # read: secondary_preferred
-
-        # How many times Moped should attempt to retry an operation after
-        # failure. (default: 30)
-        # max_retries: 30
-
-        # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # retry_interval: 1
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Includes the root model name in json serialization. (default: false)
-    # include_root_in_json: false
-
-    # Include the _type field in serializaion. (default: false)
-    # include_type_for_serialization: false
-
-    # Preload all models in development, needed when models use
-    # inheritance. (default: false)
-    # preload_models: false
-
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
-    # Raise an error when performing a #find and the document is not found.
-    # (default: true)
-    # raise_not_found_error: true
-
-    # Raise an error when defining a scope with the same name as an
-    # existing method. (default: false)
-    # scope_overwrite_exception: false
-
-    # Use Active Support's time zone in conversions. (default: true)
-    # use_activesupport_time_zone: true
-
-    # Ensure all times are UTC in the app side. (default: false)
-    # use_utc: false
-test:
-  sessions:
-    default:
-      database: w_blog_test
-      hosts:
-        - localhost:27017
-      options:
-        read: primary
-        # In the test environment we lower the retries and retry interval to
-        # low amounts for fast failures.
-        max_retries: 1
-        retry_interval: 0
diff --git a/config/mongoid.yml.example b/config/mongoid.yml.example
new file mode 100644
index 0000000..f405de5
--- /dev/null
+++ b/config/mongoid.yml.example
@@ -0,0 +1,28 @@
+development:
+  sessions:
+    default:
+      database: w_blog_development
+      hosts:
+        - localhost:27017
+  options:
+
+production:
+  sessions:
+    default:
+      database: w_blog_production
+      hosts:
+        - localhost:27017
+  options:
+
+test:
+  sessions:
+    default:
+      database: w_blog_test
+      hosts:
+        - localhost:27017
+      options:
+        read: primary
+        # In the test environment we lower the retries and retry interval to
+        # low amounts for fast failures.
+        max_retries: 1
+        retry_interval: 0