activerecord-coders 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5737128052b05970281b00c05dbb9d5bb6b2b568
-  data.tar.gz: 45caf47aa40cc76d5ce2e261d56af9f806d6766f
+  metadata.gz: e0443f7ecbcf79a4de2f4ca7cf5ec8be43966529
+  data.tar.gz: 2e7bc347184f9f47d873003977c7ef547ed8aafa
 SHA512:
-  metadata.gz: 5a57ddb9c08382bd4c8c2a66487d7a990572092ed01b4a394cecb35a9f10eb7bd1d6d5e7be17733201edbb437ad69176cf8387320bad05339b50466e8a9b416a
-  data.tar.gz: 307ee3ce6ec0acdc7989a7b1e0cd5bfb8f7059e3eae108040cac04bd0ec9fad94cd5732e525b1bc66ed8b6dd4cead803a54690c75d262e6ce6b1e4eb6c1d3a5c
+  metadata.gz: 408ac253ac427d05ec629998d57d9f0363f88eaacdbd2b040caa26f4d843fd58b7d851f18459f98f1c2b4395c07da9469c8ca4d060f77a656c39b7b9a3a8850e
+  data.tar.gz: 227c693cbe4703be29f4f6e8a854f05135b9d3638ed8011d7c1bba886e64438b7979a9e39bc45e6ce0ee276daafda945b4fcc351b48509d6f66979c6670041c3

data/lib/active_record/coders/encryptors/aes.rb

@@ -2,9 +2,13 @@ class ActiveRecord::Coders::Encryptors::AES
 
   attr_reader :cipher, :options
 
-  def initialize(password, size = 256, options = {})
-    @cipher = ::Gibberish::AES.new(password, size)
-    @options = { binary: true }.merge(options)
+  def initialize(options = {})
+    password = options[:password]
+    key_length = options[:key_length] || 256
+    binary = !!options[:binary]
+
+    @cipher = ::Gibberish::AES.new(password, key_length)
+    @options = { binary: binary }
   end
 
   def dump(data)

data/lib/active_record/coders/serializers/base.rb

@@ -8,15 +8,21 @@ class ActiveRecord::Coders::Serializers::Base
     end
   end
 
-  def dump(data)
-    self.class.dump.call(data)
-  rescue
-    String.new
+  attr_reader :options
+
+  def initialize(options = {})
+    @options = options
   end
 
   def load(data)
-    self.class.load.call(data)
+    self.class.load.call(data, options)
   rescue
     nil
   end
+
+  def dump(data)
+    self.class.dump.call(data, options)
+  rescue
+    String.new
+  end
 end

data/lib/active_record/coders/serializers/json.rb

@@ -2,8 +2,8 @@ module ActiveRecord::Coders::Serializers
   class JSON < Base
 
     serialize_with do |s|
-      s.load = ->(data){ ::JSON.parse(data) }
-      s.dump = ->(data){ ::JSON.generate(data) }
+      s.load = ->(data, options){ ::JSON.parse(data) }
+      s.dump = ->(data, options){ ::JSON.generate(data) }
     end
   end
 end

data/lib/active_record/coders/serializers/marshal.rb

@@ -2,8 +2,21 @@ module ActiveRecord::Coders::Serializers
   class Marshal < Base
 
     serialize_with do |s|
-      s.load = ->(data){ ::Marshal.load(data) }
-      s.dump = ->(data){ ::Marshal.dump(data) }
+      s.load = ->(data, options){
+        if !!options[:binary]
+          ::Marshal.load(data)
+        else
+          ::Marshal.load(::Base64.decode64(data))
+        end
+      }
+
+      s.dump = ->(data, options){
+        if !!options[:binary]
+          ::Marshal.dump(data)
+        else
+          ::Base64.encode64(::Marshal.dump(data))
+        end
+      }
     end
   end
 end

data/lib/active_record/coders/serializers/message_pack.rb

@@ -2,8 +2,21 @@ module ActiveRecord::Coders::Serializers
   class MessagePack < Base
 
     serialize_with do |s|
-      s.load = ->(data){ ::MessagePack.unpack(data) }
-      s.dump = ->(data){ ::MessagePack.pack(data) }
+      s.load = ->(data, options){
+        if !!options[:binary]
+          ::MessagePack.unpack(data)
+        else
+          ::MessagePack.unpack(::Base64.decode64(data))
+        end
+      }
+
+      s.dump = ->(data, options){
+        if !!options[:binary]
+          ::MessagePack.pack(data)
+        else
+          ::Base64.encode64(::MessagePack.pack(data))
+        end
+      }
     end
   end
 end

