micro_sql 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/micro_sql/key_value_table.rb

@@ -4,12 +4,16 @@ require "json"
 
 class MicroSql::KeyValueTable < MicroSql::Table
   def initialize(db, table_name = "settings")
-    super db, "CREATE TABLE #{table_name}(uid TEXT PRIMARY KEY, value TEXT, ttl BIGINT)"
+    super db, "CREATE TABLE #{table_name}(uid TEXT PRIMARY KEY, value TEXT, ttl INTEGER NOT NULL)"
   end
   
   def [](key)
     value, ttl = db.ask("SELECT value, ttl FROM #{table_name} WHERE uid=?", key)
-    decode(value) if !ttl || ttl < Time.now.to_i
+    decode(value) if ttl && (ttl == 0 || ttl > Time.now.to_i)
+  end
+
+  def delete_all
+    @db.exec "DELETE FROM #{table_name}"
   end
 
   def cached(key, ttl = nil, &block)
@@ -19,7 +23,7 @@ class MicroSql::KeyValueTable < MicroSql::Table
   def update(key, value, ttl = nil)
     if value
       encoded = encode(value)
-      ttl += Time.now.to_i if ttl
+      ttl = ttl ? ttl + Time.now.to_i : 0
       affected = @db.ask("UPDATE #{table_name} SET value=?, ttl=? WHERE uid=?", encoded, ttl, key)
       if affected == 0
         @db.ask("INSERT INTO #{table_name}(value, ttl, uid) VALUES(?,?,?)", encoded, ttl, key)
@@ -31,6 +35,11 @@ class MicroSql::KeyValueTable < MicroSql::Table
     value
   end
 
+  def expire(key, ttl)
+    ttl = ttl ? ttl + Time.now.to_i : ttl
+    @db.ask("UPDATE #{table_name} SET ttl=? WHERE uid=?", ttl, key)
+  end
+
   alias :[]= :update
 
   private

data/micro_sql.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "micro_sql"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
-  s.date = "2012-04-03"
+  s.date = "2012-04-04"
   s.description = "You only need a single method to talk to your database..."
   s.email = "eno@open-lab.org"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micro_sql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70112976340220 !ruby/object:Gem::Requirement
+  requirement: &70179126169140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112976340220
+  version_requirements: *70179126169140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70112976338980 !ruby/object:Gem::Requirement
+  requirement: &70179126168360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112976338980
+  version_requirements: *70179126168360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70112976337920 !ruby/object:Gem::Requirement
+  requirement: &70179126167420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112976337920
+  version_requirements: *70179126167420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70112976336440 !ruby/object:Gem::Requirement
+  requirement: &70179126166660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112976336440
+  version_requirements: *70179126166660
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70112976328460 !ruby/object:Gem::Requirement
+  requirement: &70179126165880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112976328460
+  version_requirements: *70179126165880
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70112976327360 !ruby/object:Gem::Requirement
+  requirement: &70179126165220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112976327360
+  version_requirements: *70179126165220
 description: You only need a single method to talk to your database...
 email: eno@open-lab.org
 executables: []
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2450718260584937907
+      hash: -4089216543794682112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: