*: update redefs of `to_json`

[nit.git] / lib / popcorn / pop_repos.nit

diff --git a/lib/popcorn/pop_repos.nit b/lib/popcorn/pop_repos.nit
index 852f467..0a6bd37 100644 (file)
--- a/lib/popcorn/pop_repos.nit
+++ b/lib/popcorn/pop_repos.nit
@@ -54,7 +54,6 @@
 #      redef fun to_s do return title
 #      redef fun ==(o) do return o isa SELF and id == o.id
 #      redef fun hash do return id.hash
-#      redef fun to_json do return serialize_to_json
 # end
 #
 # # We then need to subclass the `MongoRepository` to provide Book specific services.
@@ -119,10 +118,54 @@
 # ~~~
 module pop_repos
 
+import popcorn::pop_config
 import serialization
 import json::serialization
 import mongodb::queries
 
+redef class AppConfig
+
+       # Default database host string for MongoDb
+       var default_db_host = "mongodb://localhost:27017/"
+
+       # Default database hostname
+       var default_db_name = "popcorn"
+
+       # MongoDB server used for data persistence
+       var db_host: String is lazy do return value_or_default("db.host", default_db_host)
+
+       # MongoDB DB used for data persistence
+       var db_name: String is lazy do return value_or_default("db.name", default_db_name)
+
+       # Mongo db client
+       var client = new MongoClient(db_host) is lazy
+
+       # Mongo db instance
+       var db: MongoDb = client.database(db_name) is lazy
+
+       redef init from_options(opts) do
+               super
+               var db_host = opts.opt_db_host.value
+               if db_host != null then self["db.host"] = db_host
+               var db_name = opts.opt_db_name.value
+               if db_name != null then self["db.name"] = db_name
+       end
+end
+
+redef class AppOptions
+
+       # MongoDb host name
+       var opt_db_host = new OptionString("MongoDb host", "--db-host")
+
+       # MongoDb database name
+       var opt_db_name = new OptionString("MongoDb database name", "--db-name")
+
+       init do
+               super
+               add_option(opt_db_host, opt_db_name)
+       end
+end
+
 # A Repository is an object that can store serialized instances.
 #
 # Repository is the base class of all kind of persistance processes. It offers
@@ -149,7 +192,10 @@ interface Repository[E: Serializable]
        # Find all instances based on `query`
        #
        # Using `query` == null will retrieve all the document in the repository.
-       fun find_all(query: nullable QUERY): Array[E] is abstract
+       fun find_all(query: nullable QUERY, skip, limit: nullable Int): Array[E] is abstract
+
+       # Count instances that matches `query`
+       fun count(query: nullable QUERY): Int is abstract
 
        # Save an `instance`
        fun save(instance: E): Bool is abstract
@@ -290,14 +336,18 @@ class MongoRepository[E: Serializable]
                return deserialize(res.to_json)
        end
 
-       redef fun find_all(query) do
+       redef fun find_all(query, skip, limit) do
                var res = new Array[E]
-               for e in collection.find_all(query or else new JsonObject) do
+               for e in collection.find_all(query or else new JsonObject, skip, limit) do
                        res.add deserialize(e.to_json).as(E)
                end
                return res
        end
 
+       redef fun count(query) do
+               return collection.count(query or else new JsonObject)
+       end
+
        redef fun save(item) do
                var json = serialize(item).as(String)
                var obj = json.parse_json.as(JsonObject)
@@ -385,7 +435,6 @@ abstract class RepoObject
 
        redef fun hash do return id.hash
        redef fun to_s do return id
-       redef fun to_json do return serialize_to_json
 end
 
 # JsonObject can be used as a `RepositoryQuery`.