data/lib/active_record/coders/serializers/yaml.rb

@@ -2,8 +2,8 @@ module ActiveRecord::Coders::Serializers
   class YAML < Base
 
     serialize_with do |s|
-      s.load = ->(data){ ::YAML.load(data) }
-      s.dump = ->(data){ ::YAML.dump(data) }
+      s.load = ->(data, options){ ::YAML.load(data) }
+      s.dump = ->(data, options){ ::YAML.dump(data) }
     end
   end
 end

data/lib/active_record/coders/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Coders
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/lib/active_record/coders/serializers/marshal_spec.rb

@@ -2,28 +2,63 @@ require "spec_helper"
 
 describe ActiveRecord::Coders::Serializers::Marshal do
 
-  it "should create" do
-    DbMarshal.create
-  end
+  context "binary" do
 
-  it "should (de)serialize nil" do
-    marshal = DbMarshal.new
-    marshal.data = nil
-    marshal.save
-    marshal.reload.data.should == nil
-  end
+    it "should create" do
+      DbMarshal.create
+    end
+
+    it "should (de)serialize nil" do
+      marshal = DbMarshal.new
+      marshal.binary_data = nil
+      marshal.save
+      marshal.reload.binary_data.should == nil
+    end
+
+    it "should (de)serialize" do
+      marshal = DbMarshal.new
+      marshal.binary_data = { some: "data", with: %w[a r r a y] }
+      marshal.save
+      marshal.reload.binary_data.should == { some: "data", with: %w[a r r a y] }
+      marshal.reload.instance_variable_get("@attributes")["binary_data"]
+        .value.bytesize.should == 70
+    end
 
-  it "should (de)serialize" do
-    marshal = DbMarshal.new
-    marshal.data = { some: "data", with: %w[a r r a y] }
-    marshal.save
-    marshal.reload.data.should == { some: "data", with: %w[a r r a y] }
+    it "should not serialize invalid data" do
+      marshal = DbMarshal.new
+      marshal.binary_data = proc {}
+      marshal.save
+      marshal.reload.binary_data.should == nil
+    end
   end
 
-  it "should not serialize invalid data" do
-    marshal = DbMarshal.new
-    marshal.data = proc {}
-    marshal.save
-    marshal.reload.data.should == nil
+  context "text" do
+
+    it "should create" do
+      DbMarshal.create
+    end
+
+    it "should (de)serialize nil" do
+      marshal = DbMarshal.new
+      marshal.text_data = nil
+      marshal.save
+      marshal.reload.text_data.should == nil
+    end
+
+    it "should (de)serialize" do
+      marshal = DbMarshal.new
+      marshal.text_data = { some: "data", with: %w[a r r a y] }
+      marshal.save
+      marshal.reload.text_data.should == { some: "data", with: %w[a r r a y] }
+      marshal.reload.instance_variable_get("@attributes")["text_data"]
+        .value.bytesize.should == 98
+    end
+
+    it "should not serialize invalid data" do
+      marshal = DbMarshal.new
+      marshal.text_data = proc {}
+      marshal.save
+      marshal.reload.text_data.should == nil
+    end
   end
 end

data/spec/lib/active_record/coders/serializers/message_pack_spec.rb

@@ -2,29 +2,65 @@ require "spec_helper"
 
 describe ActiveRecord::Coders::Serializers::MessagePack do
 
-  it "should create" do
-    DbMessagePack.create
-  end
+  context "binary" do
 
-  it "should (de)serialize nil" do
-    msgpack = DbMessagePack.new
-    msgpack.data = nil
-    msgpack.save
-    msgpack.reload.data.should == nil
-  end
+    it "should create" do
+      DbMessagePack.create
+    end
+
+    it "should (de)serialize nil" do
+      msgpack = DbMessagePack.new
+      msgpack.binary_data = nil
+      msgpack.save
+      msgpack.reload.binary_data.should == nil
+    end
+
+    it "should (de)serialize" do
+      msgpack = DbMessagePack.new
+      msgpack.binary_data = { some: "data", with: %w[a r r a y] }
+      msgpack.save
+      msgpack.reload.binary_data.should ==
+        { "some" => "data", "with" => %w[a r r a y] }
+      msgpack.reload.instance_variable_get("@attributes")["binary_data"]
+        .value.bytesize.should == 27
+    end
 
