expires 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1446302323c38bdefd615bf3233188cf80e00160
-  data.tar.gz: 4f8c9717d3e77a6197b7b5166cfbaec6a90343bd
+  metadata.gz: 56e31be07a9e1e953a4b0ad9d2e6d0b412c53cf7
+  data.tar.gz: e6719430566a092eead55ce856d514f090da2308
 SHA512:
-  metadata.gz: f7997dfca5ccdca7e0a94245c97710ef7ca33ed080c93a32eda844bb8371ab354bf670809eb5662df2ac2b09325cd19b4e296b246b0cad78b712d65da72e847a
-  data.tar.gz: 9762d5d75054c2d275b9e8f9c82d4ca1d15e4ba7a116126497d0160c2f9d513841d49831055453c5d7f140acafae91439dc5618a87208edfeb9134489e04b323
+  metadata.gz: 4fded42175255292c7d97e954813e8e88381c1caf3b295fb326646df06599c52546ed31730cfab339eda524b4412a974bfba9d4fe187adc721525da0f7352c72
+  data.tar.gz: e47cdeb20c79b66c30eaaa4b11dbc78a444363dbe82211fd187774cd8364bca08187279a131944ef06fb802ca48103962ff33e0f2d59c5950fa6621e39974f6a

data/expires.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'color_print'
+  spec.add_dependency 'sqlite3'
+
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "color_print"
-  spec.add_development_dependency "sqlite3"
-
 end

data/lib/expires/version.rb

@@ -1,3 +1,3 @@
 class Expires
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/expires.rb

@@ -1,8 +1,13 @@
 require "expires/version"
 require 'sqlite3'
+require 'json'
+require 'pry'
 
 class Expires
   class DummyIO;def puts str;end;end
+  
+  KEYS = %w[key value created_at updated_at expire on_expire remind]
+  SCHEMA = %Q(create table NAMESPACE (key TEXT PRIMARY KEY, value TEXT, created_at INTEGER, updated_at INTEGER, expire INTEGER, on_expire TEXT, remind TEXT);)
 
   @@dbs = Hash.new #namespace: instance
   @@database = 'expires.sqlite3'
@@ -28,6 +33,7 @@ class Expires
     @expire     = expire
     @hotload    = hotload
     @body       = Hash.new
+    @remind     = Hash.new
 
     connect(namespace)
     sync if @hotload
@@ -42,9 +48,13 @@ class Expires
     @synced = true
   end
   
+  def schema namespace
+    return SCHEMA.gsub("NAMESPACE",namespace)
+  end
+
   def create(namespace)
     begin
-      @@db.execute(sql = "create table #{namespace} (key TEXT PRIMARY KEY, value TEXT, created_at INTEGER, updated_at INTEGER, expire INTEGER);")
+      @@db.execute(sql = schema(namespace))
       @@io.puts sql
     rescue SQLite3::SQLException => e
       raise e unless e.message =~ /table .* already exists/
@@ -53,9 +63,26 @@ class Expires
   end
 
   def kill_expired
+    @killing = true
     now = Time.new.to_i
+    expires = @@db.execute(sql = "select on_expire, key, value from #{@namespace} where (updated_at+expire) < #{now};")
+    expires.each do |values|
+      if values[0]
+        begin
+          @key = values[1]
+          @value = values[2]
+          flash(@key) 
+          eval values[0].gsub("$n","\n")
+        rescue =>e
+          STDERR.puts e
+          STDERR.puts e.backtrace
+        end
+      end
+    end
+
     @@db.execute(sql = "delete from #{@namespace} where (updated_at+expire) < #{now};")
     @@io.puts sql
+    @killing = nil
   end
 
   def connect(namespace)
@@ -75,10 +102,9 @@ class Expires
     end
   end
 
-  def set key, value
+  def set key, value, expire = @expire
     @body[key] = value
-    kill_expired
-    record = @@db.execute("select created_at from #{@namespace} where key = '#{key}' limit 1;").first
+    record = select(key, :created_at)
     
     if record
       created_at = record[0]
@@ -86,25 +112,126 @@ class Expires
     else
       updated_at = created_at = Time.new.to_i
     end
-
-    @@db.execute(sql="insert or replace into #{@namespace} (key,value,created_at,updated_at,expire) values ('#{key}','#{value}','#{created_at}','#{updated_at}','#{@expire}');")
+    
+    @@db.execute(sql="insert or replace into #{@namespace} (key,value,created_at,updated_at,expire)"+
+                 " values ('#{key}','#{value}','#{created_at}','#{updated_at}','#{expire}'#{});")
     @@io.puts sql
     #TODO: syncedで状態管理
   end
 
