From 731d8fc6bed91bb12598c70d29205985f2b9f7fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Thu, 16 May 2013 12:50:34 -0300
Subject: [PATCH 1/4] added get_next_value to SequenceField

---
 mongoengine/fields.py  | 11 +++++++++++
 tests/fields/fields.py | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 2e149330..b2f5488e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1465,6 +1465,17 @@ class SequenceField(BaseField):
                                              upsert=True)
         return self.value_decorator(counter['next'])
 
+    def get_next_value(self):
+        sequence_name = self.get_sequence_name()
+        sequence_id = "%s.%s" % (sequence_name, self.name)
+        collection = get_db(alias=self.db_alias)[self.collection_name]
+        data = collection.find_one({"_id": sequence_id})
+
+        if data:
+            return data['next']
+
+        return 1
+
     def get_sequence_name(self):
         if self.sequence_name:
             return self.sequence_name
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 4fa6989c..444b71a5 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1917,6 +1917,23 @@ class FieldTest(unittest.TestCase):
         c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
         self.assertEqual(c['next'], 1000)
 
+
+    def test_sequence_field_get_next_value(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in xrange(10):
+            Person(name="Person %s" % x).save()
+
+        self.assertEqual(Person.id.get_next_value(), 10)
+        self.db['mongoengine.counters'].drop()
+
+        self.assertEqual(Person.id.get_next_value(), 1)
+        
     def test_sequence_field_sequence_name(self):
         class Person(Document):
             id = SequenceField(primary_key=True, sequence_name='jelly')

From 0b1e11ba1fd351fd78d33f03090b5f20e21f5085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Thu, 16 May 2013 12:55:16 -0300
Subject: [PATCH 2/4] added my github profile

---
 AUTHORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 0ff48e80..fbe697ac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,7 +25,7 @@ that much better:
  * flosch
  * Deepak Thukral
  * Colin Howe
- * Wilson Júnior
+ * Wilson Júnior (https://github.com/wpjunior)
  * Alistair Roche
  * Dan Crosta
  * Viktor Kerkez

From f7e22d2b8bc8acb2e4ab6d33c8814d8f6d49d63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Thu, 16 May 2013 13:05:07 -0300
Subject: [PATCH 3/4] fixes for get_next_value

---
 mongoengine/fields.py  | 2 +-
 tests/fields/fields.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0b6486a8..a56bad83 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1449,7 +1449,7 @@ class SequenceField(BaseField):
         data = collection.find_one({"_id": sequence_id})
 
         if data:
-            return data['next']
+            return data['next']+1
 
         return 1
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 527baa99..a9fed3cf 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1910,7 +1910,7 @@ class FieldTest(unittest.TestCase):
         for x in xrange(10):
             Person(name="Person %s" % x).save()
 
-        self.assertEqual(Person.id.get_next_value(), 10)
+        self.assertEqual(Person.id.get_next_value(), 11)
         self.db['mongoengine.counters'].drop()
 
         self.assertEqual(Person.id.get_next_value(), 1)

From bc92f78afb3694f1eb78104f6dc09902516541b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Thu, 16 May 2013 13:12:49 -0300
Subject: [PATCH 4/4] fixes for value_decorator

---
 mongoengine/fields.py  |  4 ++--
 tests/fields/fields.py | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index a56bad83..b192961f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1449,9 +1449,9 @@ class SequenceField(BaseField):
         data = collection.find_one({"_id": sequence_id})
 
         if data:
-            return data['next']+1
+            return self.value_decorator(data['next']+1)
 
-        return 1
+        return self.value_decorator(1)
 
     def get_sequence_name(self):
         if self.sequence_name:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index a9fed3cf..e803af84 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1914,6 +1914,21 @@ class FieldTest(unittest.TestCase):
         self.db['mongoengine.counters'].drop()
 
         self.assertEqual(Person.id.get_next_value(), 1)
+
+        class Person(Document):
+            id = SequenceField(primary_key=True, value_decorator=str)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in xrange(10):
+            Person(name="Person %s" % x).save()
+
+        self.assertEqual(Person.id.get_next_value(), '11')
+        self.db['mongoengine.counters'].drop()
+
+        self.assertEqual(Person.id.get_next_value(), '1')
         
     def test_sequence_field_sequence_name(self):
         class Person(Document):