activerecord_acrawriter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 016bb2a7a35c6784a2374b6b9b6813b5cc11f4d2
-  data.tar.gz: ce4446025561506b4706cb35c86f589266ae4df9
+  metadata.gz: 37fcd32964c5514acdab7efd03cdecfd3d91f7a0
+  data.tar.gz: 8c6ba7c488ea05e7b835e631c6ba5183e2a158f5
 SHA512:
-  metadata.gz: 080a5702f2fb90ab7f30c9ca94578069106ff1167a925ea93f70b71116ce5bf0e107c6ca4adedc1759508d59b345e167fc17b0af33c81169cfff0f1b838a91ac
-  data.tar.gz: 0ce0cc9aae7775247f88846516dd8ba8ab82303296fa78caba059c414dbeae6cfdefd650a9c16306f722cbe9066a76fd6ec5e3b27a390a9a8a175bcd62284f2a
+  metadata.gz: 6f50783df0e278938fe5e6ba9d1759d61795bc737dbfb05eec794839eb862f0ef7ccf061949a8a4a9dbc5e83fd20aa14112e664deb938d6e14027744ece027e8
+  data.tar.gz: e2f234e7560cafe60f15ef95e60d0a268e6cc39e7ca31e8e83ce5fe9052a2524e6dd25789abacbde0c9464dc2cbfe0c85fac6667b65970391c2992c0a48ec157

data/lib/activerecord_acrawriter.rb

@@ -16,18 +16,38 @@ require 'active_record'
 require 'acrawriter'
 
 class AcraType < ActiveRecord::Type::String
-  def cast(value)
-    # scell can't encrypt null or empty objects
-    if value.nil? or value == ''
-      super
-    else
-      key = Base64.decode64(Rails.application.secrets.acra_public_key)
-      ActiveRecord::Base.connection.escape_bytea(create_acrastruct(value.b, key))
+
+  def serialize(value)
+    return '' if value.to_s.empty?
+
+    key = Base64.decode64(Rails.application.secrets.acra_public_key)
+    acrastruct = create_acrastruct(value.b, key)
+
+    case ActiveRecord::Base.connection.adapter_name
+    when 'PostgreSQL'
+      return ActiveRecord::Base.connection.escape_bytea(acrastruct)
+    when 'Mysql2'
+      return acrastruct.b
     end
-  end
 
-  def deserialize(value)
-    # override to avoid call cast method
-    value
+    raise 'Do not know how to operate with adapter ' +
+        ActiveRecord::Base.connection.adapter_name
   end
-end
+
+  private
+
+    def cast_value(value)
+      return '' if value.to_s.empty?
+
+      case ActiveRecord::Base.connection.adapter_name
+      when 'PostgreSQL'
+        return [value[2..-1]].pack('H*') if value.start_with?('\x')
+        return value.to_s
+      when 'Mysql2'
+        return value.to_s
+      end
+
+      raise 'Do not know how to operate with adapter ' +
+        ActiveRecord::Base.connection.adapter_name
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_acrawriter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cossack Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubythemis
@@ -42,14 +42,14 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Acra helps you easily secure your databases in distributed, microservice-rich
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libthemis, v0.10.0
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Extra type for active record with AcraWriter usage