-  def [](key)
-    if @hotload
-      self.kill_expired
-      return @body[key] = @@db.execute("select value from #{@namespace} where key = '#{key}' limit 1;").first.first
-    else
-      return @body[key]
+  def []=(key,value)
+    set(key,value)
+  end
+
+  def clean
+    @@db.execute("delete from #{@namespace};")
+    @@db.execute("VACUUM;")
+  end
+
+  def remind key, hash
+    raise "Remind your value as Hash." unless hash.is_a?(Hash)
+    update key, :remind, JSON.generate(hash) if get key
+    @remind[key.to_sym] = hash
+  end
+
+  def forget key
+    raise "Remind your value as Hash." unless hash.is_a?(Hash)
+    update key, :remind, "{}" if get key
+    @remind[key.to_sym] = {}
+  end
+
+  def flash key
+    if value = select(key, :remind)
+      begin
+        @remind = JSON.parse value.first
+      rescue
+        STDERR.puts "Invalid JSON value."
+      end
     end
+  end
+
+  def select key, *columns
+    kill_expired unless @killing
+    return @body[key.to_sym] = @@db.execute("select #{columns.join(", ")} from #{@namespace} where key = '#{key}' limit 1;").first
+  end
+
+  def get key
+    return select(key, :value).first
   rescue => e
     return nil
   end
 
-  def []=(key,value)
-    set(key,value)
+  def [](key)
+    get key
+  end
+
+  def update key, column, value
+    sql = Expires.escape_sqlite3("update :_namespace_ set #{column} = (:#{column}) where key = (:key);",
+                                 column=>value,
+                                 :key=>key, 
+                                 :_namespace_=>@namespace)
+    @@db.execute(sql)
+    sql
+  end
+
+  def updates key, hash
+    sql = "update :_namespace_ set "
+    first = true
+    hash.each do |k, v|
+      if first
+        first = false
+      else
+        sql << ','
+      end
+      sql << "#{k} = :#{k} "
+    end
+    sql << "where key = (:key);"
+
+    sql = Expires.escape_sqlite3(sql,
+                                 :key=>key, 
+                                 :_namespace_=>@namespace,
+                                 **hash)
+    @@db.execute(sql)
+    sql
+  end
+  
+  def closer key, procedure=nil, remind: nil, &block
+    if block_given?
+      obj = Object.new
+      obj.define_singleton_method(:_, &block)
+      procedure = obj.method(:_).to_proc
+    end
+
+    source = Expires.get_source_str(procedure.source).gsub(/\n/,"$n")
+    if get key
+      sql = updates key, {:on_expire=>source.to_s, :remind=>JSON.generate(remind)}
+    else
+      #procedure.call
+      return
+    end
+
+    kill_expired
+    @@io.puts sql
+  end
+  
+  def self.get_source_str source
+    source.gsub!(/\n/,"$n")
+    source.gsub!(/\A.*?(-> +\(.*\)|lambda) +?(do|\{)( +)?(\|.*?\|)?/, "")
+    source.gsub!(/\A.*?closer.*?(do|\{)( +)?(\|.*?\|)?/, "")
+    source.reverse!
+    source.gsub!(/\A(.*?)(dne|\})/, "")
+    source.reverse!
+    source.gsub!("$n","\n")
+    return source
+  end
+
+  def self.escape_sqlite3(string, **hash)
+    hash.each do |key, value|
+      value.gsub!(/'/,"''") if value.is_a?(String)
+      value = "null" if value.nil?
+      string.gsub!(":#{key}", "'#{value}'")
+    end
+    return string
   end
 end
 

data/spec/expires_spec.rb

@@ -30,29 +30,8 @@ describe Expires do
         expect(expires["b"]).to eq 'b'
       end
     end
-
-    describe "when hotload is false" do
-      expires = Expires.new(namespace: "on_initialize_when_hotload_is_false")
-      expires["a"] = :a
-      expires["b"] = :b
-      expires.disconnect
-
-      expires = Expires.new(namespace: "on_initialize_when_hotload_is_false", hotload: false)
-      it "have to loaded 'a' as nil" do
-        expect(expires["a"]).to eq nil
-      end
-      
-      it "have to loaded 'b' as nil" do
-        expect(expires["b"]).to eq nil
-      end
-    end
   end
 
-  context "when not connected" do
-  end
-
-  context "when connected" do
-  end
 
 
 

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: expires
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tatumaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: color_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: color_print
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="