entity_storage 2.1.1 → 2.1.2

data/lib/entity_storage.rb

@@ -9,7 +9,7 @@ require 'active_record'
 
 
 module EntityStorage
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 
   class Storage
     attr_accessor :defaults
@@ -20,16 +20,17 @@ module EntityStorage
       if !ActiveRecord::Base.connection.table_exists?('entity_storage')
 				puts "Creating entity table..."
 				AddEntitiesTable.create
-			elsif self['ENTITY_STORAGE_MASTER_VERSION'].nil? || (self['ENTITY_STORAGE_MASTER_VERSION']!='2.1.0' && self['ENTITY_STORAGE_MASTER_VERSION']!='2.1.1')
-        # this will need to be updated for future version changes
-        self['ENTITY_STORAGE_MASTER_VERSION']='2.1.1'
-        puts "Migrating to new 2.1.x binary format..."
-        ActiveRecord::Base.connection.execute("alter table entity_storage modify value blob")
+        self['ENTITY_STORAGE_MASTER_VERSION']='2.1.2'
+			elsif self['ENTITY_STORAGE_MASTER_VERSION'].nil? || self['ENTITY_STORAGE_MASTER_VERSION']!='2.1.2'
+        self['ENTITY_STORAGE_MASTER_VERSION']='2.1.2'
+        ActiveRecord::Base.connection.execute("show columns from entity_storage").each {|p|
+          if p[0] == "value" && p[1] != "blob"
+            puts "Migrating to new 2.1.x binary format..."
+            ActiveRecord::Base.connection.execute("alter table entity_storage modify value blob")
+          end
+        }
       end
 
-      
-      
-     
     end
 
     # Read a value.

data/test/test_entity_storage.rb

@@ -21,6 +21,28 @@ class TestEntityStorage < Test::Unit::TestCase
 		entityStore2 = EntityStorage::Storage.new(DEFAULT_KEYS)
 		assert_equal entityStore2.email_test_address, 'joshuas@bnj.com'
   end
+
+   # tests migration from old type of table
+  def test_migration
+    ActiveRecord::Base.connection.execute("drop table entity_storage")
+    AddOldEntitiesTable.create
+    ActiveRecord::Base.connection.execute("show columns from entity_storage").each {|p| 
+       assert(p[1] == "text") if p[0] == "value" }
+    entityStore = EntityStorage::Storage.new(DEFAULT_KEYS)
+    ActiveRecord::Base.connection.execute("show columns from entity_storage").each {|p| 
+       assert(p[1] == "blob") if p[0] == "value" }
+    assert entityStore['ENTITY_STORAGE_MASTER_VERSION']=='2.1.2'
+
+    ActiveRecord::Base.connection.execute("delete from entity_storage")
+    entityStore = EntityStorage::Storage.new(DEFAULT_KEYS)
+    assert entityStore['ENTITY_STORAGE_MASTER_VERSION']=='2.1.2'
+
+    ActiveRecord::Base.connection.execute("drop table entity_storage")
+    entityStore = EntityStorage::Storage.new(DEFAULT_KEYS)
+    ActiveRecord::Base.connection.execute("show columns from entity_storage").each {|p| 
+       assert(p[1] == "blob") if p[0] == "value" }
+    assert entityStore['ENTITY_STORAGE_MASTER_VERSION']=='2.1.2'
+  end
   
   # tests value setting and getting functionality, along with default creation  
   def test_defaultkeys
@@ -106,3 +128,24 @@ class TestEntityStorage < Test::Unit::TestCase
   end
   
 end
+
+# old Version
+# This migration is required for EntityStorage to work correctly
+  class AddOldEntitiesTable < ActiveRecord::Migration
+    # up and down functions call broken code in Rail3 migrations gem, called it 'create'
+
+    def self.create
+      create_table "entity_storage", :force => true do |t|
+        t.string   "key",        :limit => 512, :null => false
+        t.text     "value"
+        #t.binary     "value"
+        t.datetime "created_at"
+        t.datetime "updated_at"
+      end
+
+      add_index "entity_storage", ["created_at"], :name => "created_at"
+      add_index "entity_storage", ["key"], :name => "key"
+      add_index "entity_storage", ["updated_at"], :name => "updated_at"
+    end
+
+  end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: entity_storage
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Joshua Siler