-  it "should (de)serialize" do
-    msgpack = DbMessagePack.new
-    msgpack.data = { some: "data", with: %w[a r r a y] }
-    msgpack.save
-    msgpack.reload.data.should ==
-      { "some" => "data", "with" => %w[a r r a y] }
+    it "should not serialize invalid data" do
+      msgpack = DbMessagePack.new
+      msgpack.binary_data = proc {}
+      msgpack.save
+      msgpack.reload.binary_data.should == nil
+    end
   end
 
-  it "should not serialize invalid data" do
-    msgpack = DbMessagePack.new
-    msgpack.data = proc {}
-    msgpack.save
-    msgpack.reload.data.should == nil
+  context "text" do
+
+    it "should create" do
+      DbMessagePack.create
+    end
+
+    it "should (de)serialize nil" do
+      msgpack = DbMessagePack.new
+      msgpack.text_data = nil
+      msgpack.save
+      msgpack.reload.text_data.should == nil
+    end
+
+    it "should (de)serialize" do
+      msgpack = DbMessagePack.new
+      msgpack.text_data = { some: "data", with: %w[a r r a y] }
+      msgpack.save
+      msgpack.reload.text_data.should ==
+        { "some" => "data", "with" => %w[a r r a y] }
+      msgpack.reload.instance_variable_get("@attributes")["text_data"]
+        .value.bytesize.should == 37
+    end
+
+    it "should not serialize invalid data" do
+      msgpack = DbMessagePack.new
+      msgpack.text_data = proc {}
+      msgpack.save
+      msgpack.reload.text_data.should == nil
+    end
   end
 end

data/spec/support/db/migrate/03_create_db_message_packs.rb

@@ -2,7 +2,8 @@ class CreateDbMessagePacks < ActiveRecord::Migration
 
   def change
     create_table :db_message_packs do |t|
-      t.binary :data
+      t.text :text_data
+      t.binary :binary_data
     end
   end
 end

data/spec/support/db/migrate/05_create_db_marshals.rb

@@ -2,7 +2,8 @@ class CreateDbMarshals < ActiveRecord::Migration
 
   def change
     create_table :db_marshals do |t|
-      t.binary :data
+      t.text :text_data
+      t.binary :binary_data
     end
   end
 end

data/spec/support/models/db_aes.rb

@@ -1,6 +1,4 @@
 class DbAes < ActiveRecord::Base
-  serialize :text_data,
-    ActiveRecord::Coders::Encryptors::AES.new("secret", 256, binary: false)
-  serialize :binary_data,
-    ActiveRecord::Coders::Encryptors::AES.new("secret")
+  serialize :text_data, ActiveRecord::Coders::Encryptors::AES.new(password: "secret")
+  serialize :binary_data, ActiveRecord::Coders::Encryptors::AES.new(password: "secret", key_length: 128, binary: true)
 end

data/spec/support/models/db_marshal.rb

@@ -1,3 +1,6 @@
 class DbMarshal < ActiveRecord::Base
-  serialize :data, ActiveRecord::Coders::Serializers::Marshal.new
+  serialize :text_data,
+    ActiveRecord::Coders::Serializers::Marshal.new
+  serialize :binary_data,
+    ActiveRecord::Coders::Serializers::Marshal.new(binary: true)
 end

data/spec/support/models/db_message_pack.rb

@@ -1,3 +1,6 @@
 class DbMessagePack < ActiveRecord::Base
-  serialize :data, ActiveRecord::Coders::Serializers::MessagePack.new
+  serialize :text_data,
+    ActiveRecord::Coders::Serializers::MessagePack.new
+  serialize :binary_data,
+    ActiveRecord::Coders::Serializers::MessagePack.new(binary: true)
 end

data/spec/support/models/db_pipeline.rb

@@ -3,12 +3,12 @@ class DbPipeline < ActiveRecord::Base
     Coders::Pipeline.new(
       Coders::Serializers::MessagePack.new,
       Coders::Compressors::Gzip.new,
-      Coders::Encryptors::AES.new("secret")
+      Coders::Encryptors::AES.new(password: "secret")
     )
 
   serialize :se,
     Coders::Pipeline.new(
       Coders::Serializers::MessagePack.new,
-      Coders::Encryptors::AES.new("secret")
+      Coders::Encryptors::AES.new(password: "secret")
     )
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-coders
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael van Rooijen