From 60598d8a22a59ef257f6a67b6e3eaf577f550e57 Mon Sep 17 00:00:00 2001 From: Sen-Zhang Date: Thu, 22 Sep 2016 14:06:17 -0700 Subject: [PATCH] fix some typos --- couchbase/couchbase.go | 4 ++-- file.go | 4 ++-- ledis/ledis.go | 4 ++-- ledis/ledis_test.go | 2 +- memcache/memcache.go | 4 ++-- memcache/memcache_test.go | 2 +- memory.go | 6 +++--- mysql/mysql.go | 4 ++-- mysql/mysql_test.go | 4 ++-- nodb/nodb.go | 4 ++-- nodb/nodb_test.go | 2 +- postgres/postgres.go | 4 ++-- postgres/postgres_test.go | 4 ++-- redis/redis.go | 4 ++-- redis/redis_test.go | 2 +- session.go | 14 +++++++------- session_test.go | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/couchbase/couchbase.go b/couchbase/couchbase.go index 1a77a42..1bf8e60 100644 --- a/couchbase/couchbase.go +++ b/couchbase/couchbase.go @@ -167,8 +167,8 @@ func (p *CouchbaseProvider) Exist(sid string) bool { } } -// Destory deletes a session by session ID. -func (p *CouchbaseProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *CouchbaseProvider) Destroy(sid string) error { p.b = p.getBucket() defer p.b.Close() diff --git a/file.go b/file.go index 438269e..1805f45 100644 --- a/file.go +++ b/file.go @@ -165,8 +165,8 @@ func (p *FileProvider) Exist(sid string) bool { return com.IsFile(p.filepath(sid)) } -// Destory deletes a session by session ID. -func (p *FileProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *FileProvider) Destroy(sid string) error { p.lock.Lock() defer p.lock.Unlock() return os.Remove(p.filepath(sid)) diff --git a/ledis/ledis.go b/ledis/ledis.go index 73e27f5..dff4edf 100644 --- a/ledis/ledis.go +++ b/ledis/ledis.go @@ -169,8 +169,8 @@ func (p *LedisProvider) Exist(sid string) bool { return err == nil && count > 0 } -// Destory deletes a session by session ID. -func (p *LedisProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *LedisProvider) Destroy(sid string) error { _, err := p.c.Del([]byte(sid)) return err } diff --git a/ledis/ledis_test.go b/ledis/ledis_test.go index 6fa07dc..5de62bb 100644 --- a/ledis/ledis_test.go +++ b/ledis/ledis_test.go @@ -63,7 +63,7 @@ func Test_LedisProvider(t *testing.T) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() diff --git a/memcache/memcache.go b/memcache/memcache.go index f4a9e81..f8aa14f 100644 --- a/memcache/memcache.go +++ b/memcache/memcache.go @@ -147,8 +147,8 @@ func (p *MemcacheProvider) Exist(sid string) bool { return err == nil } -// Destory deletes a session by session ID. -func (p *MemcacheProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *MemcacheProvider) Destroy(sid string) error { return p.c.Delete(sid) } diff --git a/memcache/memcache_test.go b/memcache/memcache_test.go index d57efa2..d0ccb8b 100644 --- a/memcache/memcache_test.go +++ b/memcache/memcache_test.go @@ -63,7 +63,7 @@ func Test_MemcacheProvider(t *testing.T) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() diff --git a/memory.go b/memory.go index 4ad9293..fbb5b80 100644 --- a/memory.go +++ b/memory.go @@ -145,8 +145,8 @@ func (p *MemProvider) Exist(sid string) bool { return ok } -// Destory deletes a session by session ID. -func (p *MemProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *MemProvider) Destroy(sid string) error { p.lock.Lock() defer p.lock.Unlock() @@ -171,7 +171,7 @@ func (p *MemProvider) Regenerate(oldsid, sid string) (RawStore, error) { return nil, err } - if err = p.Destory(oldsid); err != nil { + if err = p.Destroy(oldsid); err != nil { return nil, err } diff --git a/mysql/mysql.go b/mysql/mysql.go index 0d96fb8..6210bad 100644 --- a/mysql/mysql.go +++ b/mysql/mysql.go @@ -149,8 +149,8 @@ func (p *MysqlProvider) Exist(sid string) bool { return err != sql.ErrNoRows } -// Destory deletes a session by session ID. -func (p *MysqlProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *MysqlProvider) Destroy(sid string) error { _, err := p.c.Exec("DELETE FROM session WHERE `key`=?", sid) return err } diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go index 3ac1544..aeaaa96 100644 --- a/mysql/mysql_test.go +++ b/mysql/mysql_test.go @@ -65,7 +65,7 @@ func Test_MysqlProvider(t *testing.T) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() @@ -98,7 +98,7 @@ func Test_MysqlProvider(t *testing.T) { So(err, ShouldBeNil) So(raw, ShouldNotBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() diff --git a/nodb/nodb.go b/nodb/nodb.go index c02f323..b25d802 100644 --- a/nodb/nodb.go +++ b/nodb/nodb.go @@ -149,8 +149,8 @@ func (p *NodbProvider) Exist(sid string) bool { return err == nil && count > 0 } -// Destory deletes a session by session ID. -func (p *NodbProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *NodbProvider) Destroy(sid string) error { _, err := p.c.Del([]byte(sid)) return err } diff --git a/nodb/nodb_test.go b/nodb/nodb_test.go index ae3101a..6d65041 100644 --- a/nodb/nodb_test.go +++ b/nodb/nodb_test.go @@ -63,7 +63,7 @@ func Test_LedisProvider(t *testing.T) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() diff --git a/postgres/postgres.go b/postgres/postgres.go index 8749f57..e10cd43 100644 --- a/postgres/postgres.go +++ b/postgres/postgres.go @@ -150,8 +150,8 @@ func (p *PostgresProvider) Exist(sid string) bool { return err != sql.ErrNoRows } -// Destory deletes a session by session ID. -func (p *PostgresProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *PostgresProvider) Destroy(sid string) error { _, err := p.c.Exec("DELETE FROM session WHERE key=$1", sid) return err } diff --git a/postgres/postgres_test.go b/postgres/postgres_test.go index cdbdb58..98ff2a6 100644 --- a/postgres/postgres_test.go +++ b/postgres/postgres_test.go @@ -65,7 +65,7 @@ func Test_PostgresProvider(t *testing.T) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() @@ -98,7 +98,7 @@ func Test_PostgresProvider(t *testing.T) { So(err, ShouldBeNil) So(raw, ShouldNotBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() diff --git a/redis/redis.go b/redis/redis.go index ca1cf88..8f15968 100644 --- a/redis/redis.go +++ b/redis/redis.go @@ -181,8 +181,8 @@ func (p *RedisProvider) Exist(sid string) bool { return err == nil && has } -// Destory deletes a session by session ID. -func (p *RedisProvider) Destory(sid string) error { +// Destroy deletes a session by session ID. +func (p *RedisProvider) Destroy(sid string) error { return p.c.Del(p.prefix + sid).Err() } diff --git a/redis/redis_test.go b/redis/redis_test.go index ae77320..2ff7bcc 100644 --- a/redis/redis_test.go +++ b/redis/redis_test.go @@ -63,7 +63,7 @@ func Test_RedisProvider(t *testing.T) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder() diff --git a/session.go b/session.go index 7e7b833..1ce7d02 100644 --- a/session.go +++ b/session.go @@ -53,8 +53,8 @@ type Store interface { RawStore // Read returns raw session store by session ID. Read(string) (RawStore, error) - // Destory deletes a session. - Destory(*macaron.Context) error + // Destroy deletes a session. + Destroy(*macaron.Context) error // RegenerateId regenerates a session store from old session ID to new one. RegenerateId(*macaron.Context) (RawStore, error) // Count counts and returns number of sessions. @@ -199,8 +199,8 @@ type Provider interface { Read(sid string) (RawStore, error) // Exist returns true if session with given ID exists. Exist(sid string) bool - // Destory deletes a session by session ID. - Destory(sid string) error + // Destroy deletes a session by session ID. + Destroy(sid string) error // Regenerate regenerates a session store from old session ID to new one. Regenerate(oldsid, sid string) (RawStore, error) // Count counts and returns number of sessions. @@ -285,14 +285,14 @@ func (m *Manager) Read(sid string) (RawStore, error) { return m.provider.Read(sid) } -// Destory deletes a session by given ID. -func (m *Manager) Destory(ctx *macaron.Context) error { +// Destroy deletes a session by given ID. +func (m *Manager) Destroy(ctx *macaron.Context) error { sid := ctx.GetCookie(m.opt.CookieName) if len(sid) == 0 { return nil } - if err := m.provider.Destory(sid); err != nil { + if err := m.provider.Destroy(sid); err != nil { return err } cookie := &http.Cookie{ diff --git a/session_test.go b/session_test.go index e2e8854..aa49548 100644 --- a/session_test.go +++ b/session_test.go @@ -104,7 +104,7 @@ func testProvider(opt Options) { So(sess.Delete("uname"), ShouldBeNil) So(sess.Get("uname"), ShouldBeNil) - So(sess.Destory(ctx), ShouldBeNil) + So(sess.Destroy(ctx), ShouldBeNil) }) resp := httptest.NewRecorder()