persistent-cache 0.2.3 → 0.3.0

data/.gitignore

@@ -1,3 +1,4 @@
+multidb
 *.gem
 *.rbc
 .bundle

data/lib/persistent-cache/storage/storage_sq_lite.rb

@@ -1,4 +1,5 @@
 require "sqlite3"
+require "base64"
 require "eh/eh"
 
 module Persistent
@@ -19,21 +20,21 @@ module Persistent
     def save_key_value_pair(key, value, timestamp = nil)
       delete_entry(key)
       time_entry = timestamp.nil? ? Time.now.to_s : timestamp.to_s
-      EH::retry!(:args => [Marshal.dump(key), Marshal.dump(value), time_entry]) do
-        @storage_handler.execute("INSERT INTO #{DB_TABLE} (key, value, timestamp) VALUES(?, ?, ?)",Marshal.dump(key), Marshal.dump(value), time_entry)
+      EH::retry!(:args => [serialize(key), serialize(value), time_entry]) do
+        @storage_handler.execute("INSERT INTO #{DB_TABLE} (key, value, timestamp) VALUES(?, ?, ?)",serialize(key), serialize(value), time_entry)
       end
     end
 
     def lookup_key(key)
-      EH::retry!(:args => [Marshal.dump(key)]) do
-        result = @storage_handler.execute("SELECT value, timestamp FROM #{DB_TABLE} WHERE key=?", Marshal.dump(key))
-        !result.nil? && !result.empty? ? [Marshal.load(result[0][0]), result[0][1]] : nil
+      EH::retry!(:args => [serialize(key)]) do
+        result = @storage_handler.execute("SELECT value, timestamp FROM #{DB_TABLE} WHERE key=?", serialize(key))
+        !result.nil? && !result.empty? ? [deserialize(result[0][0]), result[0][1]] : nil
       end
     end
 
     def delete_entry(key)
-      EH::retry!(:args => [Marshal.dump(key)]) do
-        @storage_handler.execute("DELETE FROM #{DB_TABLE} WHERE key=?", Marshal.dump(key))
+      EH::retry!(:args => [serialize(key)]) do
+        @storage_handler.execute("DELETE FROM #{DB_TABLE} WHERE key=?", serialize(key))
       end
     end
 
@@ -45,7 +46,7 @@ module Persistent
 
     def keys
       EH::retry!(:args => []) do
-        @storage_handler.execute("SELECT key FROM #{DB_TABLE}").collect { |k| Marshal.load(k[0]) }
+        @storage_handler.execute("SELECT key FROM #{DB_TABLE}").collect { |k| deserialize(k[0]) }
       end
     end
 
@@ -57,6 +58,17 @@ module Persistent
 
     private
 
+    def serialize(data)
+      Base64.encode64(Marshal.dump(data))
+    end
+
+    def deserialize(data)
+      Marshal.load(Base64.decode64(data))
+
+      rescue TypeError => ex
+        Marshal.load(data)
+    end
+
     def connect_to_database
       File.exists?(@storage_details) ? open_database : create_database
     end

data/lib/persistent-cache/version.rb

@@ -1,5 +1,5 @@
 module Persistent
   class Cache
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'rspec/mocks'
 require 'tempfile'
 require 'simplecov'
 require 'simplecov-rcov'
+require 'debugger'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

data/spec/storage/storage_sqlite_spec.rb

@@ -10,6 +10,14 @@ describe Persistent::StorageSQLite do
     @iut = Persistent::StorageSQLite.new(@db_name)
  end
 
+  def serialize(data)
+    Base64.encode64(Marshal.dump(data))
+  end
+
+  def deserialize(data)
+    Marshal.load(Base64.decode64(data))
+  end
+
   context "when constructed" do
     it "should create the database if it does not exist" do
       expect(File.exists?(@db_name)).to eq(true)
@@ -63,10 +71,10 @@ describe Persistent::StorageSQLite do
       start_time = Time.now - 1
       @iut.save_key_value_pair(@test_key, @test_value)
       handle = SQLite3::Database.open(@db_name)
-      result = handle.execute "select value, timestamp from #{Persistent::StorageSQLite::DB_TABLE} where key=?", Marshal.dump(@test_key)
+      result = handle.execute "select value, timestamp from #{Persistent::StorageSQLite::DB_TABLE} where key=?", serialize(@test_key)
       expect(result.nil?).to eq(false)
       expect(result[0].nil?).to eq(false)
-      expect(result[0][0]).to eq(Marshal.dump(@test_value))
+      expect(result[0][0]).to eq(serialize(@test_value))
       test_time = Time.parse(result[0][1])
       expect(test_time).to be > start_time
       expect(test_time).to be < start_time + 600
@@ -76,10 +84,10 @@ describe Persistent::StorageSQLite do
       test_time = (Time.now - 2500)
       @iut.save_key_value_pair(@test_key, @test_value, test_time)
       handle = SQLite3::Database.open(@db_name)
-      result = handle.execute "select value, timestamp from #{Persistent::StorageSQLite::DB_TABLE} where key=?", Marshal.dump(@test_key)
+      result = handle.execute "select value, timestamp from #{Persistent::StorageSQLite::DB_TABLE} where key=?", serialize(@test_key)
       expect(result.nil?).to eq(false)
       expect(result[0].nil?).to eq(false)
-      expect(result[0][0]).to eq(Marshal.dump(@test_value))
+      expect(result[0][0]).to eq(serialize(@test_value))
       time_retrieved = Time.parse(result[0][1])
       expect(time_retrieved.to_s).to eq(test_time.to_s)
     end
@@ -88,11 +96,11 @@ describe Persistent::StorageSQLite do
       @iut.save_key_value_pair(@test_key, @test_value)
       @iut.save_key_value_pair(@test_key, "testvalue2")
       handle = SQLite3::Database.open(@db_name)
-      result = handle.execute "select value from #{Persistent::StorageSQLite::DB_TABLE} where key=?", Marshal.dump(@test_key)
+      result = handle.execute "select value from #{Persistent::StorageSQLite::DB_TABLE} where key=?", serialize(@test_key)
       expect(result.nil?).to eq(false)
       expect(result[0].nil?).to eq(false)
       expect(result.size).to eq(1)
-      expect(result[0][0]).to eq(Marshal.dump("testvalue2"))
+      expect(result[0][0]).to eq(serialize("testvalue2"))
     end
   end
 
@@ -120,7 +128,7 @@ describe Persistent::StorageSQLite do
 
   context "when asked to delete an entry" do
     it "should not raise an error if the entry is not present" do
-      @iut.delete_entry(Marshal.dump("shouldnotbepresent"))
+      @iut.delete_entry(serialize("shouldnotbepresent"))
     end
 
     it "should delete the entry if it is present" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persistent-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec